From 32915d6933ac957ecbe92495ffcc8d5a1b68de56 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 6 Sep 2006 19:31:18 +0200 Subject: * debian/changelog: - prepared new upload --- debian/changelog | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 37953090d..e3e6cc70a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +apt (0.6.45ubuntu6) edgy; urgency=low + + * cmdline/apt-get.cc: + - always show auto-removable packages and give a hint how to remove + them + * debian/apt.conf.autoremove: + - exlucde linux-image and linux-restricted-modules from ever being + auto-removed + + -- + apt (0.6.45ubuntu5) edgy; urgency=low * apt-pkg/pkgcachegen.cc: -- cgit v1.2.3 From 98a27a213636270c44a6dbb32756b4dca73449b2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 7 Sep 2006 18:21:29 +0200 Subject: * apt-pkg/depcache.cc: - bugfix in the "get-section" code --- apt-pkg/depcache.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 422343e4a..a031fa068 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -915,7 +915,7 @@ bool pkgDepCache::Policy::IsImportantDep(DepIterator Dep) string s = _config->Find("APT::Install-Recommends-Section",""); if(s.size() > 0) { - const char *sec = Dep.TargetPkg().Section(); + const char *sec = Dep.ParentVer().Section(); if (sec && strcmp(sec, s.c_str()) == 0) return true; } -- cgit v1.2.3 From a1336beb354e2018e64ba70a9417856d73ff6972 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 13 Sep 2006 11:33:07 +0200 Subject: * changelog updated --- configure.in | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 58fc4f60d..e163a47f1 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.45ubuntu7") +AC_DEFINE_UNQUOTED(VERSION,"0.6.45ubuntu8") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 8ae6e1381..036715b89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ apt (0.6.45ubuntu8) edgy; urgency=low information (lp: #59457) * cmdline/apt-get.cc: - fix typo in autoremove information (lp: #59420) + * install apt-mark to modify the automatically install information for + packages -- Michael Vogt Fri, 8 Sep 2006 20:07:22 +0200 -- cgit v1.2.3 From 47e7ebb340eafcd06a5be6b92ec1b604e1d33f92 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 19 Sep 2006 17:24:46 +0200 Subject: * apt-pkg/tagfile.cc: - added ubuntu specific Original-Maintainer field --- apt-pkg/tagfile.cc | 2 ++ debian/changelog | 1 + 2 files changed, 3 insertions(+) diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index 72cd08596..029511336 100644 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@ -378,6 +378,7 @@ static const char *iTFRewritePackageOrder[] = { "Section", "Installed-Size", "Maintainer", + "Original-Maintainer", "Architecture", "Source", "Version", @@ -407,6 +408,7 @@ static const char *iTFRewriteSourceOrder[] = {"Package", "Priority", "Section", "Maintainer", + "Original-Maintainer", "Build-Depends", "Build-Depends-Indep", "Build-Conflicts", diff --git a/debian/changelog b/debian/changelog index 4aba0caf9..9111149c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ apt (0.6.45ubuntu10) edgy; urgency=low - reverted MMap use in the tagfile because it does not work across pipes (closes: #383487) * added "installtask" command + * added new ubuntu specific rewrite rule for "Original-Maintainer" -- Michael Vogt Tue, 19 Sep 2006 15:07:51 +0200 -- cgit v1.2.3 From 95689ededb9738b0c4ec6ebf1add3b79595cc39a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 20 Sep 2006 14:17:08 +0200 Subject: * apt-pkg/depcache.{cc,h}: - added OnlyInstalled option to writeState() * debian/changelog: - prepared nwe upload --- apt-pkg/depcache.cc | 5 ++++- apt-pkg/depcache.h | 2 +- debian/changelog | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 15d7bac43..b8c996c58 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -179,7 +179,7 @@ bool pkgDepCache::readStateFile(OpProgress *Prog) return true; } -bool pkgDepCache::writeStateFile(OpProgress *prog) +bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly) { if(_config->FindB("Debug::pkgAutoRemove",false)) std::clog << "pkgDepCache::writeStateFile()" << std::endl; @@ -241,6 +241,9 @@ bool pkgDepCache::writeStateFile(OpProgress *prog) std::clog << "Skipping already written " << pkg.Name() << std::endl; continue; } + // skip not installed ones if requested + if(InstalledOnly && pkg->CurrentVer == 0) + continue; if(_config->FindB("Debug::pkgAutoRemove",false)) std::clog << "Writing new AutoInstall: " << pkg.Name() << std::endl; diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 5cd5ea354..8f759d345 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -406,7 +406,7 @@ class pkgDepCache : protected pkgCache::Namespace // read persistent states bool readStateFile(OpProgress *prog); - bool writeStateFile(OpProgress *prog); + bool writeStateFile(OpProgress *prog, bool InstalledOnly=false); // Size queries inline double UsrSize() {return iUsrSize;}; diff --git a/debian/changelog b/debian/changelog index f98e02b1a..5b1336231 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ apt (0.6.45ubuntu11) edgy; urgency=low * removed "installtask" and change it so that tasknames can be given with "apt-get install taskname^" + * improve the writeStateFile() code - -- + -- Michael Vogt Wed, 20 Sep 2006 14:14:24 +0200 apt (0.6.45ubuntu10) edgy; urgency=low -- cgit v1.2.3 From 360aa3f32b747825d524fb2a9bb6a97e83c97505 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 28 Sep 2006 00:31:13 +0200 Subject: * debian/changelog: - no change upload to fix build problem with synaptic --- configure.in | 2 +- debian/changelog | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 161fe5558..098e56e97 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.45ubuntu12") +AC_DEFINE_UNQUOTED(VERSION,"0.6.45ubuntu13") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index b7f3dfdcb..d49ee5688 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.6.45ubuntu13) edgy; urgency=low + + * no-changes upload to make apt rebuild against latest g++ and + fix synaptic FTBFS (see bug: #62461 for details) + + -- Michael Vogt Tue, 26 Sep 2006 22:33:10 +0200 + apt (0.6.45ubuntu12) edgy; urgency=low * apt-pkg/depcache.cc: -- cgit v1.2.3 From 1d52ce01e449db043e0c8343e838cb686ed6250e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 5 Oct 2006 13:41:09 +0200 Subject: * merged i18n fixes from apt--mvo --- apt-pkg/deb/dpkgpm.cc | 22 +++++++++++----------- buildlib/apti18n.h.in | 2 ++ debian/changelog | 4 +++- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 93dff390d..f66962387 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -355,28 +355,28 @@ bool pkgDPkgPM::Go(int OutStatusFd) static const struct DpkgState DpkgStatesOpMap[][5] = { // Install operation { - {"half-installed", _("Preparing %s")}, - {"unpacked", _("Unpacking %s") }, + {"half-installed", N_("Preparing %s")}, + {"unpacked", N_("Unpacking %s") }, {NULL, NULL} }, // Configure operation { - {"unpacked",_("Preparing to configure %s") }, - {"half-configured", _("Configuring %s") }, - { "installed", _("Installed %s")}, + {"unpacked",N_("Preparing to configure %s") }, + {"half-configured", N_("Configuring %s") }, + { "installed", N_("Installed %s")}, {NULL, NULL} }, // Remove operation { - {"half-configured", _("Preparing for removal of %s")}, - {"half-installed", _("Removing %s")}, - {"config-files", _("Removed %s")}, + {"half-configured", N_("Preparing for removal of %s")}, + {"half-installed", N_("Removing %s")}, + {"config-files", N_("Removed %s")}, {NULL, NULL} }, // Purge operation { - {"config-files", _("Preparing to completely remove %s")}, - {"not-installed", _("Completely removed %s")}, + {"config-files", N_("Preparing to completely remove %s")}, + {"not-installed", N_("Completely removed %s")}, {NULL, NULL} }, }; @@ -672,7 +672,7 @@ bool pkgDPkgPM::Go(int OutStatusFd) { // only read the translation if there is actually a next // action - const char *translation = states[PackageOpsDone[pkg]].str; + const char *translation = _(states[PackageOpsDone[pkg]].str); char s[200]; snprintf(s, sizeof(s), translation, pkg); diff --git a/buildlib/apti18n.h.in b/buildlib/apti18n.h.in index 812457643..a5b91b1ee 100644 --- a/buildlib/apti18n.h.in +++ b/buildlib/apti18n.h.in @@ -14,8 +14,10 @@ # else # define _(x) gettext(x) # endif +# define N_(x) x #else // apt will not use any gettext # define setlocale(a, b) # define _(x) x +# define N_(x) x #endif diff --git a/debian/changelog b/debian/changelog index 7d12cd3c5..189598eb4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,10 @@ apt (0.6.45ubuntu15) edgy; urgency=low * doc/apt-get.8.xml: - documented autoremove, thanks to Vladimír Lapáček (lp: #62919) + * fix broken i18n in the dpkg progress reporting, thanks to + Frans Pop and Steinar Gunderson. (closes: #389261) - -- Michael Vogt Mon, 2 Oct 2006 15:53:14 +0200 + -- Michael Vogt Thu, 5 Oct 2006 13:32:41 +0200 apt (0.6.45ubuntu14) edgy; urgency=low -- cgit v1.2.3 From e5f42f11f3822362a50601faa53449175ec240d4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 5 Oct 2006 15:15:31 +0200 Subject: * po/en_GB.po: - typo fixed --- debian/changelog | 4 +++- po/en_GB.po | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 189598eb4..51399f9a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,10 @@ apt (0.6.45ubuntu15) edgy; urgency=low (lp: #62919) * fix broken i18n in the dpkg progress reporting, thanks to Frans Pop and Steinar Gunderson. (closes: #389261) + * po/en_GB.po: + - typo (lp: #61270) - -- Michael Vogt Thu, 5 Oct 2006 13:32:41 +0200 + -- apt (0.6.45ubuntu14) edgy; urgency=low diff --git a/po/en_GB.po b/po/en_GB.po index b2a265f7a..815163aec 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -678,7 +678,7 @@ msgstr "but it is not going to be installed" #: cmdline/apt-get.cc:347 msgid " or" -msgstr "or" +msgstr " or" #: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" -- cgit v1.2.3 From c7d9068f8c352b1ba6b43bd1fffb88542bee19a9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 5 Oct 2006 15:22:34 +0200 Subject: * po/en_GB.po: - merged whitespace fixes --- po/en_GB.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 815163aec..aa2f19baf 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -469,11 +469,11 @@ msgstr "W: Unable to stat %s\n" #: ftparchive/writer.cc:135 msgid "E: " -msgstr "E:" +msgstr "E: " #: ftparchive/writer.cc:137 msgid "W: " -msgstr "W:" +msgstr "W: " #: ftparchive/writer.cc:144 msgid "E: Errors apply to file " @@ -613,7 +613,7 @@ msgstr "Failed to create subprocess IPC" #: ftparchive/multicompress.cc:324 msgid "Failed to exec compressor " -msgstr "Failed to exec compressor" +msgstr "Failed to exec compressor " #: ftparchive/multicompress.cc:363 msgid "decompressor" @@ -1079,7 +1079,7 @@ msgstr "Recommended packages:" #: cmdline/apt-get.cc:1786 msgid "Calculating upgrade... " -msgstr "Calculating upgrade..." +msgstr "Calculating upgrade... " #: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" @@ -1305,7 +1305,7 @@ msgstr "Ign " #: cmdline/acqprogress.cc:114 msgid "Err " -msgstr "Err" +msgstr "Err " #: cmdline/acqprogress.cc:135 #, c-format -- cgit v1.2.3 From 5f6b130d6342965bfa49beb9413bdf742440b8ab Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 29 Nov 2006 21:24:29 +0100 Subject: * prototype of mirror method added --- methods/http.cc | 13 ++----- methods/http.h | 7 ++-- methods/http_main.cc | 15 ++++++++ methods/makefile | 9 ++++- methods/mirror.cc | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++ methods/mirror.h | 40 ++++++++++++++++++++++ po/apt-all.pot | 42 +++++++++++------------ 7 files changed, 187 insertions(+), 36 deletions(-) create mode 100644 methods/http_main.cc create mode 100644 methods/mirror.cc create mode 100644 methods/mirror.h diff --git a/methods/http.cc b/methods/http.cc index c6623c46f..deaa8d0c8 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -38,7 +38,6 @@ #include #include #include -#include #include // Internet stuff @@ -57,7 +56,7 @@ time_t HttpMethod::FailTime = 0; unsigned long PipelineDepth = 10; unsigned long TimeOut = 120; bool Debug = false; - +URI Proxy; unsigned long CircleBuf::BwReadLimit=0; unsigned long CircleBuf::BwTickReadData=0; @@ -990,7 +989,7 @@ void HttpMethod::SigTerm(int) depth. */ bool HttpMethod::Fetch(FetchItem *) { - if (Server == 0) + if (Server == 0) return true; // Queue the requests @@ -1223,13 +1222,5 @@ int HttpMethod::Loop() } /*}}}*/ -int main() -{ - setlocale(LC_ALL, ""); - - HttpMethod Mth; - - return Mth.Loop(); -} diff --git a/methods/http.h b/methods/http.h index 541e2952c..5eac11401 100644 --- a/methods/http.h +++ b/methods/http.h @@ -13,7 +13,7 @@ #define MAXLEN 360 -#include + using std::cout; using std::endl; @@ -134,7 +134,6 @@ class HttpMethod : public pkgAcqMethod bool ServerDie(ServerState *Srv); int DealWithHeaders(FetchResult &Res,ServerState *Srv); - virtual bool Fetch(FetchItem *); virtual bool Configuration(string Message); // In the event of a fatal signal this file will be closed and timestamped. @@ -142,6 +141,9 @@ class HttpMethod : public pkgAcqMethod static int FailFd; static time_t FailTime; static void SigTerm(int); + + protected: + virtual bool Fetch(FetchItem *); public: friend class ServerState; @@ -158,6 +160,5 @@ class HttpMethod : public pkgAcqMethod }; }; -URI Proxy; #endif diff --git a/methods/http_main.cc b/methods/http_main.cc new file mode 100644 index 000000000..2c46ab19d --- /dev/null +++ b/methods/http_main.cc @@ -0,0 +1,15 @@ +#include +#include + +#include "connect.h" +#include "rfc2553emu.h" +#include "http.h" + + +int main() +{ + setlocale(LC_ALL, ""); + + HttpMethod Mth; + return Mth.Loop(); +} diff --git a/methods/makefile b/methods/makefile index 1e3b1ef85..12e446a55 100644 --- a/methods/makefile +++ b/methods/makefile @@ -49,7 +49,7 @@ include $(PROGRAM_H) PROGRAM=http SLIBS = -lapt-pkg $(SOCKETLIBS) LIB_MAKES = apt-pkg/makefile -SOURCE = http.cc rfc2553emu.cc connect.cc +SOURCE = http.cc http_main.cc rfc2553emu.cc connect.cc include $(PROGRAM_H) # The ftp method @@ -66,6 +66,13 @@ LIB_MAKES = apt-pkg/makefile SOURCE = rsh.cc include $(PROGRAM_H) +# The mirror method +PROGRAM=mirror +SLIBS = -lapt-pkg $(SOCKETLIBS) +LIB_MAKES = apt-pkg/makefile +SOURCE = mirror.cc http.cc rfc2553emu.cc connect.cc +include $(PROGRAM_H) + # SSH and vzip2 method symlink binary: $(BIN)/ssh $(BIN)/bzip2 veryclean: clean-$(BIN)/ssh clean-$(BIN)/bzip2 diff --git a/methods/mirror.cc b/methods/mirror.cc new file mode 100644 index 000000000..fad076e91 --- /dev/null +++ b/methods/mirror.cc @@ -0,0 +1,97 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +// $Id: mirror.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $ +/* ###################################################################### + + Mirror Aquire Method - This is the Mirror aquire method for APT. + + ##################################################################### */ + /*}}}*/ +// Include Files /*{{{*/ +#include +#include +#include +#include +#include +#include + +#include +#include +using namespace std; + +#include "mirror.h" +#include "http.h" + + /*}}}*/ + +MirrorMethod::MirrorMethod() + : pkgAcqMethod("1.2",Pipeline | SendConfig), HasMirrorFile(false) +{ +#if 0 + HasMirrorFile=true; + BaseUri="http://people.ubuntu.com/~mvo/mirror/mirrors///"; + Mirror="http://de.archive.ubuntu.com/ubuntu/"; +#endif +}; + +bool MirrorMethod::GetMirrorFile(string uri) +{ + string Marker = _config->Find("Acquire::Mirror::MagicMarker","///"); + BaseUri = uri.substr(0,uri.find(Marker)); + BaseUri.replace(0,strlen("mirror://"),"http://"); + + MirrorFile = _config->FindDir("Dir::State::lists") + URItoFileName(BaseUri); + + cerr << "base-uri: " << BaseUri << endl; + cerr << "mirror-file: " << MirrorFile << endl; + + // FIXME: fetch it with curl + pkgAcquire Fetcher; + new pkgAcqFile(&Fetcher, BaseUri, "", 0, "", "", "", MirrorFile); + bool res = (Fetcher.Run() == pkgAcquire::Continue); + cerr << "fetch-result: " << res << endl; + + if(res) + HasMirrorFile = true; + Fetcher.Shutdown(); + return true; +} + +bool MirrorMethod::SelectMirror() +{ + ifstream in(MirrorFile.c_str()); + getline(in, Mirror); + cerr << "Mirror: " << Mirror << endl; +} + +// MirrorMethod::Fetch - Fetch an item /*{{{*/ +// --------------------------------------------------------------------- +/* This adds an item to the pipeline. We keep the pipeline at a fixed + depth. */ +bool MirrorMethod::Fetch(FetchItem *Itm) +{ + // get mirror information + if(!HasMirrorFile) + { + GetMirrorFile(Itm->Uri); + SelectMirror(); + } + + // change the items in the queue + Itm->Uri.replace(0,BaseUri.size()+_config->Find("Acquire::Mirror::MagicMarker","///").size()+2/*len("mirror")-len("http")*/,Mirror); + cerr << "new Fetch-uri: " << Itm->Uri << endl; + + // FIXME: fetch it with! + +}; + +int main() +{ + setlocale(LC_ALL, ""); + + MirrorMethod Mth; + + return Mth.Run(); +} + + diff --git a/methods/mirror.h b/methods/mirror.h new file mode 100644 index 000000000..ca3428830 --- /dev/null +++ b/methods/mirror.h @@ -0,0 +1,40 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/// $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $ +// $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $ +/* ###################################################################### + + MIRROR Aquire Method - This is the MIRROR aquire method for APT. + + ##################################################################### */ + /*}}}*/ + +#ifndef APT_MIRROR_H +#define APT_MIRROR_H + + +#include + +using std::cout; +using std::cerr; +using std::endl; + +#include "http.h" + +class MirrorMethod : public pkgAcqMethod +{ + FetchResult Res; + string Mirror; + string BaseUri; + string MirrorFile; + bool HasMirrorFile; + + protected: + bool GetMirrorFile(string uri); + bool SelectMirror(); + public: + MirrorMethod(); + virtual bool Fetch(FetchItem *Itm); +}; + + +#endif diff --git a/po/apt-all.pot b/po/apt-all.pot index 521230146..b3da2ba9a 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-10-11 20:34+0200\n" +"POT-Creation-Date: 2006-11-24 16:37+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1621,7 +1621,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1752,76 +1752,76 @@ msgstr "" msgid "Read error from %s process" msgstr "" -#: methods/http.cc:376 +#: methods/http.cc:375 msgid "Waiting for headers" msgstr "" -#: methods/http.cc:522 +#: methods/http.cc:521 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:530 +#: methods/http.cc:529 msgid "Bad header line" msgstr "" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:585 +#: methods/http.cc:584 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:600 +#: methods/http.cc:599 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:602 +#: methods/http.cc:601 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:626 +#: methods/http.cc:625 msgid "Unknown date format" msgstr "" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:874 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:876 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "" @@ -2366,7 +2366,7 @@ msgid "MD5Sum mismatch" msgstr "" #: apt-pkg/acquire-item.cc:640 -msgid "There are no public key available for the following key IDs:\n" +msgid "There is no public key available for the following key IDs:\n" msgstr "" #: apt-pkg/acquire-item.cc:753 -- cgit v1.2.3 From 14e097c105c49a102a642c8108979356c5cc3152 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 29 Nov 2006 22:59:35 +0100 Subject: * working mirror implementation based on http method --- apt-pkg/acquire-method.h | 7 +++-- methods/mirror.cc | 72 ++++++++++++++++++++++++++++++++++++++---------- methods/mirror.h | 15 +++++++--- 3 files changed, 73 insertions(+), 21 deletions(-) diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h index f46209d12..e0e7c1d09 100644 --- a/apt-pkg/acquire-method.h +++ b/apt-pkg/acquire-method.h @@ -63,9 +63,10 @@ class pkgAcqMethod // Outgoing messages void Fail(bool Transient = false); inline void Fail(const char *Why, bool Transient = false) {Fail(string(Why),Transient);}; - void Fail(string Why, bool Transient = false); - void URIStart(FetchResult &Res); - void URIDone(FetchResult &Res,FetchResult *Alt = 0); + virtual void Fail(string Why, bool Transient = false); + virtual void URIStart(FetchResult &Res); + virtual void URIDone(FetchResult &Res,FetchResult *Alt = 0); + bool MediaFail(string Required,string Drive); virtual void Exit() {}; diff --git a/methods/mirror.cc b/methods/mirror.cc index fad076e91..c4d911a3c 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -17,6 +17,8 @@ #include #include +#include + using namespace std; #include "mirror.h" @@ -25,31 +27,50 @@ using namespace std; /*}}}*/ MirrorMethod::MirrorMethod() - : pkgAcqMethod("1.2",Pipeline | SendConfig), HasMirrorFile(false) + : HttpMethod(), HasMirrorFile(false) { #if 0 HasMirrorFile=true; - BaseUri="http://people.ubuntu.com/~mvo/mirror/mirrors///"; + BaseUri="mirror://people.ubuntu.com/~mvo/mirror/mirrors"; + MirrorFile="/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_mirror_mirrors"; Mirror="http://de.archive.ubuntu.com/ubuntu/"; #endif }; +// HttpMethod::Configuration - Handle a configuration message /*{{{*/ +// --------------------------------------------------------------------- +/* We stash the desired pipeline depth */ +bool MirrorMethod::Configuration(string Message) +{ + if (pkgAcqMethod::Configuration(Message) == false) + return false; + Debug = _config->FindB("Debug::Acquire::mirror",false); + + return true; +} + /*}}}*/ + + bool MirrorMethod::GetMirrorFile(string uri) { string Marker = _config->Find("Acquire::Mirror::MagicMarker","///"); BaseUri = uri.substr(0,uri.find(Marker)); - BaseUri.replace(0,strlen("mirror://"),"http://"); + + string fetch = BaseUri; + fetch.replace(0,strlen("mirror://"),"http://"); MirrorFile = _config->FindDir("Dir::State::lists") + URItoFileName(BaseUri); - cerr << "base-uri: " << BaseUri << endl; - cerr << "mirror-file: " << MirrorFile << endl; + if(Debug) + { + cerr << "base-uri: " << BaseUri << endl; + cerr << "mirror-file: " << MirrorFile << endl; + } // FIXME: fetch it with curl pkgAcquire Fetcher; - new pkgAcqFile(&Fetcher, BaseUri, "", 0, "", "", "", MirrorFile); + new pkgAcqFile(&Fetcher, fetch, "", 0, "", "", "", MirrorFile); bool res = (Fetcher.Run() == pkgAcquire::Continue); - cerr << "fetch-result: " << res << endl; if(res) HasMirrorFile = true; @@ -61,7 +82,9 @@ bool MirrorMethod::SelectMirror() { ifstream in(MirrorFile.c_str()); getline(in, Mirror); - cerr << "Mirror: " << Mirror << endl; + if(Debug) + cerr << "Using mirror: " << Mirror << endl; + return true; } // MirrorMethod::Fetch - Fetch an item /*{{{*/ @@ -77,21 +100,42 @@ bool MirrorMethod::Fetch(FetchItem *Itm) SelectMirror(); } - // change the items in the queue - Itm->Uri.replace(0,BaseUri.size()+_config->Find("Acquire::Mirror::MagicMarker","///").size()+2/*len("mirror")-len("http")*/,Mirror); - cerr << "new Fetch-uri: " << Itm->Uri << endl; + if(Queue->Uri.find("mirror://") != string::npos) + Queue->Uri.replace(0,BaseUri.size(),Mirror); - // FIXME: fetch it with! - + // now run the real fetcher + return HttpMethod::Fetch(Itm); }; +void MirrorMethod::Fail(string Err,bool Transient) +{ + if(Queue->Uri.find("http://") != string::npos) + Queue->Uri.replace(0,Mirror.size(), BaseUri); + pkgAcqMethod::Fail(Err, Transient); +} + +void MirrorMethod::URIStart(FetchResult &Res) +{ + if(Queue->Uri.find("http://") != string::npos) + Queue->Uri.replace(0,Mirror.size(), BaseUri); + pkgAcqMethod::URIStart(Res); +} + +void MirrorMethod::URIDone(FetchResult &Res,FetchResult *Alt) +{ + if(Queue->Uri.find("http://") != string::npos) + Queue->Uri.replace(0,Mirror.size(), BaseUri); + pkgAcqMethod::URIDone(Res, Alt); +} + + int main() { setlocale(LC_ALL, ""); MirrorMethod Mth; - return Mth.Run(); + return Mth.Loop(); } diff --git a/methods/mirror.h b/methods/mirror.h index ca3428830..91cf8c64f 100644 --- a/methods/mirror.h +++ b/methods/mirror.h @@ -20,17 +20,24 @@ using std::endl; #include "http.h" -class MirrorMethod : public pkgAcqMethod +class MirrorMethod : public HttpMethod { FetchResult Res; - string Mirror; - string BaseUri; - string MirrorFile; + string BaseUri; // the original mirror://... url + string Mirror; // the selected mirror uri (http://...) + string MirrorFile; // bool HasMirrorFile; + bool Debug; + protected: bool GetMirrorFile(string uri); bool SelectMirror(); + virtual void Fail(string Why, bool Transient = false); + virtual void URIStart(FetchResult &Res); + virtual void URIDone(FetchResult &Res,FetchResult *Alt = 0); + virtual bool Configuration(string Message); + public: MirrorMethod(); virtual bool Fetch(FetchItem *Itm); -- cgit v1.2.3 From 86c17f0a4bd3c0e3dde5bb58b3df9c41e5a88763 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 29 Nov 2006 23:09:26 +0100 Subject: * todo added --- methods/mirror.cc | 8 ++++++++ methods/mirror.h | 3 +++ 2 files changed, 11 insertions(+) diff --git a/methods/mirror.cc b/methods/mirror.cc index c4d911a3c..c49764044 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -26,6 +26,14 @@ using namespace std; /*}}}*/ +/* + * TODO: + * - support keeping the mirror file around (evil listclearer strikes again) + * - better method to download than having a pkgAcquire interface here + * - testing :) + * + */ + MirrorMethod::MirrorMethod() : HttpMethod(), HasMirrorFile(false) { diff --git a/methods/mirror.h b/methods/mirror.h index 91cf8c64f..a47b8fbf1 100644 --- a/methods/mirror.h +++ b/methods/mirror.h @@ -23,6 +23,7 @@ using std::endl; class MirrorMethod : public HttpMethod { FetchResult Res; + // we simply transform between BaseUri and Mirror string BaseUri; // the original mirror://... url string Mirror; // the selected mirror uri (http://...) string MirrorFile; // @@ -33,6 +34,8 @@ class MirrorMethod : public HttpMethod protected: bool GetMirrorFile(string uri); bool SelectMirror(); + + // we need to overwrite those to transform the url back virtual void Fail(string Why, bool Transient = false); virtual void URIStart(FetchResult &Res); virtual void URIDone(FetchResult &Res,FetchResult *Alt = 0); -- cgit v1.2.3 From 3ed91a17d21d0d456a12accc507b82e1c0f1a697 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 29 Nov 2006 23:21:47 +0100 Subject: * more todo items --- methods/mirror.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/methods/mirror.cc b/methods/mirror.cc index c49764044..1911d6115 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -28,10 +28,11 @@ using namespace std; /* * TODO: - * - support keeping the mirror file around (evil listclearer strikes again) * - better method to download than having a pkgAcquire interface here + * - support keeping the mirror file around (evil listclearer strikes again) + * -> /var/lib/apt/mirrors dir? how to cleanup? by time? + * - provide some TTL time until the mirror file is get again (1h? 6h?) * - testing :) - * */ MirrorMethod::MirrorMethod() -- cgit v1.2.3 From ef1e6d8822bb34527bba5d2318b5768013efd010 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 30 Nov 2006 11:06:09 +0100 Subject: * methods/mirror.cc: - check the complette queue on Fetch() for urls to transform --- methods/mirror.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/methods/mirror.cc b/methods/mirror.cc index 1911d6115..4de981522 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -32,6 +32,7 @@ using namespace std; * - support keeping the mirror file around (evil listclearer strikes again) * -> /var/lib/apt/mirrors dir? how to cleanup? by time? * - provide some TTL time until the mirror file is get again (1h? 6h?) + * - deal with runing as non-root (we can't write to the lists dir then) * - testing :) */ @@ -109,8 +110,11 @@ bool MirrorMethod::Fetch(FetchItem *Itm) SelectMirror(); } - if(Queue->Uri.find("mirror://") != string::npos) - Queue->Uri.replace(0,BaseUri.size(),Mirror); + for (FetchItem *I = Queue; I != 0; I = I->Next) + { + if(I->Uri.find("mirror://") != string::npos) + I->Uri.replace(0,BaseUri.size(),Mirror); + } // now run the real fetcher return HttpMethod::Fetch(Itm); -- cgit v1.2.3 From 000129a1830a04fa040c5f5eb2e18e9748736469 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 7 Dec 2006 16:52:10 +0100 Subject: changelog updated --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b015747b1..6b6bc9322 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ apt (0.6.46.4ubuntu1) feisty; urgency=low - * + * merged with debian - -- + -- Michael Vogt Thu, 7 Dec 2006 12:13:14 +0100 apt (0.6.46.4) unstable; urgency=high -- cgit v1.2.3 From d3a39605ee9af421363ee6e36c1168d15bd7eed2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 7 Dec 2006 17:10:44 +0100 Subject: * changelog fixes --- debian/apt.postinst | 2 -- debian/changelog | 10 +++++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/apt.postinst b/debian/apt.postinst index 1419d180a..df0433057 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -20,8 +20,6 @@ case "$1" in cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg fi - apt-key update - ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/changelog b/debian/changelog index f30edf5a1..511f407e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -121,6 +121,14 @@ apt (0.6.46) unstable; urgency=low -- Michael Vogt Thu, 28 Sep 2006 00:34:20 +0200 +apt (0.6.45ubuntu14) edgy; urgency=low + + * cmdline/apt-get.cc: + - fix in the TryInstallTask() code to make sure that all package + there are marked manual install (lp: #61684) + + -- Michael Vogt Thu, 28 Sep 2006 00:34:20 +0200 + apt (0.6.45ubuntu13) edgy; urgency=low * no-changes upload to make apt rebuild against latest g++ and @@ -350,7 +358,7 @@ apt (0.6.44.2ubuntu1) edgy; urgency=low -- Michael Vogt Mon, 3 Jul 2006 18:30:46 +0200 -apt (0.6.44.2) unstable; urgency=low +apt (0.6.44.2) unstable; urgency=low * apt-pkg/depcache.cc: - added Debug::pkgDepCache::AutoInstall (thanks to infinity) -- cgit v1.2.3 From 09ddf81f7665f3ae2c854308fc60d9722beed13a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 7 Dec 2006 23:09:25 +0100 Subject: merged iwjs patch --- apt-pkg/algorithms.cc | 1 + debian/changelog | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index ddfda754d..9011821bb 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -986,6 +986,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) } if (Debug) clog << " Will not break " << Pkg.Name() << " as stated in Breaks field in " << I.Name() < Thu, 7 Dec 2006 23:07:24 +0100 + apt (0.6.46.4ubuntu1) feisty; urgency=low * merged with debian @@ -42,6 +50,13 @@ apt (0.6.46.3-0.1) unstable; urgency=high -- Andreas Barth Tue, 5 Dec 2006 10:34:56 +0000 +apt (0.6.46.3ubuntu2) feisty; urgency=low + + * apt-pkg/algorithms.cc: add missing call to MarkKeep + so that dist-upgrade isn't broken by unsatisfiable Breaks. + + -- Ian Jackson Thu, 7 Dec 2006 15:46:52 +0000 + apt (0.6.46.3ubuntu1) feisty; urgency=low * doc/apt-get.8.xml: -- cgit v1.2.3 From 9011a330ef082b298fc09f0bc8e936431b529ef3 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 19 Dec 2006 19:50:11 +0100 Subject: * changelog updated, package uploaded --- configure.in | 2 +- debian/changelog | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 9f3a4e246..f6208777f 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.46.4ubuntu4") +AC_DEFINE_UNQUOTED(VERSION,"0.6.46.4ubuntu5") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 513d409e9..46ab467de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.6.46.4ubuntu5) feisty; urgency=low + + * added apt-transport-https package to provide a optional + https transport (apt-https spec) + + -- Michael Vogt Tue, 19 Dec 2006 16:23:43 +0100 + apt (0.6.46.4ubuntu4) feisty; urgency=low * apt-pkg/algorithms.cc: -- cgit v1.2.3 From d731f9c574138a9cb31c586a8f1e7d7181a44456 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 8 Jan 2007 11:19:32 +0100 Subject: * apt-pkg/init.cc: - added Dir::State::Mirrors * doc/examples/configure-index: - added Acquire::mirror::RefreshInterval * methods/mirror.{cc,h}: - download the mirror file into Dir::State::Mirrors - added RefreshInterval option to not ask for the mirror file too often --- apt-pkg/init.cc | 1 + debian/apt.dirs | 1 + doc/examples/configure-index | 7 +++++- methods/mirror.cc | 56 ++++++++++++++++++++++++++++++++++++-------- methods/mirror.h | 1 + po/apt-all.pot | 4 ++-- 6 files changed, 57 insertions(+), 13 deletions(-) diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index b47378d4a..fe085a75e 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -54,6 +54,7 @@ bool pkgInitConfig(Configuration &Cnf) Cnf.Set("Dir::State::lists","lists/"); Cnf.Set("Dir::State::cdroms","cdroms.list"); + Cnf.Set("Dir::State::mirrors","mirrors/"); // Cache Cnf.Set("Dir::Cache","var/cache/apt/"); diff --git a/debian/apt.dirs b/debian/apt.dirs index e1cb738fa..b81878baa 100644 --- a/debian/apt.dirs +++ b/debian/apt.dirs @@ -5,5 +5,6 @@ etc/apt etc/apt/sources.list.d var/cache/apt/archives/partial var/lib/apt/lists/partial +var/lib/apt/mirrors/partial var/lib/apt/periodic usr/share/bug/apt diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 0f0abc30c..cb20d767b 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -160,6 +160,11 @@ Acquire { Options {"--ignore-time-conflict";} // not very usefull on a normal system }; + + mirror + { + RefreshInterval "360"; // refresh interval in minutes + }; }; // Directory layout @@ -258,9 +263,9 @@ Debug Acquire::Ftp "false"; // Show ftp command traffic Acquire::Http "false"; // Show http command traffic Acquire::gpgv "false"; // Show the gpgv traffic + Acquire::Mirror "false"; // Show debugging of the mirror method aptcdrom "false"; // Show found package files IdentCdrom "false"; - } /* Whatever you do, do not use this configuration file!! Take out ONLY diff --git a/methods/mirror.cc b/methods/mirror.cc index 4de981522..e70a40f55 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -18,6 +18,7 @@ #include #include #include +#include using namespace std; @@ -28,11 +29,16 @@ using namespace std; /* * TODO: + * - send expected checksum to the mirror method so that + some checking/falling back can be done here already + * - keep the mirror file around in /var/lib/apt/mirrors + * can't be put into lists/ because of the listclearer + * cleanup by time (mtime relative to the other mtimes) + * - use a TTL time the mirror file is fetched again (6h?) + * - deal with runing as non-root because we can't write to the lists + dir then -> use the cached mirror file * - better method to download than having a pkgAcquire interface here - * - support keeping the mirror file around (evil listclearer strikes again) - * -> /var/lib/apt/mirrors dir? how to cleanup? by time? - * - provide some TTL time until the mirror file is get again (1h? 6h?) - * - deal with runing as non-root (we can't write to the lists dir then) + * - magicmarker is (a bit) evil * - testing :) */ @@ -60,6 +66,12 @@ bool MirrorMethod::Configuration(string Message) } /*}}}*/ +// clean the mirrors dir based on ttl information +bool MirrorMethod::Clean(string dir) +{ + +} + bool MirrorMethod::GetMirrorFile(string uri) { @@ -69,7 +81,7 @@ bool MirrorMethod::GetMirrorFile(string uri) string fetch = BaseUri; fetch.replace(0,strlen("mirror://"),"http://"); - MirrorFile = _config->FindDir("Dir::State::lists") + URItoFileName(BaseUri); + MirrorFile = _config->FindDir("Dir::State::mirrors") + URItoFileName(BaseUri); if(Debug) { @@ -77,19 +89,43 @@ bool MirrorMethod::GetMirrorFile(string uri) cerr << "mirror-file: " << MirrorFile << endl; } - // FIXME: fetch it with curl + // check the file, if it is not older than RefreshInterval just use it + // otherwise try to get a new one + if(FileExists(MirrorFile)) + { + struct stat buf; + time_t t,now,refresh; + if(stat(MirrorFile.c_str(), &buf) != 0) + return false; + t = std::max(buf.st_mtime, buf.st_ctime); + now = time(NULL); + refresh = 60*_config->FindI("Acquire::Mirror::RefreshInterval",360); + if(t + refresh > now) + { + if(Debug) + clog << "Mirror file is in RefreshInterval" << endl; + HasMirrorFile = true; + return true; + } + if(Debug) + clog << "Mirror file " << MirrorFile << " older than " << refresh << ", re-download it" << endl; + } + + // not that great to use pkgAcquire here, but we do not have + // any other way right now pkgAcquire Fetcher; new pkgAcqFile(&Fetcher, fetch, "", 0, "", "", "", MirrorFile); bool res = (Fetcher.Run() == pkgAcquire::Continue); - - if(res) + if(res) HasMirrorFile = true; Fetcher.Shutdown(); - return true; + return res; } bool MirrorMethod::SelectMirror() { + // FIXME: make the mirror selection more clever, do not + // just use the first one! ifstream in(MirrorFile.c_str()); getline(in, Mirror); if(Debug) @@ -103,7 +139,7 @@ bool MirrorMethod::SelectMirror() depth. */ bool MirrorMethod::Fetch(FetchItem *Itm) { - // get mirror information + // select mirror only once per session if(!HasMirrorFile) { GetMirrorFile(Itm->Uri); diff --git a/methods/mirror.h b/methods/mirror.h index a47b8fbf1..798f5a9b5 100644 --- a/methods/mirror.h +++ b/methods/mirror.h @@ -34,6 +34,7 @@ class MirrorMethod : public HttpMethod protected: bool GetMirrorFile(string uri); bool SelectMirror(); + bool Clean(string dir); // we need to overwrite those to transform the url back virtual void Fail(string Why, bool Transient = false); diff --git a/po/apt-all.pot b/po/apt-all.pot index b3da2ba9a..42c43fe8d 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -2238,12 +2238,12 @@ msgstr "" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:121 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:137 msgid "Unable to determine a suitable packaging system type" msgstr "" -- cgit v1.2.3 From 70288656715d2fe4c2c33598124ae48f7bca9cdf Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 8 Jan 2007 11:38:55 +0100 Subject: * methods/mirror.cc: - implemented simple Clean() implementation based on the time of the last access for a mirror file --- doc/examples/configure-index | 2 ++ methods/mirror.cc | 55 +++++++++++++++++++++++++++++++++++++++++--- po/apt-all.pot | 3 ++- 3 files changed, 56 insertions(+), 4 deletions(-) diff --git a/doc/examples/configure-index b/doc/examples/configure-index index cb20d767b..81bb6b3b0 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -164,6 +164,8 @@ Acquire mirror { RefreshInterval "360"; // refresh interval in minutes + MaxAge "90"; // max age for a mirror file in days before + // it gets deleted }; }; diff --git a/methods/mirror.cc b/methods/mirror.cc index e70a40f55..425a2f7f5 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -19,12 +19,14 @@ #include #include #include +#include +#include using namespace std; #include "mirror.h" #include "http.h" - +#include "apti18n.h" /*}}}*/ /* @@ -67,9 +69,54 @@ bool MirrorMethod::Configuration(string Message) /*}}}*/ // clean the mirrors dir based on ttl information -bool MirrorMethod::Clean(string dir) +bool MirrorMethod::Clean(string Dir) { + // FIXME: it would better to have a global idea of the mirrors + // in the sources.list and use this instead of this time + // based approach. currently apt does not support this :/ + + DIR *D = opendir(Dir.c_str()); + if (D == 0) + return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str()); + + string StartDir = SafeGetCWD(); + if (chdir(Dir.c_str()) != 0) + { + closedir(D); + return _error->Errno("chdir",_("Unable to change to %s"),Dir.c_str()); + } + + for (struct dirent *Dir = readdir(D); Dir != 0; Dir = readdir(D)) + { + // Skip some files.. + if (strcmp(Dir->d_name,"lock") == 0 || + strcmp(Dir->d_name,"partial") == 0 || + strcmp(Dir->d_name,".") == 0 || + strcmp(Dir->d_name,"..") == 0) + continue; + + // Del everything not touched for MaxAge days + time_t t,now,max; + struct stat buf; + if(stat(Dir->d_name, &buf) != 0) + { + cerr << "Can't stat '" << Dir->d_name << "'" << endl; + continue; + } + t = std::max(buf.st_mtime, buf.st_ctime); + now = time(NULL); + max = 24*60*60*_config->FindI("Acquire::Mirror::MaxAge",90); + if(t + max < now) + { + if(Debug) + clog << "Mirror file is older than MaxAge days, deleting" << endl; + unlink(Dir->d_name); + } + }; + chdir(StartDir.c_str()); + closedir(D); + return true; } @@ -81,6 +128,7 @@ bool MirrorMethod::GetMirrorFile(string uri) string fetch = BaseUri; fetch.replace(0,strlen("mirror://"),"http://"); + // get new file MirrorFile = _config->FindDir("Dir::State::mirrors") + URItoFileName(BaseUri); if(Debug) @@ -108,7 +156,7 @@ bool MirrorMethod::GetMirrorFile(string uri) return true; } if(Debug) - clog << "Mirror file " << MirrorFile << " older than " << refresh << ", re-download it" << endl; + clog << "Mirror file " << MirrorFile << " older than " << refresh << "min, re-download it" << endl; } // not that great to use pkgAcquire here, but we do not have @@ -142,6 +190,7 @@ bool MirrorMethod::Fetch(FetchItem *Itm) // select mirror only once per session if(!HasMirrorFile) { + Clean(_config->FindDir("Dir::State::mirrors")); GetMirrorFile(Itm->Uri); SelectMirror(); } diff --git a/po/apt-all.pot b/po/apt-all.pot index 42c43fe8d..d1ce72503 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -1330,7 +1330,7 @@ msgstr "" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 methods/mirror.cc:76 #, c-format msgid "Unable to read %s" msgstr "" @@ -1956,6 +1956,7 @@ msgid "Unable to stat the mount point %s" msgstr "" #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: methods/mirror.cc:82 #, c-format msgid "Unable to change to %s" msgstr "" -- cgit v1.2.3 From 0c312e0ed24fed69412c181634dd4515e9b1d46f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 8 Jan 2007 12:10:05 +0100 Subject: * implemented proper mirror list cleanup --- methods/mirror.cc | 39 +++++++++++++++++++++------------------ po/apt-all.pot | 4 ++-- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/methods/mirror.cc b/methods/mirror.cc index 425a2f7f5..00f7b7807 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -14,6 +14,7 @@ #include #include #include +#include #include #include @@ -71,9 +72,14 @@ bool MirrorMethod::Configuration(string Message) // clean the mirrors dir based on ttl information bool MirrorMethod::Clean(string Dir) { - // FIXME: it would better to have a global idea of the mirrors - // in the sources.list and use this instead of this time - // based approach. currently apt does not support this :/ + vector::const_iterator I; + + if(Debug) + clog << "MirrorMethod::Clean(): " << Dir << endl; + + // read sources.list + pkgSourceList list; + list.ReadMainList(); DIR *D = opendir(Dir.c_str()); if (D == 0) @@ -94,24 +100,21 @@ bool MirrorMethod::Clean(string Dir) strcmp(Dir->d_name,".") == 0 || strcmp(Dir->d_name,"..") == 0) continue; - - // Del everything not touched for MaxAge days - time_t t,now,max; - struct stat buf; - if(stat(Dir->d_name, &buf) != 0) + + // see if we have that uri + for(I=list.begin(); I != list.end(); I++) { - cerr << "Can't stat '" << Dir->d_name << "'" << endl; - continue; + string uri = (*I)->GetURI(); + if(uri.substr(0,strlen("mirror://")) != string("mirror://")) + continue; + string Marker = _config->Find("Acquire::Mirror::MagicMarker","///"); + string BaseUri = uri.substr(0,uri.find(Marker)); + if (URItoFileName(BaseUri) == Dir->d_name) + break; } - t = std::max(buf.st_mtime, buf.st_ctime); - now = time(NULL); - max = 24*60*60*_config->FindI("Acquire::Mirror::MaxAge",90); - if(t + max < now) - { - if(Debug) - clog << "Mirror file is older than MaxAge days, deleting" << endl; + // nothing found, nuke it + if (I == list.end()) unlink(Dir->d_name); - } }; chdir(StartDir.c_str()); diff --git a/po/apt-all.pot b/po/apt-all.pot index d1ce72503..52fadb81c 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -1330,7 +1330,7 @@ msgstr "" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 methods/mirror.cc:76 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 methods/mirror.cc:86 #, c-format msgid "Unable to read %s" msgstr "" @@ -1956,7 +1956,7 @@ msgid "Unable to stat the mount point %s" msgstr "" #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 -#: methods/mirror.cc:82 +#: methods/mirror.cc:92 #, c-format msgid "Unable to change to %s" msgstr "" -- cgit v1.2.3 From 933833c51fbfe3dca3f3a3073d441e5856462605 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 8 Jan 2007 13:07:22 +0100 Subject: * methods/mirror.cc: - updated the TODO --- methods/mirror.cc | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/methods/mirror.cc b/methods/mirror.cc index 00f7b7807..f08b324ec 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -34,14 +34,18 @@ using namespace std; * TODO: * - send expected checksum to the mirror method so that some checking/falling back can be done here already - * - keep the mirror file around in /var/lib/apt/mirrors - * can't be put into lists/ because of the listclearer - * cleanup by time (mtime relative to the other mtimes) - * - use a TTL time the mirror file is fetched again (6h?) + use pkgAcquire::Custom600Header() for this? what about gpgv + failures? + #OR# + * - implement it at the pkgAcquire::Item::Failed() level but then + we need to send back what uri exactly was failing + * - deal with runing as non-root because we can't write to the lists dir then -> use the cached mirror file * - better method to download than having a pkgAcquire interface here - * - magicmarker is (a bit) evil + * - magicmarker is (a bit) evil, maybe just use a similar approach as in + clean and read the sources.list and use the GetURI() method to find + the prefix? * - testing :) */ -- cgit v1.2.3 From cae9cdcefc34eba6d023cb30cbbdb9bbf909b8fe Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 17 Jan 2007 16:35:56 +0100 Subject: * basic error reporting from apt in place now (ReportMirrorFailures()) --- apt-pkg/acquire-item.cc | 10 +++++++++- apt-pkg/acquire-item.h | 1 + apt-pkg/acquire-method.cc | 1 + apt-pkg/acquire-method.h | 1 + methods/mirror.cc | 27 +++++++++++++++++++++------ methods/mirror.h | 1 + po/apt-all.pot | 16 ++++++++-------- 7 files changed, 42 insertions(+), 15 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 8ec4ba2c0..7b2a89763 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -176,7 +176,8 @@ string pkgAcqIndex::Custom600Headers() struct stat Buf; if (stat(Final.c_str(),&Buf) != 0) return "\nIndex-File: true"; - + if(ExpectedMD5 != "") + return "\nExpectedMD5: " + ExpectedMD5; return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime); } /*}}}*/ @@ -1015,6 +1016,13 @@ void pkgAcqArchive::Failed(string Message,pkgAcquire::MethodConfig *Cnf) } } /*}}}*/ +// --------------------------------------------------------------------- +string pkgAcqArchive::Custom600Headers() +{ + if(MD5 != "") + return "\nExpectedMD5: " + MD5; + return ""; +} // AcqArchive::IsTrusted - Determine whether this archive comes from a // trusted source /*{{{*/ // --------------------------------------------------------------------- diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index da1bea801..c9cd75321 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -205,6 +205,7 @@ class pkgAcqArchive : public pkgAcquire::Item virtual string ShortDesc() {return Desc.ShortDesc;}; virtual void Finished(); virtual bool IsTrusted(); + virtual string Custom600Headers(); pkgAcqArchive(pkgAcquire *Owner,pkgSourceList *Sources, pkgRecords *Recs,pkgCache::VerIterator const &Version, diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc index 41b832f3b..638797657 100644 --- a/apt-pkg/acquire-method.cc +++ b/apt-pkg/acquire-method.cc @@ -368,6 +368,7 @@ int pkgAcqMethod::Run(bool Single) Tmp->Uri = LookupTag(Message,"URI"); Tmp->DestFile = LookupTag(Message,"FileName"); + Tmp->ExpectedMD5 = LookupTag(Message,"ExpectedMD5"); if (StrToTime(LookupTag(Message,"Last-Modified"),Tmp->LastModified) == false) Tmp->LastModified = 0; Tmp->IndexFile = StringToBool(LookupTag(Message,"Index-File"),false); diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h index e0e7c1d09..9e908d32c 100644 --- a/apt-pkg/acquire-method.h +++ b/apt-pkg/acquire-method.h @@ -33,6 +33,7 @@ class pkgAcqMethod string DestFile; time_t LastModified; bool IndexFile; + string ExpectedMD5; }; struct FetchResult diff --git a/methods/mirror.cc b/methods/mirror.cc index f08b324ec..428726a3d 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -32,14 +32,14 @@ using namespace std; /* * TODO: - * - send expected checksum to the mirror method so that - some checking/falling back can be done here already - use pkgAcquire::Custom600Header() for this? what about gpgv - failures? + * - what about gpgv failures? better standard format for errors + to send back to LP #OR# * - implement it at the pkgAcquire::Item::Failed() level but then - we need to send back what uri exactly was failing - + we need to send back what uri exactly was failing + [mvo: the problem with this approach is ::Failed() is not really + called for all failures :/ e.g. md5sum mismatch in a archive + is not] * - deal with runing as non-root because we can't write to the lists dir then -> use the cached mirror file * - better method to download than having a pkgAcquire interface here @@ -214,6 +214,9 @@ bool MirrorMethod::Fetch(FetchItem *Itm) void MirrorMethod::Fail(string Err,bool Transient) { + // FIXME: queue next mirror? + ReportMirrorFailure(Err); + if(Queue->Uri.find("http://") != string::npos) Queue->Uri.replace(0,Mirror.size(), BaseUri); pkgAcqMethod::Fail(Err, Transient); @@ -228,11 +231,23 @@ void MirrorMethod::URIStart(FetchResult &Res) void MirrorMethod::URIDone(FetchResult &Res,FetchResult *Alt) { + // FIXME: queue next mirror? + if(Queue->ExpectedMD5 != "" && Res.MD5Sum != Queue->ExpectedMD5) + ReportMirrorFailure("499 Hash mismatch"); + if(Queue->Uri.find("http://") != string::npos) Queue->Uri.replace(0,Mirror.size(), BaseUri); pkgAcqMethod::URIDone(Res, Alt); } +void MirrorMethod::ReportMirrorFailure(string FailCode) +{ + // report that Queue->Uri failed + std::cerr << "\nReportMirrorFailure: " + << Queue->Uri + << " FailCode: " + << FailCode << std::endl; +} int main() { diff --git a/methods/mirror.h b/methods/mirror.h index 798f5a9b5..3ff9e1a96 100644 --- a/methods/mirror.h +++ b/methods/mirror.h @@ -35,6 +35,7 @@ class MirrorMethod : public HttpMethod bool GetMirrorFile(string uri); bool SelectMirror(); bool Clean(string dir); + void ReportMirrorFailure(string FailCode); // we need to overwrite those to transform the url back virtual void Fail(string Why, bool Transient = false); diff --git a/po/apt-all.pot b/po/apt-all.pot index 52fadb81c..aee5c09c8 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -1330,7 +1330,7 @@ msgstr "" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 methods/mirror.cc:86 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 methods/mirror.cc:92 #, c-format msgid "Unable to read %s" msgstr "" @@ -1956,7 +1956,7 @@ msgid "Unable to stat the mount point %s" msgstr "" #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 -#: methods/mirror.cc:92 +#: methods/mirror.cc:98 #, c-format msgid "Unable to change to %s" msgstr "" @@ -2362,35 +2362,35 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 +#: apt-pkg/acquire-item.cc:237 apt-pkg/acquire-item.cc:946 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:640 +#: apt-pkg/acquire-item.cc:641 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:753 +#: apt-pkg/acquire-item.cc:754 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:812 +#: apt-pkg/acquire-item.cc:813 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:848 +#: apt-pkg/acquire-item.cc:849 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:935 +#: apt-pkg/acquire-item.cc:936 msgid "Size mismatch" msgstr "" -- cgit v1.2.3 From 2769f0bcf6c1ac73e883f47857fa227de92f4525 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 17 Jan 2007 17:16:42 +0100 Subject: * mirror-failure.py: example mirror failure cgi * methods/mirror.cc: prepare for the failure submit --- methods/mirror.cc | 6 ++++++ mirror-failure.py | 23 +++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 mirror-failure.py diff --git a/methods/mirror.cc b/methods/mirror.cc index 428726a3d..6621d47e2 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -247,6 +247,12 @@ void MirrorMethod::ReportMirrorFailure(string FailCode) << Queue->Uri << " FailCode: " << FailCode << std::endl; +#if 0 // FIXME: do not use system, make sure to properly encode + // URI/FailCode, do not hardcode the submit url + system("curl -d url=" + Queue->Uri + + " -d FailureCode=" + FailCode + + " http://localhost:8000/ &"); +#endif } int main() diff --git a/mirror-failure.py b/mirror-failure.py new file mode 100644 index 000000000..e7d2bbf54 --- /dev/null +++ b/mirror-failure.py @@ -0,0 +1,23 @@ +# File: cgihttpserver-example-1.py + +import CGIHTTPServer +import BaseHTTPServer + +class Handler(CGIHTTPServer.CGIHTTPRequestHandler): + #cgi_directories = ["/cgi"] + def do_POST(self): + print "do_POST" + #print self.command + #print self.path + #print self.headers + print self.client_address + data = self.rfile.read(int(self.headers["content-length"])) + print data + self.wfile.write("200 Ok\n"); + +PORT = 8000 + +httpd = BaseHTTPServer.HTTPServer(("", PORT), Handler) +print "serving at port", PORT +httpd.serve_forever() + -- cgit v1.2.3 From b47081521b0df1f835a2111254fa1fcd77240a85 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 23 Jan 2007 18:43:42 +0100 Subject: * cmdline/report-mirror-failure - basic mirror failure script added --- cmdline/report-mirror-failure | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100755 cmdline/report-mirror-failure diff --git a/cmdline/report-mirror-failure b/cmdline/report-mirror-failure new file mode 100755 index 000000000..8301ed079 --- /dev/null +++ b/cmdline/report-mirror-failure @@ -0,0 +1,21 @@ +#!/usr/bin/python + +import sys +import urllib +import apt_pkg + +apt_pkg.init() +url = apt_pkg.Config.Find("Acquire::Mirror::ReportFailures", + "http://people.ubuntu.com:9000/mirror-failure") + #"http://localhost:9000/mirror-failure") +if not url: + sys.exit(0) + +data = {} +data['url'] = sys.argv[1] +data['error'] = sys.argv[2] +f = urllib.urlopen(url, urllib.urlencode(data)) +f.read() +f.close() + + -- cgit v1.2.3 From 362d29343e5d25248bcd84300aa1b18effe891e7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 24 Jan 2007 14:42:17 +0100 Subject: make the mirror failures actually produce a error message --- cmdline/makefile | 6 ++++++ cmdline/report-mirror-failure | 21 -------------------- configure.in | 2 +- debian/changelog | 2 +- methods/mirror.cc | 46 ++++++++++++++++++++++++++++++++----------- po/apt-all.pot | 6 +++--- 6 files changed, 46 insertions(+), 37 deletions(-) delete mode 100755 cmdline/report-mirror-failure diff --git a/cmdline/makefile b/cmdline/makefile index 882a0e1b5..f07c7da3b 100644 --- a/cmdline/makefile +++ b/cmdline/makefile @@ -52,3 +52,9 @@ SOURCE=apt-key TO=$(BIN) TARGET=program include $(COPY_H) + +# The apt-key program +SOURCE=apt-report-mirror-failure +TO=$(LIB) +TARGET=program +include $(COPY_H) diff --git a/cmdline/report-mirror-failure b/cmdline/report-mirror-failure deleted file mode 100755 index 8301ed079..000000000 --- a/cmdline/report-mirror-failure +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/python - -import sys -import urllib -import apt_pkg - -apt_pkg.init() -url = apt_pkg.Config.Find("Acquire::Mirror::ReportFailures", - "http://people.ubuntu.com:9000/mirror-failure") - #"http://localhost:9000/mirror-failure") -if not url: - sys.exit(0) - -data = {} -data['url'] = sys.argv[1] -data['error'] = sys.argv[2] -f = urllib.urlopen(url, urllib.urlencode(data)) -f.read() -f.close() - - diff --git a/configure.in b/configure.in index 81f327c37..df452ba34 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.46.3") +AC_DEFINE_UNQUOTED(VERSION,"0.6.46.4") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 24e10dcd5..6c9ada3a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ apt (0.6.46.4) unstable; urgency=low * add apt-secure.8 to "See also" section - -- + -- Michael Vogt Wed, 24 Jan 2007 14:34:15 +0100 apt (0.6.46.3) unstable; urgency=low diff --git a/methods/mirror.cc b/methods/mirror.cc index 6621d47e2..8f9b8ed34 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -30,13 +30,18 @@ using namespace std; #include "apti18n.h" /*}}}*/ -/* +/* Done: + * - works with http only + * - always picks the first mirror from the list + * - call out to problem reporting script + * - supports "deb mirror://host/path/to/mirror-list/// dist component" + * * TODO: - * - what about gpgv failures? better standard format for errors - to send back to LP - #OR# - * - implement it at the pkgAcquire::Item::Failed() level but then - we need to send back what uri exactly was failing + * what about gpgv failures? this should call-out to the problem reporting + script, but we need to know what mirror was used + * better standard format for errors to send back + * - implement failure reporting at the pkgAcquire::Item::Failed() level + but then we need to send back what uri exactly was failing [mvo: the problem with this approach is ::Failed() is not really called for all failures :/ e.g. md5sum mismatch in a archive is not] @@ -46,6 +51,7 @@ using namespace std; * - magicmarker is (a bit) evil, maybe just use a similar approach as in clean and read the sources.list and use the GetURI() method to find the prefix? + * support more than http * - testing :) */ @@ -243,16 +249,34 @@ void MirrorMethod::URIDone(FetchResult &Res,FetchResult *Alt) void MirrorMethod::ReportMirrorFailure(string FailCode) { // report that Queue->Uri failed +#if 0 std::cerr << "\nReportMirrorFailure: " << Queue->Uri << " FailCode: " << FailCode << std::endl; -#if 0 // FIXME: do not use system, make sure to properly encode - // URI/FailCode, do not hardcode the submit url - system("curl -d url=" + Queue->Uri + - " -d FailureCode=" + FailCode + - " http://localhost:8000/ &"); #endif + const char *Args[40]; + unsigned int i = 0; + string report = _config->Find("Methods::Mirror::ProblemReporting", + "/usr/lib/apt/report-mirror-failure"); + Args[i++] = report.c_str(); + Args[i++] = Queue->Uri.c_str(); + Args[i++] = FailCode.c_str(); + pid_t pid = ExecFork(); + if(pid < 0) + { + _error->Error("ReportMirrorFailure Fork failed"); + return; + } + else if(pid == 0) + { + execvp(report.c_str(), (char**)Args); + } + if(!ExecWait(pid, "report-mirror-failure")) + { + _error->Warning("Couldn't report problem to '%s'", + _config->Find("Acquire::Mirror::ReportFailures").c_str()); + } } int main() diff --git a/po/apt-all.pot b/po/apt-all.pot index aee5c09c8..dd140bd63 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-11-24 16:37+0100\n" +"POT-Creation-Date: 2007-01-24 12:51+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1330,7 +1330,7 @@ msgstr "" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 methods/mirror.cc:92 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 methods/mirror.cc:96 #, c-format msgid "Unable to read %s" msgstr "" @@ -1956,7 +1956,7 @@ msgid "Unable to stat the mount point %s" msgstr "" #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 -#: methods/mirror.cc:98 +#: methods/mirror.cc:102 #, c-format msgid "Unable to change to %s" msgstr "" -- cgit v1.2.3 From 36280399db0ae203d3f1ae4d44b946f31e9a38ce Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 1 Feb 2007 12:32:50 +0100 Subject: * commited the latest mirror failure detection code --- apt-pkg/acquire-item.cc | 51 +++++++++++++++++++++++++++++++-------- apt-pkg/acquire-item.h | 5 +++- apt-pkg/acquire-method.cc | 21 ++++++++++------ apt-pkg/acquire-method.h | 8 +++--- cmdline/apt-report-mirror-failure | 23 ++++++++++++++++++ methods/connect.cc | 17 ++++++------- methods/mirror.cc | 45 +++------------------------------- methods/mirror.h | 1 - po/apt-all.pot | 44 ++++++++++++++++----------------- 9 files changed, 120 insertions(+), 95 deletions(-) create mode 100755 cmdline/apt-report-mirror-failure diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 7b2a89763..61564c7aa 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -79,6 +79,10 @@ void pkgAcquire::Item::Failed(string Message,pkgAcquire::MethodConfig *Cnf) Status = StatError; Dequeue(); } + + // report mirror failure back to LP if we actually use a mirror + if(!UsedMirror.empty()) + ReportMirrorFailure(ErrorText); } /*}}}*/ // Acquire::Item::Start - Item has begun to download /*{{{*/ @@ -100,6 +104,7 @@ void pkgAcquire::Item::Done(string Message,unsigned long Size,string, { // We just downloaded something.. string FileName = LookupTag(Message,"Filename"); + UsedMirror = LookupTag(Message,"UsedMirror"); if (Complete == false && FileName == DestFile) { if (Owner->Log != 0) @@ -108,7 +113,6 @@ void pkgAcquire::Item::Done(string Message,unsigned long Size,string, if (FileSize == 0) FileSize= Size; - Status = StatDone; ErrorText = string(); Owner->Dequeue(this); @@ -131,6 +135,42 @@ void pkgAcquire::Item::Rename(string From,string To) } /*}}}*/ +void pkgAcquire::Item::ReportMirrorFailure(string FailCode) +{ + // report that Queue->Uri failed +#if 0 + std::cerr << "\nReportMirrorFailure: " + << UsedMirror + << " FailCode: " + << FailCode << std::endl; +#endif + const char *Args[40]; + unsigned int i = 0; + string report = _config->Find("Methods::Mirror::ProblemReporting", + "/usr/bin/apt-report-mirror-failure"); + if(!FileExists(report)) + return; + Args[i++] = report.c_str(); + Args[i++] = UsedMirror.c_str(); + Args[i++] = FailCode.c_str(); + pid_t pid = ExecFork(); + if(pid < 0) + { + _error->Error("ReportMirrorFailure Fork failed"); + return; + } + else if(pid == 0) + { + execvp(report.c_str(), (char**)Args); + } + if(!ExecWait(pid, "report-mirror-failure")) + { + _error->Warning("Couldn't report problem to '%s'", + _config->Find("Acquire::Mirror::ReportFailures").c_str()); + } +} + + // AcqIndex::AcqIndex - Constructor /*{{{*/ // --------------------------------------------------------------------- /* The package file is added to the queue and a second class is @@ -176,8 +216,6 @@ string pkgAcqIndex::Custom600Headers() struct stat Buf; if (stat(Final.c_str(),&Buf) != 0) return "\nIndex-File: true"; - if(ExpectedMD5 != "") - return "\nExpectedMD5: " + ExpectedMD5; return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime); } /*}}}*/ @@ -1016,13 +1054,6 @@ void pkgAcqArchive::Failed(string Message,pkgAcquire::MethodConfig *Cnf) } } /*}}}*/ -// --------------------------------------------------------------------- -string pkgAcqArchive::Custom600Headers() -{ - if(MD5 != "") - return "\nExpectedMD5: " + MD5; - return ""; -} // AcqArchive::IsTrusted - Determine whether this archive comes from a // trusted source /*{{{*/ // --------------------------------------------------------------------- diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index c9cd75321..9949d0044 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -56,6 +56,7 @@ class pkgAcquire::Item unsigned long ID; bool Complete; bool Local; + string UsedMirror; // Number of queues we are inserted into unsigned int QueueCounter; @@ -78,6 +79,9 @@ class pkgAcquire::Item pkgAcquire *GetOwner() {return Owner;}; virtual bool IsTrusted() {return false;}; + // report mirror problems + void ReportMirrorFailure(string FailCode); + Item(pkgAcquire *Owner); virtual ~Item(); }; @@ -205,7 +209,6 @@ class pkgAcqArchive : public pkgAcquire::Item virtual string ShortDesc() {return Desc.ShortDesc;}; virtual void Finished(); virtual bool IsTrusted(); - virtual string Custom600Headers(); pkgAcqArchive(pkgAcquire *Owner,pkgSourceList *Sources, pkgRecords *Recs,pkgCache::VerIterator const &Version, diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc index 638797657..13201d310 100644 --- a/apt-pkg/acquire-method.cc +++ b/apt-pkg/acquire-method.cc @@ -99,12 +99,11 @@ void pkgAcqMethod::Fail(string Err,bool Transient) } char S[1024]; + char *End = S; if (Queue != 0) { - snprintf(S,sizeof(S)-50,"400 URI Failure\nURI: %s\n" - "Message: %s %s\n",Queue->Uri.c_str(),Err.c_str(), - FailExtra.c_str()); - + End += snprintf(S,sizeof(S)-50,"400 URI Failure\nURI: %s\n" + "Message: %s %s\n",Queue->Uri.c_str(), Err.c_str(), IP.c_str()); // Dequeue FetchItem *Tmp = Queue; Queue = Queue->Next; @@ -113,10 +112,14 @@ void pkgAcqMethod::Fail(string Err,bool Transient) QueueBack = Queue; } else - snprintf(S,sizeof(S)-50,"400 URI Failure\nURI: \n" - "Message: %s %s\n",Err.c_str(), - FailExtra.c_str()); - + { + End += snprintf(S,sizeof(S)-50,"400 URI Failure\nURI: \n" + "Message: %s\n",Err.c_str()); + } + if(FailReason.empty() == false) + End += snprintf(End,sizeof(S)-50 - (End - S),"FailReason: %s\n",FailReason.c_str()); + if (UsedMirror.empty() == false) + End += snprintf(End,sizeof(S)-50 - (End - S),"UsedMirror: %s\n",UsedMirror.c_str()); // Set the transient flag if (Transient == true) strcat(S,"Transient-Failure: true\n\n"); @@ -182,6 +185,8 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt) End += snprintf(End,sizeof(S)-50 - (End - S),"MD5-Hash: %s\n",Res.MD5Sum.c_str()); if (Res.SHA1Sum.empty() == false) End += snprintf(End,sizeof(S)-50 - (End - S),"SHA1-Hash: %s\n",Res.SHA1Sum.c_str()); + if (UsedMirror.empty() == false) + End += snprintf(End,sizeof(S)-50 - (End - S),"UsedMirror: %s\n",UsedMirror.c_str()); if (Res.GPGVOutput.size() > 0) End += snprintf(End,sizeof(S)-50 - (End - S),"GPGVOutput:\n"); for (vector::iterator I = Res.GPGVOutput.begin(); diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h index 9e908d32c..ee68c75f7 100644 --- a/apt-pkg/acquire-method.h +++ b/apt-pkg/acquire-method.h @@ -55,7 +55,9 @@ class pkgAcqMethod vector Messages; FetchItem *Queue; FetchItem *QueueBack; - string FailExtra; + string FailReason; + string UsedMirror; + string IP; // Handlers for messages virtual bool Configuration(string Message); @@ -72,7 +74,6 @@ class pkgAcqMethod virtual void Exit() {}; public: - enum CnfFlags {SingleInstance = (1<<0), Pipeline = (1<<1), SendConfig = (1<<2), LocalOnly = (1<<3), NeedsCleanup = (1<<4), @@ -82,7 +83,8 @@ class pkgAcqMethod void Status(const char *Format,...); int Run(bool Single = false); - inline void SetFailExtraMsg(string Msg) {FailExtra = Msg;}; + inline void SetFailReason(string Msg) {FailReason = Msg;}; + inline void SetIP(string aIP) {IP = aIP;}; pkgAcqMethod(const char *Ver,unsigned long Flags = 0); virtual ~pkgAcqMethod() {}; diff --git a/cmdline/apt-report-mirror-failure b/cmdline/apt-report-mirror-failure new file mode 100755 index 000000000..70b16cf4f --- /dev/null +++ b/cmdline/apt-report-mirror-failure @@ -0,0 +1,23 @@ +#!/usr/bin/python + +import sys +import urllib +import apt_pkg + +print "apt-report-mirror-failure" + +apt_pkg.init() +url = apt_pkg.Config.Find("Acquire::Mirror::ReportFailures", + "http://people.ubuntu.com:9000/mirror-failure") + #"http://localhost:9000/mirror-failure") +if not url: + sys.exit(0) + +data = {} +data['url'] = sys.argv[1] +data['error'] = sys.argv[2] +f = urllib.urlopen(url, urllib.urlencode(data)) +f.read() +f.close() + + diff --git a/methods/connect.cc b/methods/connect.cc index 8c2ac6d56..4e227c3fd 100644 --- a/methods/connect.cc +++ b/methods/connect.cc @@ -18,6 +18,7 @@ #include #include #include +#include // Internet stuff #include @@ -67,12 +68,10 @@ static bool DoConnect(struct addrinfo *Addr,string Host, wrong this will get tacked onto the end of the error message */ if (LastHostAddr->ai_next != 0) { - char Name2[NI_MAXHOST + NI_MAXSERV + 10]; - snprintf(Name2,sizeof(Name2),_("[IP: %s %s]"),Name,Service); - Owner->SetFailExtraMsg(string(Name2)); - } - else - Owner->SetFailExtraMsg(""); + std::stringstream ss; + ioprintf(ss, _("[IP: %s %s]"),Name,Service); + Owner->SetIP(ss.str()); + } // Get a socket if ((Fd = socket(Addr->ai_family,Addr->ai_socktype, @@ -89,7 +88,7 @@ static bool DoConnect(struct addrinfo *Addr,string Host, /* This implements a timeout for connect by opening the connection nonblocking */ if (WaitFd(Fd,true,TimeOut) == false) { - Owner->SetFailExtraMsg("\nFailReason: Timeout"); + Owner->SetFailReason("Timeout"); return _error->Error(_("Could not connect to %s:%s (%s), " "connection timed out"),Host.c_str(),Service,Name); } @@ -104,7 +103,7 @@ static bool DoConnect(struct addrinfo *Addr,string Host, { errno = Err; if(errno == ECONNREFUSED) - Owner->SetFailExtraMsg("\nFailReason: ConnectionRefused"); + Owner->SetFailReason("ConnectionRefused"); return _error->Errno("connect",_("Could not connect to %s:%s (%s)."),Host.c_str(), Service,Name); } @@ -169,7 +168,7 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd, if (Res == EAI_AGAIN) { - Owner->SetFailExtraMsg("\nFailReason: TmpResolveFailure"); + Owner->SetFailReason("TmpResolveFailure"); return _error->Error(_("Temporary failure resolving '%s'"), Host.c_str()); } diff --git a/methods/mirror.cc b/methods/mirror.cc index 8f9b8ed34..8ccfb8559 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -38,7 +38,7 @@ using namespace std; * * TODO: * what about gpgv failures? this should call-out to the problem reporting - script, but we need to know what mirror was used + script, but we need to know what mirror was used -> just run pkgAcquire::Item::ReportMirrorFailure() * better standard format for errors to send back * - implement failure reporting at the pkgAcquire::Item::Failed() level but then we need to send back what uri exactly was failing @@ -48,7 +48,7 @@ using namespace std; * - deal with runing as non-root because we can't write to the lists dir then -> use the cached mirror file * - better method to download than having a pkgAcquire interface here - * - magicmarker is (a bit) evil, maybe just use a similar approach as in + * - magicmarker is evil, maybe just use a similar approach as in clean and read the sources.list and use the GetURI() method to find the prefix? * support more than http @@ -191,6 +191,8 @@ bool MirrorMethod::SelectMirror() getline(in, Mirror); if(Debug) cerr << "Using mirror: " << Mirror << endl; + + UsedMirror = Mirror; return true; } @@ -220,9 +222,6 @@ bool MirrorMethod::Fetch(FetchItem *Itm) void MirrorMethod::Fail(string Err,bool Transient) { - // FIXME: queue next mirror? - ReportMirrorFailure(Err); - if(Queue->Uri.find("http://") != string::npos) Queue->Uri.replace(0,Mirror.size(), BaseUri); pkgAcqMethod::Fail(Err, Transient); @@ -237,47 +236,11 @@ void MirrorMethod::URIStart(FetchResult &Res) void MirrorMethod::URIDone(FetchResult &Res,FetchResult *Alt) { - // FIXME: queue next mirror? - if(Queue->ExpectedMD5 != "" && Res.MD5Sum != Queue->ExpectedMD5) - ReportMirrorFailure("499 Hash mismatch"); - if(Queue->Uri.find("http://") != string::npos) Queue->Uri.replace(0,Mirror.size(), BaseUri); pkgAcqMethod::URIDone(Res, Alt); } -void MirrorMethod::ReportMirrorFailure(string FailCode) -{ - // report that Queue->Uri failed -#if 0 - std::cerr << "\nReportMirrorFailure: " - << Queue->Uri - << " FailCode: " - << FailCode << std::endl; -#endif - const char *Args[40]; - unsigned int i = 0; - string report = _config->Find("Methods::Mirror::ProblemReporting", - "/usr/lib/apt/report-mirror-failure"); - Args[i++] = report.c_str(); - Args[i++] = Queue->Uri.c_str(); - Args[i++] = FailCode.c_str(); - pid_t pid = ExecFork(); - if(pid < 0) - { - _error->Error("ReportMirrorFailure Fork failed"); - return; - } - else if(pid == 0) - { - execvp(report.c_str(), (char**)Args); - } - if(!ExecWait(pid, "report-mirror-failure")) - { - _error->Warning("Couldn't report problem to '%s'", - _config->Find("Acquire::Mirror::ReportFailures").c_str()); - } -} int main() { diff --git a/methods/mirror.h b/methods/mirror.h index 3ff9e1a96..798f5a9b5 100644 --- a/methods/mirror.h +++ b/methods/mirror.h @@ -35,7 +35,6 @@ class MirrorMethod : public HttpMethod bool GetMirrorFile(string uri); bool SelectMirror(); bool Clean(string dir); - void ReportMirrorFailure(string FailCode); // we need to overwrite those to transform the url back virtual void Fail(string Why, bool Transient = false); diff --git a/po/apt-all.pot b/po/apt-all.pot index dd140bd63..15b650fda 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-01-24 12:51+0100\n" +"POT-Creation-Date: 2007-01-24 17:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -950,7 +950,7 @@ msgstr "" msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "" @@ -1330,7 +1330,7 @@ msgstr "" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 methods/mirror.cc:96 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 methods/mirror.cc:99 #, c-format msgid "Unable to read %s" msgstr "" @@ -1648,59 +1648,59 @@ msgstr "" msgid "Unable to invoke " msgstr "" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "" -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "" -#: methods/connect.cc:167 +#: methods/connect.cc:166 #, c-format msgid "Could not resolve '%s'" msgstr "" -#: methods/connect.cc:173 +#: methods/connect.cc:172 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" -#: methods/connect.cc:176 +#: methods/connect.cc:175 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "" -#: methods/connect.cc:223 +#: methods/connect.cc:222 #, c-format msgid "Unable to connect to %s %s:" msgstr "" @@ -1956,7 +1956,7 @@ msgid "Unable to stat the mount point %s" msgstr "" #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 -#: methods/mirror.cc:102 +#: methods/mirror.cc:105 #, c-format msgid "Unable to change to %s" msgstr "" @@ -2357,40 +2357,40 @@ msgstr "" msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:128 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:237 apt-pkg/acquire-item.cc:946 +#: apt-pkg/acquire-item.cc:275 apt-pkg/acquire-item.cc:984 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:641 +#: apt-pkg/acquire-item.cc:679 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:754 +#: apt-pkg/acquire-item.cc:792 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:813 +#: apt-pkg/acquire-item.cc:851 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:849 +#: apt-pkg/acquire-item.cc:887 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:936 +#: apt-pkg/acquire-item.cc:974 msgid "Size mismatch" msgstr "" -- cgit v1.2.3 From 361593e92a44255cc0ef98417e7457911716cab5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 1 Feb 2007 13:02:47 +0100 Subject: * get the mirror failure stuff really working --- apt-pkg/acquire-item.cc | 8 ++++++-- cmdline/apt-report-mirror-failure | 4 ++-- po/apt-all.pot | 20 ++++++++++---------- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 61564c7aa..0d3d6a083 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -63,6 +63,7 @@ void pkgAcquire::Item::Failed(string Message,pkgAcquire::MethodConfig *Cnf) { Status = StatIdle; ErrorText = LookupTag(Message,"Message"); + UsedMirror = LookupTag(Message,"UsedMirror"); if (QueueCounter <= 1) { /* This indicates that the file is not available right now but might @@ -153,6 +154,7 @@ void pkgAcquire::Item::ReportMirrorFailure(string FailCode) Args[i++] = report.c_str(); Args[i++] = UsedMirror.c_str(); Args[i++] = FailCode.c_str(); + Args[i++] = NULL; pid_t pid = ExecFork(); if(pid < 0) { @@ -161,12 +163,14 @@ void pkgAcquire::Item::ReportMirrorFailure(string FailCode) } else if(pid == 0) { - execvp(report.c_str(), (char**)Args); + execvp(Args[0], (char**)Args); + std::cerr << "Could not exec " << Args[0] << std::endl; + _exit(100); } if(!ExecWait(pid, "report-mirror-failure")) { _error->Warning("Couldn't report problem to '%s'", - _config->Find("Acquire::Mirror::ReportFailures").c_str()); + _config->Find("Methods::Mirror::ProblemReporting").c_str()); } } diff --git a/cmdline/apt-report-mirror-failure b/cmdline/apt-report-mirror-failure index 70b16cf4f..277b23e9a 100755 --- a/cmdline/apt-report-mirror-failure +++ b/cmdline/apt-report-mirror-failure @@ -4,8 +4,6 @@ import sys import urllib import apt_pkg -print "apt-report-mirror-failure" - apt_pkg.init() url = apt_pkg.Config.Find("Acquire::Mirror::ReportFailures", "http://people.ubuntu.com:9000/mirror-failure") @@ -13,6 +11,8 @@ url = apt_pkg.Config.Find("Acquire::Mirror::ReportFailures", if not url: sys.exit(0) +print "Reporting mirror failure to '%s'" % url + data = {} data['url'] = sys.argv[1] data['error'] = sys.argv[2] diff --git a/po/apt-all.pot b/po/apt-all.pot index 15b650fda..39759f265 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-01-24 17:20+0100\n" +"POT-Creation-Date: 2007-02-01 12:41+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1330,7 +1330,7 @@ msgstr "" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 methods/mirror.cc:99 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 methods/mirror.cc:96 #, c-format msgid "Unable to read %s" msgstr "" @@ -1956,7 +1956,7 @@ msgid "Unable to stat the mount point %s" msgstr "" #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 -#: methods/mirror.cc:105 +#: methods/mirror.cc:102 #, c-format msgid "Unable to change to %s" msgstr "" @@ -2357,40 +2357,40 @@ msgstr "" msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:128 +#: apt-pkg/acquire-item.cc:131 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:275 apt-pkg/acquire-item.cc:984 +#: apt-pkg/acquire-item.cc:279 apt-pkg/acquire-item.cc:988 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:679 +#: apt-pkg/acquire-item.cc:683 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:792 +#: apt-pkg/acquire-item.cc:796 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:851 +#: apt-pkg/acquire-item.cc:855 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:887 +#: apt-pkg/acquire-item.cc:891 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:974 +#: apt-pkg/acquire-item.cc:978 msgid "Size mismatch" msgstr "" -- cgit v1.2.3 From 59271f62e4a291c8d96e1f6073203c395734b6ca Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 5 Feb 2007 17:52:28 +0100 Subject: * use pkgAcqMethod::FailReason() for consistent error reporting --- apt-pkg/acquire-item.cc | 10 +++++++--- methods/connect.cc | 1 + methods/http.cc | 3 +++ methods/mirror.cc | 12 +++--------- po/apt-all.pot | 34 +++++++++++++++++----------------- 5 files changed, 31 insertions(+), 29 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 0d3d6a083..08a029ff4 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -82,8 +82,7 @@ void pkgAcquire::Item::Failed(string Message,pkgAcquire::MethodConfig *Cnf) } // report mirror failure back to LP if we actually use a mirror - if(!UsedMirror.empty()) - ReportMirrorFailure(ErrorText); + ReportMirrorFailure(ErrorText); } /*}}}*/ // Acquire::Item::Start - Item has begun to download /*{{{*/ @@ -138,10 +137,13 @@ void pkgAcquire::Item::Rename(string From,string To) void pkgAcquire::Item::ReportMirrorFailure(string FailCode) { - // report that Queue->Uri failed + // we only act if a mirror was used at all + if(UsedMirror.empty()) + return; #if 0 std::cerr << "\nReportMirrorFailure: " << UsedMirror + << " Uri: " << DescURI() << " FailCode: " << FailCode << std::endl; #endif @@ -278,6 +280,7 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string MD5, Status = StatAuthError; ErrorText = _("MD5Sum mismatch"); Rename(DestFile,DestFile + ".FAILED"); + ReportMirrorFailure("HashChecksumFailure"); return; } // Done, move it into position @@ -765,6 +768,7 @@ void pkgAcqMetaIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) } // gpgv method failed + ReportMirrorFailure("GPGFailure"); _error->Warning("GPG error: %s: %s", Desc.Description.c_str(), LookupTag(Message,"Message").c_str()); diff --git a/methods/connect.cc b/methods/connect.cc index 4e227c3fd..145001fb3 100644 --- a/methods/connect.cc +++ b/methods/connect.cc @@ -163,6 +163,7 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd, DefPort = 0; continue; } + Owner->SetFailReason("ResolveFailure"); return _error->Error(_("Could not resolve '%s'"),Host.c_str()); } diff --git a/methods/http.cc b/methods/http.cc index deaa8d0c8..01ad14655 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -914,6 +914,9 @@ int HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv) failure */ if (Srv->Result < 200 || Srv->Result >= 300) { + char err[255]; + snprintf(err,sizeof(err)-1,"HttpError%i",Srv->Result); + SetFailReason(err); _error->Error("%u %s",Srv->Result,Srv->Code); if (Srv->HaveContent == true) return 4; diff --git a/methods/mirror.cc b/methods/mirror.cc index 8ccfb8559..b64879bec 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -31,20 +31,14 @@ using namespace std; /*}}}*/ /* Done: - * - works with http only + * - works with http (only!) * - always picks the first mirror from the list * - call out to problem reporting script * - supports "deb mirror://host/path/to/mirror-list/// dist component" + * - use pkgAcqMethod::FailReason() to have a string representation + * of the failure that is also send to LP * * TODO: - * what about gpgv failures? this should call-out to the problem reporting - script, but we need to know what mirror was used -> just run pkgAcquire::Item::ReportMirrorFailure() - * better standard format for errors to send back - * - implement failure reporting at the pkgAcquire::Item::Failed() level - but then we need to send back what uri exactly was failing - [mvo: the problem with this approach is ::Failed() is not really - called for all failures :/ e.g. md5sum mismatch in a archive - is not] * - deal with runing as non-root because we can't write to the lists dir then -> use the cached mirror file * - better method to download than having a pkgAcquire interface here diff --git a/po/apt-all.pot b/po/apt-all.pot index 39759f265..f24f19ba7 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -1330,7 +1330,7 @@ msgstr "" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 methods/mirror.cc:96 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 methods/mirror.cc:98 #, c-format msgid "Unable to read %s" msgstr "" @@ -1621,7 +1621,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1685,22 +1685,22 @@ msgstr "" msgid "Connecting to %s" msgstr "" -#: methods/connect.cc:166 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "" -#: methods/connect.cc:172 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" -#: methods/connect.cc:175 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "" -#: methods/connect.cc:222 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "" @@ -1813,15 +1813,15 @@ msgstr "" msgid "Error reading from server" msgstr "" -#: methods/http.cc:1106 +#: methods/http.cc:1109 msgid "Bad header data" msgstr "" -#: methods/http.cc:1123 +#: methods/http.cc:1126 msgid "Connection failed" msgstr "" -#: methods/http.cc:1214 +#: methods/http.cc:1217 msgid "Internal error" msgstr "" @@ -1956,7 +1956,7 @@ msgid "Unable to stat the mount point %s" msgstr "" #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 -#: methods/mirror.cc:102 +#: methods/mirror.cc:104 #, c-format msgid "Unable to change to %s" msgstr "" @@ -2357,40 +2357,40 @@ msgstr "" msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:131 +#: apt-pkg/acquire-item.cc:130 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:279 apt-pkg/acquire-item.cc:988 +#: apt-pkg/acquire-item.cc:281 apt-pkg/acquire-item.cc:992 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:683 +#: apt-pkg/acquire-item.cc:686 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:796 +#: apt-pkg/acquire-item.cc:800 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:859 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:891 +#: apt-pkg/acquire-item.cc:895 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:978 +#: apt-pkg/acquire-item.cc:982 msgid "Size mismatch" msgstr "" -- cgit v1.2.3 From 066b53e95ba224f81d078e7d8df3002275f8a092 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 5 Feb 2007 18:46:45 +0100 Subject: * get rid of magic mirror --- methods/mirror.cc | 62 +++++++++++++++++++++++++++++++++++++++++-------------- po/apt-all.pot | 4 ++-- 2 files changed, 48 insertions(+), 18 deletions(-) diff --git a/methods/mirror.cc b/methods/mirror.cc index b64879bec..ff91130b8 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -42,22 +42,13 @@ using namespace std; * - deal with runing as non-root because we can't write to the lists dir then -> use the cached mirror file * - better method to download than having a pkgAcquire interface here - * - magicmarker is evil, maybe just use a similar approach as in - clean and read the sources.list and use the GetURI() method to find - the prefix? - * support more than http + * - support more than http * - testing :) */ MirrorMethod::MirrorMethod() : HttpMethod(), HasMirrorFile(false) { -#if 0 - HasMirrorFile=true; - BaseUri="mirror://people.ubuntu.com/~mvo/mirror/mirrors"; - MirrorFile="/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_mirror_mirrors"; - Mirror="http://de.archive.ubuntu.com/ubuntu/"; -#endif }; // HttpMethod::Configuration - Handle a configuration message /*{{{*/ @@ -111,8 +102,7 @@ bool MirrorMethod::Clean(string Dir) string uri = (*I)->GetURI(); if(uri.substr(0,strlen("mirror://")) != string("mirror://")) continue; - string Marker = _config->Find("Acquire::Mirror::MagicMarker","///"); - string BaseUri = uri.substr(0,uri.find(Marker)); + string BaseUri = uri.substr(0,uri.size()-1); if (URItoFileName(BaseUri) == Dir->d_name) break; } @@ -127,11 +117,51 @@ bool MirrorMethod::Clean(string Dir) } -bool MirrorMethod::GetMirrorFile(string uri) +bool MirrorMethod::GetMirrorFile(string mirror_uri_str) { - string Marker = _config->Find("Acquire::Mirror::MagicMarker","///"); - BaseUri = uri.substr(0,uri.find(Marker)); - + /* + - a mirror_uri_str looks like this: + mirror://people.ubuntu.com/~mvo/apt/mirror/mirrors/dists/feisty/Release.gpg + + - the matching source.list entry + deb mirror://people.ubuntu.com/~mvo/apt/mirror/mirrors feisty main + + - we actually want to go after: + http://people.ubuntu.com/~mvo/apt/mirror/mirrors + + And we need to save the BaseUri for later: + - mirror://people.ubuntu.com/~mvo/apt/mirror/mirrors + + FIXME: what if we have two similar prefixes? + mirror://people.ubuntu.com/~mvo/mirror + mirror://people.ubuntu.com/~mvo/mirror2 + then mirror_uri_str looks like: + mirror://people.ubuntu.com/~mvo/apt/mirror/dists/feisty/Release.gpg + mirror://people.ubuntu.com/~mvo/apt/mirror2/dists/feisty/Release.gpg + we search sources.list and find: + mirror://people.ubuntu.com/~mvo/apt/mirror + in both cases! So we need to apply some domain knowledge here :( and + check for /dists/ or /Release.gpg as suffixes + */ + std::cerr << "GetMirrorFile: " << mirror_uri_str << std::endl; + + // read sources.list and find match + vector::const_iterator I; + pkgSourceList list; + list.ReadMainList(); + for(I=list.begin(); I != list.end(); I++) + { + string uristr = (*I)->GetURI(); + std::cerr << "Checking: " << uristr << std::endl; + if(uristr.substr(0,strlen("mirror://")) != string("mirror://")) + continue; + // find matching uri in sources.list + if(mirror_uri_str.substr(0,uristr.size()) == uristr) + { + std::cerr << "found BaseURI: " << uristr << std::endl; + BaseUri = uristr.substr(0,uristr.size()-1); + } + } string fetch = BaseUri; fetch.replace(0,strlen("mirror://"),"http://"); diff --git a/po/apt-all.pot b/po/apt-all.pot index f24f19ba7..8fa68d296 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -1330,7 +1330,7 @@ msgstr "" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 methods/mirror.cc:98 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 methods/mirror.cc:90 #, c-format msgid "Unable to read %s" msgstr "" @@ -1956,7 +1956,7 @@ msgid "Unable to stat the mount point %s" msgstr "" #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 -#: methods/mirror.cc:104 +#: methods/mirror.cc:96 #, c-format msgid "Unable to change to %s" msgstr "" -- cgit v1.2.3 From f0b509cdb44cb5e79e9c5ddd7ebec46965138534 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 5 Feb 2007 19:06:42 +0100 Subject: * apt-pkg/acquire-item.cc: - use FailReason in pkgAcquire::Item::Failed when available * methods/mirror.cc: - move some debug output into if(Debug) --- apt-pkg/acquire-item.cc | 7 ++++++- cmdline/apt-report-mirror-failure | 5 +++-- methods/mirror.cc | 9 ++++++--- po/apt-all.pot | 18 +++++++++--------- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 08a029ff4..14610d6e9 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -82,7 +82,11 @@ void pkgAcquire::Item::Failed(string Message,pkgAcquire::MethodConfig *Cnf) } // report mirror failure back to LP if we actually use a mirror - ReportMirrorFailure(ErrorText); + string FailReason = LookupTag(Message, "FailReason"); + if(FailReason.size() != 0) + ReportMirrorFailure(FailReason); + else + ReportMirrorFailure(ErrorText); } /*}}}*/ // Acquire::Item::Start - Item has begun to download /*{{{*/ @@ -155,6 +159,7 @@ void pkgAcquire::Item::ReportMirrorFailure(string FailCode) return; Args[i++] = report.c_str(); Args[i++] = UsedMirror.c_str(); + Args[i++] = DescURI().c_str(); Args[i++] = FailCode.c_str(); Args[i++] = NULL; pid_t pid = ExecFork(); diff --git a/cmdline/apt-report-mirror-failure b/cmdline/apt-report-mirror-failure index 277b23e9a..fb43f0e74 100755 --- a/cmdline/apt-report-mirror-failure +++ b/cmdline/apt-report-mirror-failure @@ -14,8 +14,9 @@ if not url: print "Reporting mirror failure to '%s'" % url data = {} -data['url'] = sys.argv[1] -data['error'] = sys.argv[2] +data['mirror'] = sys.argv[1] +data['failurl'] = sys.argv[2] +data['error'] = sys.argv[3] f = urllib.urlopen(url, urllib.urlencode(data)) f.read() f.close() diff --git a/methods/mirror.cc b/methods/mirror.cc index ff91130b8..c5c0c7461 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -143,7 +143,8 @@ bool MirrorMethod::GetMirrorFile(string mirror_uri_str) in both cases! So we need to apply some domain knowledge here :( and check for /dists/ or /Release.gpg as suffixes */ - std::cerr << "GetMirrorFile: " << mirror_uri_str << std::endl; + if(Debug) + std::cerr << "GetMirrorFile: " << mirror_uri_str << std::endl; // read sources.list and find match vector::const_iterator I; @@ -152,13 +153,15 @@ bool MirrorMethod::GetMirrorFile(string mirror_uri_str) for(I=list.begin(); I != list.end(); I++) { string uristr = (*I)->GetURI(); - std::cerr << "Checking: " << uristr << std::endl; + if(Debug) + std::cerr << "Checking: " << uristr << std::endl; if(uristr.substr(0,strlen("mirror://")) != string("mirror://")) continue; // find matching uri in sources.list if(mirror_uri_str.substr(0,uristr.size()) == uristr) { - std::cerr << "found BaseURI: " << uristr << std::endl; + if(Debug) + std::cerr << "found BaseURI: " << uristr << std::endl; BaseUri = uristr.substr(0,uristr.size()-1); } } diff --git a/po/apt-all.pot b/po/apt-all.pot index 8fa68d296..2355eee20 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -1330,7 +1330,7 @@ msgstr "" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 methods/mirror.cc:90 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 methods/mirror.cc:81 #, c-format msgid "Unable to read %s" msgstr "" @@ -1956,7 +1956,7 @@ msgid "Unable to stat the mount point %s" msgstr "" #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 -#: methods/mirror.cc:96 +#: methods/mirror.cc:87 #, c-format msgid "Unable to change to %s" msgstr "" @@ -2357,40 +2357,40 @@ msgstr "" msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:130 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:281 apt-pkg/acquire-item.cc:992 +#: apt-pkg/acquire-item.cc:286 apt-pkg/acquire-item.cc:997 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:686 +#: apt-pkg/acquire-item.cc:691 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:800 +#: apt-pkg/acquire-item.cc:805 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:859 +#: apt-pkg/acquire-item.cc:864 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:895 +#: apt-pkg/acquire-item.cc:900 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:982 +#: apt-pkg/acquire-item.cc:987 msgid "Size mismatch" msgstr "" -- cgit v1.2.3 From 3f599bb721c4ac58d8ff18991c9704b5f30eaa2b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 6 Feb 2007 10:49:25 +0100 Subject: * apt-pkg/acquire-item.cc: - default to "/usr/lib/apt/apt-report-mirror-failure" * cmdline/apt-report-mirror-failure: - no default comit url for now * debian/rules: - move apt-report-mirror-failure into /usr/lib/apt * doc/examples/configure-index: - more documentation * methods/mirror.cc: - updated TODO --- apt-pkg/acquire-item.cc | 2 +- cmdline/apt-report-mirror-failure | 4 ++-- cmdline/makefile | 2 +- debian/rules | 4 ++++ doc/examples/configure-index | 4 ++++ methods/mirror.cc | 1 + 6 files changed, 13 insertions(+), 4 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 14610d6e9..38530152f 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -154,7 +154,7 @@ void pkgAcquire::Item::ReportMirrorFailure(string FailCode) const char *Args[40]; unsigned int i = 0; string report = _config->Find("Methods::Mirror::ProblemReporting", - "/usr/bin/apt-report-mirror-failure"); + "/usr/lib/apt/apt-report-mirror-failure"); if(!FileExists(report)) return; Args[i++] = report.c_str(); diff --git a/cmdline/apt-report-mirror-failure b/cmdline/apt-report-mirror-failure index fb43f0e74..1567e78e3 100755 --- a/cmdline/apt-report-mirror-failure +++ b/cmdline/apt-report-mirror-failure @@ -5,8 +5,8 @@ import urllib import apt_pkg apt_pkg.init() -url = apt_pkg.Config.Find("Acquire::Mirror::ReportFailures", - "http://people.ubuntu.com:9000/mirror-failure") +url = apt_pkg.Config.Find("Acquire::Mirror::ReportFailures", None) + #"http://people.ubuntu.com:9000/mirror-failure") #"http://localhost:9000/mirror-failure") if not url: sys.exit(0) diff --git a/cmdline/makefile b/cmdline/makefile index f07c7da3b..8d284c2f3 100644 --- a/cmdline/makefile +++ b/cmdline/makefile @@ -55,6 +55,6 @@ include $(COPY_H) # The apt-key program SOURCE=apt-report-mirror-failure -TO=$(LIB) +TO=$(BIN) TARGET=program include $(COPY_H) diff --git a/debian/rules b/debian/rules index 02ee734bb..9e87b1723 100755 --- a/debian/rules +++ b/debian/rules @@ -214,6 +214,10 @@ apt: build debian/shlibs.local # head -n 500 ChangeLog > debian/ChangeLog + # move the mirror failure script in place + mv debian/$@/usr/bin/apt-report-mirror-failure \ + debian/$@/usr/lib/apt/apt-report-mirror-failure \ + dh_installexamples -p$@ $(BLD)/docs/examples/* dh_installman -p$@ dh_installcron -p$@ diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 81bb6b3b0..81fa4c52f 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -166,6 +166,10 @@ Acquire RefreshInterval "360"; // refresh interval in minutes MaxAge "90"; // max age for a mirror file in days before // it gets deleted + // mirror failure reporting script + ProblemReporting "/usr/lib/apt/apt-report-mirror-failure"; + // mirror failure reporting url + ReportFailures "http://example.com/mirror-failure"; }; }; diff --git a/methods/mirror.cc b/methods/mirror.cc index c5c0c7461..9a86a10c2 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -42,6 +42,7 @@ using namespace std; * - deal with runing as non-root because we can't write to the lists dir then -> use the cached mirror file * - better method to download than having a pkgAcquire interface here + * and better error handling there! * - support more than http * - testing :) */ -- cgit v1.2.3 From 39e1be0ff93e3084b7cb98b6a7d0c272a8b296b0 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 6 Feb 2007 11:06:15 +0100 Subject: * removed dead code --- apt-pkg/acquire-method.cc | 1 - apt-pkg/acquire-method.h | 1 - doc/examples/configure-index | 1 + po/apt-all.pot | 6 +++--- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc index 13201d310..180b52ad7 100644 --- a/apt-pkg/acquire-method.cc +++ b/apt-pkg/acquire-method.cc @@ -373,7 +373,6 @@ int pkgAcqMethod::Run(bool Single) Tmp->Uri = LookupTag(Message,"URI"); Tmp->DestFile = LookupTag(Message,"FileName"); - Tmp->ExpectedMD5 = LookupTag(Message,"ExpectedMD5"); if (StrToTime(LookupTag(Message,"Last-Modified"),Tmp->LastModified) == false) Tmp->LastModified = 0; Tmp->IndexFile = StringToBool(LookupTag(Message,"Index-File"),false); diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h index ee68c75f7..20691cc2c 100644 --- a/apt-pkg/acquire-method.h +++ b/apt-pkg/acquire-method.h @@ -33,7 +33,6 @@ class pkgAcqMethod string DestFile; time_t LastModified; bool IndexFile; - string ExpectedMD5; }; struct FetchResult diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 81fa4c52f..c02fe849f 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -184,6 +184,7 @@ Dir "/" userstatus "status.user"; status "/var/lib/dpkg/status"; cdroms "cdroms.list"; + mirrors "mirrors/"; }; // Location of the cache dir diff --git a/po/apt-all.pot b/po/apt-all.pot index 2355eee20..c37d84be2 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-01 12:41+0100\n" +"POT-Creation-Date: 2007-02-06 10:56+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1330,7 +1330,7 @@ msgstr "" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 methods/mirror.cc:81 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "" @@ -1956,7 +1956,7 @@ msgid "Unable to stat the mount point %s" msgstr "" #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 -#: methods/mirror.cc:87 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "" -- cgit v1.2.3 From 78a9df8a467d9f240df81c236f233a38f450e60a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 6 Feb 2007 11:09:41 +0100 Subject: * updated changelog ro reflect last upload --- configure.in | 2 +- debian/changelog | 19 +++++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/configure.in b/configure.in index f6208777f..67841b3ef 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.46.4ubuntu5") +AC_DEFINE_UNQUOTED(VERSION,"0.6.46.4ubuntu6") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 45f79f40a..838567183 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +apt (0.6.46.4ubuntu6) feisty; urgency=low + + * methods/http.cc: + - send apt version in User-Agent + * apt-pkg/deb/debrecords.cc: + - fix SHA1Hash() return value + * apt-pkg/algorithms.cc: + - fix resolver bug on removal triggered by weak-dependencies + with or-groups + - fix segfault (lp: #76530) + + -- Michael Vogt Wed, 20 Dec 2006 11:04:36 +0100 + apt (0.6.46.4ubuntu5) feisty; urgency=low * added apt-transport-https package to provide a optional @@ -10,12 +23,6 @@ apt (0.6.46.4ubuntu4) feisty; urgency=low * apt-pkg/algorithms.cc: - only increase the score of installed applications if they are not obsolete - - fix resolver bug on removal triggered by weak-dependencies - with or-groups - * methods/http.cc: - - send apt version in User-Agent - * apt-pkg/deb/debrecords.cc: - - fix SHA1Hash() return value -- Michael Vogt Mon, 18 Dec 2006 19:39:05 +0100 -- cgit v1.2.3 From 68acfb437f0c6c2e026be6fd3b7da3fc8d64c523 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 6 Feb 2007 16:37:20 +0100 Subject: * ABI version bumped --- apt-pkg/init.h | 2 +- apt-pkg/makefile | 2 +- debian/changelog | 1 + methods/makefile | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apt-pkg/init.h b/apt-pkg/init.h index b036b8609..0e91f164d 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -18,7 +18,7 @@ // See the makefile #define APT_PKG_MAJOR 3 -#define APT_PKG_MINOR 51 +#define APT_PKG_MINOR 52 #define APT_PKG_RELEASE 0 extern const char *pkgVersion; diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 6cc1414b2..10b012774 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -13,7 +13,7 @@ include ../buildlib/defaults.mak # methods/makefile - FIXME LIBRARY=apt-pkg LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER) -MAJOR=3.51 +MAJOR=3.52 MINOR=0 SLIBS=$(PTHREADLIB) $(INTLLIBS) APT_DOMAIN:=libapt-pkg$(MAJOR) diff --git a/debian/changelog b/debian/changelog index 6fdf646f0..caed5e531 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ apt (0.6.46.4ubuntu7) feisty; urgency=low It also supports error reporting to a configurable url for mirror problems/failures. + * Bump ABI version -- Michael Vogt Tue, 6 Feb 2007 11:38:06 +0100 diff --git a/methods/makefile b/methods/makefile index f971e56e8..d66ba11e3 100644 --- a/methods/makefile +++ b/methods/makefile @@ -7,7 +7,7 @@ include ../buildlib/defaults.mak BIN := $(BIN)/methods # FIXME.. -LIB_APT_PKG_MAJOR = 3.51 +LIB_APT_PKG_MAJOR = 3.52 APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR) # The file method -- cgit v1.2.3 From d715b9c969264eec96913b577f63a3e9e498b2e6 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 21 Feb 2007 09:59:53 +0100 Subject: * fix in the pkgRecords destructor * Bump ABI version --- apt-pkg/init.h | 2 +- apt-pkg/makefile | 2 +- apt-pkg/pkgrecords.cc | 16 +++++++++------- apt-pkg/pkgrecords.h | 5 +++-- configure.in | 2 +- debian/changelog | 7 +++++++ methods/makefile | 2 +- po/apt-all.pot | 48 ++++++++++++++++++++++++------------------------ 8 files changed, 47 insertions(+), 37 deletions(-) diff --git a/apt-pkg/init.h b/apt-pkg/init.h index 0e91f164d..905173a7a 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -18,7 +18,7 @@ // See the makefile #define APT_PKG_MAJOR 3 -#define APT_PKG_MINOR 52 +#define APT_PKG_MINOR 53 #define APT_PKG_RELEASE 0 extern const char *pkgVersion; diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 10b012774..d36747d85 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -13,7 +13,7 @@ include ../buildlib/defaults.mak # methods/makefile - FIXME LIBRARY=apt-pkg LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER) -MAJOR=3.52 +MAJOR=3.53 MINOR=0 SLIBS=$(PTHREADLIB) $(INTLLIBS) APT_DOMAIN:=libapt-pkg$(MAJOR) diff --git a/apt-pkg/pkgrecords.cc b/apt-pkg/pkgrecords.cc index b22f3e73f..456b5aef4 100644 --- a/apt-pkg/pkgrecords.cc +++ b/apt-pkg/pkgrecords.cc @@ -23,11 +23,9 @@ // Records::pkgRecords - Constructor /*{{{*/ // --------------------------------------------------------------------- /* This will create the necessary structures to access the status files */ -pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), Files(0) +pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), + Files(Cache.HeaderP->PackageFileCount) { - Files = new Parser *[Cache.HeaderP->PackageFileCount]; - memset(Files,0,sizeof(*Files)*Cache.HeaderP->PackageFileCount); - for (pkgCache::PkgFileIterator I = Cache.FileBegin(); I.end() == false; I++) { @@ -49,9 +47,13 @@ pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), Files(0) /* */ pkgRecords::~pkgRecords() { - for (unsigned I = 0; I != Cache.HeaderP->PackageFileCount; I++) - delete Files[I]; - delete [] Files; + for ( vector::iterator it = Files.begin(); + it != Files.end(); + ++it) + { + delete *it; + } + } /*}}}*/ // Records::Lookup - Get a parser for the package version file /*{{{*/ diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h index 31c444dbf..ad3946c1b 100644 --- a/apt-pkg/pkgrecords.h +++ b/apt-pkg/pkgrecords.h @@ -23,6 +23,7 @@ #include #include +#include class pkgRecords { @@ -32,8 +33,8 @@ class pkgRecords private: pkgCache &Cache; - Parser **Files; - + std::vectorFiles; + public: // Lookup function diff --git a/configure.in b/configure.in index ce166b31e..7d93de955 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.46.4ubuntu7") +AC_DEFINE_UNQUOTED(VERSION,"0.6.46.4ubuntu8") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index caed5e531..b926a495f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.6.46.4ubuntu8) feisty; urgency=low + + * fix in the pkgRecords destructor + * Bump ABI version + + -- + apt (0.6.46.4ubuntu7) feisty; urgency=low * Merged the apt--mirror branch. This means that a new 'mirror' diff --git a/methods/makefile b/methods/makefile index d66ba11e3..610bd5b49 100644 --- a/methods/makefile +++ b/methods/makefile @@ -7,7 +7,7 @@ include ../buildlib/defaults.mak BIN := $(BIN)/methods # FIXME.. -LIB_APT_PKG_MAJOR = 3.52 +LIB_APT_PKG_MAJOR = 3.53 APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR) # The file method diff --git a/po/apt-all.pot b/po/apt-all.pot index f2f151dd3..7233cd617 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-06 11:14+0100\n" +"POT-Creation-Date: 2007-02-09 16:54+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -251,7 +251,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:819 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:820 #, c-format msgid "Unable to write to %s" msgstr "" @@ -1397,9 +1397,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:752 -#: apt-pkg/pkgcachegen.cc:821 apt-pkg/pkgcachegen.cc:826 -#: apt-pkg/pkgcachegen.cc:949 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:753 +#: apt-pkg/pkgcachegen.cc:822 apt-pkg/pkgcachegen.cc:827 +#: apt-pkg/pkgcachegen.cc:950 msgid "Reading package lists" msgstr "" @@ -2337,92 +2337,92 @@ msgstr "" msgid "Cache has an incompatible versioning system" msgstr "" -#: apt-pkg/pkgcachegen.cc:119 +#: apt-pkg/pkgcachegen.cc:120 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "" -#: apt-pkg/pkgcachegen.cc:134 +#: apt-pkg/pkgcachegen.cc:135 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:157 +#: apt-pkg/pkgcachegen.cc:158 #, c-format msgid "Error occured while processing %s (NewFileDesc1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:182 +#: apt-pkg/pkgcachegen.cc:183 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:187 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:217 +#: apt-pkg/pkgcachegen.cc:218 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:221 +#: apt-pkg/pkgcachegen.cc:222 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" -#: apt-pkg/pkgcachegen.cc:225 +#: apt-pkg/pkgcachegen.cc:226 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:249 +#: apt-pkg/pkgcachegen.cc:250 #, c-format msgid "Error occured while processing %s (NewFileDesc2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:255 +#: apt-pkg/pkgcachegen.cc:256 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:258 +#: apt-pkg/pkgcachegen.cc:259 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:261 +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:264 +#: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:292 +#: apt-pkg/pkgcachegen.cc:293 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" -#: apt-pkg/pkgcachegen.cc:305 +#: apt-pkg/pkgcachegen.cc:306 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" -#: apt-pkg/pkgcachegen.cc:311 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:682 +#: apt-pkg/pkgcachegen.cc:683 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:767 +#: apt-pkg/pkgcachegen.cc:768 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:894 apt-pkg/pkgcachegen.cc:901 +#: apt-pkg/pkgcachegen.cc:895 apt-pkg/pkgcachegen.cc:902 msgid "IO Error saving source cache" msgstr "" -- cgit v1.2.3 From 68a0d684f43957c85f27a0fe72f0774431a42b9e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 27 Feb 2007 11:42:15 +0100 Subject: * debian/control: - set XS-Vcs-Bzr header --- debian/changelog | 9 ++++++++- debian/control | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d8b654039..1b4cbc602 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.6.46.4ubuntu9) feisty; urgency=low + + * debian/control: + - set XS-Vcs-Bzr header + + -- + apt (0.6.46.4ubuntu8) feisty; urgency=low * fix segfault in the pkgRecords destructor @@ -5,7 +12,7 @@ apt (0.6.46.4ubuntu8) feisty; urgency=low * debian/control: - make the libcurl3-gnutls-dev versionized (LP#86614) - -- + -- Michael Vogt Mon, 26 Feb 2007 14:26:33 +0100 apt (0.6.46.4ubuntu7) feisty; urgency=low diff --git a/debian/control b/debian/control index 4b7deeed4..0353cc355 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Uploaders: Jason Gunthorpe , Adam Heath , Mat Standards-Version: 3.6.2.2 Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl3-gnutls-dev (>= 7.15.5) Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) +XS-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/apt/ubuntu Package: apt Architecture: any -- cgit v1.2.3 From 07cf8a2fd6b6472ea8d98573c18b010ef8b66ed4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 27 Feb 2007 11:44:39 +0100 Subject: - Set Ubuntu maintainer address --- debian/changelog | 1 + debian/control | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1b4cbc602..90ded8c3a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ apt (0.6.46.4ubuntu9) feisty; urgency=low * debian/control: - set XS-Vcs-Bzr header + - Set Ubuntu maintainer address -- diff --git a/debian/control b/debian/control index 0353cc355..502edd0c6 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,8 @@ Source: apt Section: admin Priority: important -Maintainer: APT Development Team +Maintainer: Michael Vogt +XSBC-Original-Maintainer: APT Development Team Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt Standards-Version: 3.6.2.2 Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl3-gnutls-dev (>= 7.15.5) -- cgit v1.2.3 From ba688e8d8be99334b96f32a861ad23a0abb9b886 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 13 Mar 2007 12:02:38 +0100 Subject: * cmdline/apt-get.cc: - fix version output in autoremove list (LP#68941) --- cmdline/apt-get.cc | 2 +- debian/changelog | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 765591b14..4ffb9414b 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1446,7 +1446,7 @@ bool DoAutomaticRemove(CacheFile &Cache) std::cout << "We could delete %s" << Pkg.Name() << std::endl; autoremovelist += string(Pkg.Name()) + " "; - autoremoveversions += string(Cache[Pkg].CandVersion) + " "; + autoremoveversions += string(Cache[Pkg].CandVersion) + "\n"; if (doAutoRemove) { if(Pkg.CurrentVer() != 0 && diff --git a/debian/changelog b/debian/changelog index 7a09847c8..89bae45c0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,10 @@ apt (0.6.46.4ubuntu9) feisty; urgency=low - only unmount if APT::CDROM::NoMount is false * methods/cdrom.cc: - only umount if it was mounted by the method before - - -- Michael Vogt Wed, 7 Mar 2007 12:51:17 +0100 + * cmdline/apt-get.cc: + - fix version output in autoremove list (LP#68941) + + -- apt (0.6.46.4ubuntu8) feisty; urgency=low -- cgit v1.2.3 From ad08bf610f0849ddd877abab0f2020dd1ae52dd1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 13 Mar 2007 13:38:52 +0100 Subject: * apt-pkg/packagemanager.cc: - do not spin 100% cpu in FixMissing() (LP#84476) --- apt-pkg/packagemanager.cc | 3 +- debian/changelog | 2 ++ po/apt-all.pot | 70 +++++++++++++++++++++++------------------------ 3 files changed, 39 insertions(+), 36 deletions(-) diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index b0dd43629..1e57d6455 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -95,9 +95,10 @@ bool pkgPackageManager::GetArchives(pkgAcquire *Owner,pkgSourceList *Sources, be downloaded. */ bool pkgPackageManager::FixMissing() { + pkgDepCache::ActionGroup group(Cache); pkgProblemResolver Resolve(&Cache); List->SetFileList(FileNames); - + bool Bad = false; for (PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) { diff --git a/debian/changelog b/debian/changelog index 89bae45c0..cbcee2919 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ apt (0.6.46.4ubuntu9) feisty; urgency=low - only umount if it was mounted by the method before * cmdline/apt-get.cc: - fix version output in autoremove list (LP#68941) + * apt-pkg/packagemanager.cc: + - do not spin 100% cpu in FixMissing() (LP#84476) -- diff --git a/po/apt-all.pot b/po/apt-all.pot index 7233cd617..794b346c0 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-09 16:54+0100\n" +"POT-Creation-Date: 2007-03-13 13:35+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -251,7 +251,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:820 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:819 #, c-format msgid "Unable to write to %s" msgstr "" @@ -1397,9 +1397,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:753 -#: apt-pkg/pkgcachegen.cc:822 apt-pkg/pkgcachegen.cc:827 -#: apt-pkg/pkgcachegen.cc:950 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:752 +#: apt-pkg/pkgcachegen.cc:821 apt-pkg/pkgcachegen.cc:826 +#: apt-pkg/pkgcachegen.cc:949 msgid "Reading package lists" msgstr "" @@ -1514,16 +1514,16 @@ msgstr "" msgid "Wrong CD-ROM" msgstr "" -#: methods/cdrom.cc:164 +#: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" -#: methods/cdrom.cc:169 +#: methods/cdrom.cc:171 msgid "Disk not found." msgstr "" -#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "" @@ -2228,7 +2228,7 @@ msgstr "" msgid "Malformed line %u in source list %s (vendor id)" msgstr "" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:403 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2236,7 +2236,7 @@ msgid "" "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:35 #, c-format msgid "Index file type '%s' is not supported" msgstr "" @@ -2337,92 +2337,92 @@ msgstr "" msgid "Cache has an incompatible versioning system" msgstr "" -#: apt-pkg/pkgcachegen.cc:120 +#: apt-pkg/pkgcachegen.cc:119 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "" -#: apt-pkg/pkgcachegen.cc:135 +#: apt-pkg/pkgcachegen.cc:134 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:158 +#: apt-pkg/pkgcachegen.cc:157 #, c-format msgid "Error occured while processing %s (NewFileDesc1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:183 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:187 +#: apt-pkg/pkgcachegen.cc:186 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:218 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:222 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" -#: apt-pkg/pkgcachegen.cc:226 +#: apt-pkg/pkgcachegen.cc:225 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:250 +#: apt-pkg/pkgcachegen.cc:249 #, c-format msgid "Error occured while processing %s (NewFileDesc2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:255 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:259 +#: apt-pkg/pkgcachegen.cc:258 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:261 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:265 +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:293 +#: apt-pkg/pkgcachegen.cc:292 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" -#: apt-pkg/pkgcachegen.cc:306 +#: apt-pkg/pkgcachegen.cc:305 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" -#: apt-pkg/pkgcachegen.cc:312 +#: apt-pkg/pkgcachegen.cc:311 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:683 +#: apt-pkg/pkgcachegen.cc:682 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:768 +#: apt-pkg/pkgcachegen.cc:767 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:895 apt-pkg/pkgcachegen.cc:902 +#: apt-pkg/pkgcachegen.cc:894 apt-pkg/pkgcachegen.cc:901 msgid "IO Error saving source cache" msgstr "" @@ -2513,30 +2513,30 @@ msgid "" "signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:737 +#: apt-pkg/cdrom.cc:739 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:753 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:757 +#: apt-pkg/cdrom.cc:759 msgid "Copying package lists..." msgstr "" -#: apt-pkg/cdrom.cc:783 +#: apt-pkg/cdrom.cc:785 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:792 +#: apt-pkg/cdrom.cc:794 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/cdrom.cc:832 +#: apt-pkg/cdrom.cc:836 msgid "Unmounting CD-ROM..." msgstr "" -- cgit v1.2.3 From 90ff41f8a6fdd304ac645f8279464462ca36fccd Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 13 Mar 2007 14:04:55 +0100 Subject: * apt-pkg/indexfile.cc: - fix problem overwriting APT::Acquire::Translation * doc/examples/configure-index: - document APT::Acquire::Translation --- apt-pkg/indexfile.cc | 4 ++-- apt-pkg/init.cc | 3 --- debian/changelog | 4 ++++ doc/examples/configure-index | 3 +++ po/apt-all.pot | 4 ++-- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc index bb2210bf6..fad38772b 100644 --- a/apt-pkg/indexfile.cc +++ b/apt-pkg/indexfile.cc @@ -75,7 +75,7 @@ string pkgIndexFile::SourceInfo(pkgSrcRecords::Parser const &Record, /* */ bool pkgIndexFile::TranslationsAvailable() { - const string Translation = _config->Find("APT::Acquire::Translation"); + const string Translation = _config->Find("APT::Acquire::Translation", "environment"); if (Translation.compare("none") != 0) return CheckLanguageCode(LanguageCode().c_str()); @@ -107,7 +107,7 @@ bool pkgIndexFile::CheckLanguageCode(const char *Lang) /* return the language code */ string pkgIndexFile::LanguageCode() { - const string Translation = _config->Find("APT::Acquire::Translation"); + const string Translation = _config->Find("APT::Acquire::Translation", "environment"); if (Translation.compare("environment") == 0) { diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 0be0aee98..f58855792 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -106,9 +106,6 @@ bool pkgInitConfig(Configuration &Cnf) } #endif - // Translation - Cnf.Set("APT::Acquire::Translation", "environment"); - return true; } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index cbcee2919..aa6a01692 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,10 @@ apt (0.6.46.4ubuntu9) feisty; urgency=low - fix version output in autoremove list (LP#68941) * apt-pkg/packagemanager.cc: - do not spin 100% cpu in FixMissing() (LP#84476) + * apt-pkg/indexfile.cc: + - fix problem overwriting APT::Acquire::Translation + * doc/examples/configure-index: + - document APT::Acquire::Translation -- diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 4262b479f..e5d1f2ab3 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -191,6 +191,9 @@ Acquire // mirror failure reporting url ReportFailures "http://example.com/mirror-failure"; }; + + // translations can be set here to "none", "environment" or "$locale" + Translation "none"; }; // Directory layout diff --git a/po/apt-all.pot b/po/apt-all.pot index 794b346c0..82dfae548 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -2294,12 +2294,12 @@ msgstr "" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:126 +#: apt-pkg/init.cc:123 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:142 +#: apt-pkg/init.cc:139 msgid "Unable to determine a suitable packaging system type" msgstr "" -- cgit v1.2.3 From e6065cfcf0b5c6a57aa582cb3c2bd2b3fafe64b7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 14 Mar 2007 11:38:41 +0100 Subject: * apt-pkg/depcache.cc: - added "APT::Never-MarkAuto-Section" and consider dependencies of packages in this section manual * debian/apt.conf.ubuntu: - added APT::Never-MarkAuto-Section "metapackages"; --- apt-pkg/depcache.cc | 20 ++++++++++++++++---- debian/apt.conf.ubuntu | 1 + debian/changelog | 13 +++++++++++-- doc/examples/configure-index | 10 ++++++++-- 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 81e1eeb33..fe8a617ac 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -955,11 +955,23 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, std::clog << "Installing " << InstPkg.Name() << " as dep of " << Pkg.Name() << std::endl; - MarkInstall(InstPkg,true,Depth + 1, false, ForceImportantDeps); - // Set the autoflag, after MarkInstall because MarkInstall unsets it - if (P->CurrentVer == 0) - PkgState[InstPkg->ID].Flags |= Flag::Auto; + // now check if we should consider it a automatic dependency or not + string sec = _config->Find("APT::Never-MarkAuto-Section",""); + if(Pkg.Section() && (string(Pkg.Section()) == sec)) + { + if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true) + std::clog << "Setting NOT as auto-installed because its a direct dep of a package in section " << sec << std::endl; + MarkInstall(InstPkg,true,Depth + 1, true, ForceImportantDeps); + } + else + { + // mark automatic dependency + MarkInstall(InstPkg,true,Depth + 1, false, ForceImportantDeps); + // Set the autoflag, after MarkInstall because MarkInstall unsets it + if (P->CurrentVer == 0) + PkgState[InstPkg->ID].Flags |= Flag::Auto; + } } continue; } diff --git a/debian/apt.conf.ubuntu b/debian/apt.conf.ubuntu index 8d095f17e..3a9945b54 100644 --- a/debian/apt.conf.ubuntu +++ b/debian/apt.conf.ubuntu @@ -7,4 +7,5 @@ APT }; Install-Recommends-Section "metapackages"; + Never-MarkAuto-Section "metapackages"; }; diff --git a/debian/changelog b/debian/changelog index aa6a01692..3038e49bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +apt (0.6.46.4ubuntu10) feisty; urgency=low + + * apt-pkg/depcache.cc: + - added "APT::Never-MarkAuto-Section" and consider dependencies + of packages in this section manual + * debian/apt.conf.ubuntu: + - added APT::Never-MarkAuto-Section "metapackages"; + + -- + apt (0.6.46.4ubuntu9) feisty; urgency=low * debian/control: @@ -5,7 +15,6 @@ apt (0.6.46.4ubuntu9) feisty; urgency=low - Set Ubuntu maintainer address * apt-pkg/cdrom.cc: - only unmount if APT::CDROM::NoMount is false - * methods/cdrom.cc: - only umount if it was mounted by the method before * cmdline/apt-get.cc: - fix version output in autoremove list (LP#68941) @@ -16,7 +25,7 @@ apt (0.6.46.4ubuntu9) feisty; urgency=low * doc/examples/configure-index: - document APT::Acquire::Translation - -- + -- Michael Vogt Tue, 13 Mar 2007 15:24:39 +0100 apt (0.6.46.4ubuntu8) feisty; urgency=low diff --git a/doc/examples/configure-index b/doc/examples/configure-index index e5d1f2ab3..2bcafa39d 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -96,8 +96,14 @@ APT // consider Recommends, Suggests as important dependencies that should // be installed by default - APT::Install-Recommends "false"; - APT::Install-Suggests "false"; + Install-Recommends "false"; + Install-Suggests "false"; + + // install recommends automatically for packages in this section + Install-Recommends-Section "metapackages"; + + // consider dependencies of packages in this section manual + Never-MarkAuto-Section "metapackages"; // Write progress messages on this fd (for stuff like base-config) Status-Fd "-1"; -- cgit v1.2.3 From 7db98f31498a85da22cc00e446bce8ac8c319554 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 14 Mar 2007 13:10:42 +0100 Subject: * cmdline/apt-get.cc: - "apt-get install foo" on a already installed package foo will clean the automatic installed flag --- cmdline/apt-get.cc | 21 +++++++++++++++++++++ configure.in | 2 +- debian/changelog | 5 ++++- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 4ffb9414b..430b1bccb 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1556,6 +1556,7 @@ bool DoInstall(CommandLine &CmdL) if (Cache->BrokenCount() != 0) BrokenFix = true; + unsigned int AutoMarkChanged = 0; unsigned int ExpectedInst = 0; unsigned int Packages = 0; pkgProblemResolver Fix(Cache); @@ -1692,6 +1693,18 @@ bool DoInstall(CommandLine &CmdL) return false; if (TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix,ExpectedInst) == false) return false; + + // see if we need to fix the auto-mark flag + // e.g. apt-get install foo + // where foo is marked automatic + if(Cache[Pkg].Install() == false && + (Cache[Pkg].Flags & pkgCache::Flag::Auto)) + { + ioprintf(c1out,_("%s set to manual installed.\n"), + Pkg.Name()); + Cache->MarkAuto(Pkg,false); + AutoMarkChanged++; + } } } @@ -1854,6 +1867,14 @@ bool DoInstall(CommandLine &CmdL) } + // if nothing changed in the cache, but only the automark information + // we write the StateFile here, otherwise it will be written in + // cache.commit() + if (AutoMarkChanged > 0 && + Cache->DelCount() == 0 && Cache->InstCount() == 0 && + Cache->BadCount() == 0) + Cache->writeStateFile(NULL); + // See if we need to prompt if (Cache->InstCount() == ExpectedInst && Cache->DelCount() == 0) return InstallPackages(Cache,false,false); diff --git a/configure.in b/configure.in index 940601e21..ca841df36 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.46.4ubuntu9") +AC_DEFINE_UNQUOTED(VERSION,"0.6.46.4ubuntu10") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 3038e49bd..bb134f780 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,11 @@ apt (0.6.46.4ubuntu10) feisty; urgency=low of packages in this section manual * debian/apt.conf.ubuntu: - added APT::Never-MarkAuto-Section "metapackages"; + * cmdline/apt-get.cc: + - "apt-get install foo" on a already installed package foo will + clean the automatic installed flag - -- + -- Michael Vogt Wed, 14 Mar 2007 12:34:46 +0100 apt (0.6.46.4ubuntu9) feisty; urgency=low -- cgit v1.2.3 From 28e454d68b9cc6ba60e19dcbcfe3a97c151ef8f8 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 14 Mar 2007 13:47:49 +0100 Subject: - do not show packages already marked for removal as auto-installed --- cmdline/apt-get.cc | 13 +++++++++---- debian/changelog | 3 ++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 430b1bccb..d1d6ab7b4 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1444,9 +1444,13 @@ bool DoAutomaticRemove(CacheFile &Cache) if(Pkg.CurrentVer() != 0 || Cache[Pkg].Install()) if(Debug) std::cout << "We could delete %s" << Pkg.Name() << std::endl; - - autoremovelist += string(Pkg.Name()) + " "; - autoremoveversions += string(Cache[Pkg].CandVersion) + "\n"; + + // only show stuff in the list that is not yet marked for removal + if(Cache[Pkg].Delete() == false) + { + autoremovelist += string(Pkg.Name()) + " "; + autoremoveversions += string(Cache[Pkg].CandVersion) + "\n"; + } if (doAutoRemove) { if(Pkg.CurrentVer() != 0 && @@ -1697,7 +1701,8 @@ bool DoInstall(CommandLine &CmdL) // see if we need to fix the auto-mark flag // e.g. apt-get install foo // where foo is marked automatic - if(Cache[Pkg].Install() == false && + if(!Remove && + Cache[Pkg].Install() == false && (Cache[Pkg].Flags & pkgCache::Flag::Auto)) { ioprintf(c1out,_("%s set to manual installed.\n"), diff --git a/debian/changelog b/debian/changelog index bb134f780..374331591 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,9 @@ apt (0.6.46.4ubuntu10) feisty; urgency=low * cmdline/apt-get.cc: - "apt-get install foo" on a already installed package foo will clean the automatic installed flag + - do not show packages already marked for removal as auto-installed - -- Michael Vogt Wed, 14 Mar 2007 12:34:46 +0100 + -- Michael Vogt Wed, 14 Mar 2007 13:32:32 +0100 apt (0.6.46.4ubuntu9) feisty; urgency=low -- cgit v1.2.3 From 1310a1db3e71d9c1548a7ed84dd80d871d5a397c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 14 Mar 2007 13:56:47 +0100 Subject: * debian/changelog: - updated with the correct bugs --- debian/changelog | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 374331591..2ffdc1979 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,13 +2,14 @@ apt (0.6.46.4ubuntu10) feisty; urgency=low * apt-pkg/depcache.cc: - added "APT::Never-MarkAuto-Section" and consider dependencies - of packages in this section manual + of packages in this section manual (LP#59893) * debian/apt.conf.ubuntu: - - added APT::Never-MarkAuto-Section "metapackages"; + - added APT::Never-MarkAuto-Section "metapackages" (LP#59893) * cmdline/apt-get.cc: - "apt-get install foo" on a already installed package foo will - clean the automatic installed flag + clean the automatic installed flag (LP#72007) - do not show packages already marked for removal as auto-installed + (LP#64493) -- Michael Vogt Wed, 14 Mar 2007 13:32:32 +0100 -- cgit v1.2.3 From 31dc104687b79d3d9dea7d8c0e1a2bde80598ff0 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 14 Mar 2007 17:11:25 +0100 Subject: * cmdline/apt-mark: fix chmod()/rename() ordering --- cmdline/apt-mark | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmdline/apt-mark b/cmdline/apt-mark index 728f083dc..dadc01366 100755 --- a/cmdline/apt-mark +++ b/cmdline/apt-mark @@ -60,5 +60,5 @@ if __name__ == "__main__": else: outfile.write(str(tagfile.Section)+"\n") # all done, rename the tmpfile - os.rename(outfile.name, STATE_FILE) os.chmod(outfile.name, 0644) + os.rename(outfile.name, STATE_FILE) -- cgit v1.2.3 From 5e457a9336967e4851e094a84f9f94f4141ee393 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 5 Jun 2007 16:14:08 +0200 Subject: * apt-pkg/deb/dpkgpm.cc: - apport integration added, this means that a apport report is written on dpkg failures --- apt-pkg/deb/dpkgpm.cc | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++- apt-pkg/deb/dpkgpm.h | 4 +++ debian/changelog | 3 ++ 3 files changed, 103 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index cebdafe7d..5c069458e 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -15,6 +15,7 @@ #include #include #include +#include #include #include @@ -37,7 +38,8 @@ using namespace std; // DPkgPM::pkgDPkgPM - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) : pkgPackageManager(Cache) +pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) + : pkgPackageManager(Cache), pkgFailures(0) { } /*}}}*/ @@ -654,6 +656,8 @@ bool pkgDPkgPM::Go(int OutStatusFd) line[0]=0; if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true) std::clog << "send: '" << status.str() << "'" << endl; + pkgFailures++; + WriteApportReport(list[1], list[3]); continue; } if(strncmp(action,"conffile",strlen("conffile")) == 0) @@ -746,3 +750,94 @@ void pkgDPkgPM::Reset() List.erase(List.begin(),List.end()); } /*}}}*/ +// pkgDpkgPM::WriteApportReport - write out error report pkg failure /*{{{*/ +// --------------------------------------------------------------------- +/* */ +void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) +{ + string pkgname, reportfile, srcpkgname, pkgver, arch; + string::size_type pos; + FILE *report; + + if (_config->FindB("Dpkg::ApportFailureReport",true) == false) + return; + + // only report the first error if we are in StopOnError=false mode + // to prevent bogus reports + if((_config->FindB("Dpkg::StopOnError",true) == false) && pkgFailures > 1) + return; + + // get the pkgname and reportfile + pkgname = flNotDir(pkgpath); + pos = pkgname.rfind('_'); + if(pos != string::npos) + pkgname = string(pkgname, 0, pos); + + // find the package versin and source package name + pkgCache::PkgIterator Pkg = Cache.FindPkg(pkgname); + if (Pkg.end() == true) + return; + pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg); + pkgver = Ver.VerStr(); + if (Ver.end() == true) + return; + pkgRecords Recs(Cache); + pkgRecords::Parser &Parse = Recs.Lookup(Ver.FileList()); + srcpkgname = Parse.SourcePkg(); + if(srcpkgname.empty()) + srcpkgname = pkgname; + + // if the file exists already, we check: + // - if it was reported already (touched by apport). + // If not, we do nothing, otherwise + // we overwrite it. This is the same behaviour as apport + // - if we have a report with the same pkgversion already + // then we skip it + reportfile = flCombine("/var/crash",pkgname+".0.crash"); + if(FileExists(reportfile)) + { + struct stat buf; + char strbuf[255]; + + // check atime/mtime + stat(reportfile.c_str(), &buf); + if(buf.st_mtime > buf.st_atime) + return; + + // check if the existing report is the same version + report = fopen(reportfile.c_str(),"r"); + while(fgets(strbuf, sizeof(strbuf), report) != NULL) + { + if(strstr(strbuf,"Package:") == strbuf) + { + char pkgname[255], version[255]; + if(sscanf(strbuf, "Package: %s %s", pkgname, version) == 2) + if(strcmp(pkgver.c_str(), version) == 0) + { + fclose(report); + return; + } + } + } + fclose(report); + } + + // now write the report + arch = _config->Find("APT::Architecture"); + report = fopen(reportfile.c_str(),"w"); + if(report == NULL) + return; + if(_config->FindB("DPkgPM::InitialReportOnly",false) == true) + chmod(reportfile.c_str(), 0); + else + chmod(reportfile.c_str(), 0600); + fprintf(report, "ProblemType: Package\n"); + fprintf(report, "Architecture: %s\n", arch.c_str()); + time_t now = time(NULL); + fprintf(report, "Date: %s" , ctime(&now)); + fprintf(report, "Package: %s %s\n", pkgname.c_str(), pkgver.c_str()); + fprintf(report, "SourcePackage: %s\n", srcpkgname.c_str()); + fprintf(report, "ErrorMessage:\n %s\n", errormsg); + fclose(report); +} + /*}}}*/ diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index 0b181dc43..1a1fdc191 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -23,6 +23,7 @@ using std::vector; class pkgDPkgPM : public pkgPackageManager { protected: + int pkgFailures; // used for progress reporting struct DpkgState @@ -48,6 +49,9 @@ class pkgDPkgPM : public pkgPackageManager bool RunScriptsWithPkgs(const char *Cnf); bool SendV2Pkgs(FILE *F); + // apport integration + void WriteApportReport(const char *pkgpath, const char *errormsg); + // The Actuall installation implementation virtual bool Install(PkgIterator Pkg,string File); virtual bool Configure(PkgIterator Pkg); diff --git a/debian/changelog b/debian/changelog index e0a735e2f..32f2ac68a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,9 @@ apt (0.6.46.4ubuntu11) UNRELEASED; urgency=low * *.po: Unfuzzy after upstream typo corrections * apt-pkg/policy.cc: - allow multiple packages (thanks to David Foerster) + * apt-pkg/deb/dpkgpm.cc: + - apport integration added, this means that a apport + report is written on dpkg failures -- Michael Vogt Tue, 17 Apr 2007 15:53:37 +0200 -- cgit v1.2.3 From 3238423f4d0bebf02c02fa6e5ca5b6db4fca56c5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 18 Jun 2007 14:06:21 +0200 Subject: * implement warning when Vcs-*: header is found in source record --- cmdline/apt-get.cc | 22 ++ po/apt-all.pot | 646 +++++++++++++++++++++++++++-------------------------- 2 files changed, 352 insertions(+), 316 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 554677f39..51bcfde12 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2114,6 +2114,28 @@ bool DoSource(CommandLine &CmdL) if (Last == 0) return _error->Error(_("Unable to find a source package for %s"),Src.c_str()); + string srec = Last->AsStr(); + string::size_type pos = srec.find("\nVcs-"); + if (pos != string::npos ) + { + pos += strlen("\nVcs-"); + string vcs = srec.substr(pos,srec.find(":",pos)-pos); + pos += vcs.length()+2; + string::size_type epos = srec.find("\n", pos); + string uri = srec.substr(pos,epos-pos).c_str(); + ioprintf(c1out, _("WARNING: '%s' is maintained in " + "the '%s' version control system at:\n" + "'%s'\n"), + Src.c_str(), vcs.c_str(), uri.c_str()); + if(vcs == "Bzr") + ioprintf(c1out,_("Please use: 'bzr get %s'\n" + "to modify the package.\n"), + uri.c_str()); + ioprintf(c1out, "Are you sure you want to continue [yN]? "); + if(!YnPrompt(false)) + return _error->Error(_("Abort.")); + } + // Back track vector Lst; if (Last->Files(Lst) == false) diff --git a/po/apt-all.pot b/po/apt-all.pot index a7185fcf3..95199ab42 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-06-08 23:11+0200\n" +"POT-Creation-Date: 2007-06-18 14:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -155,8 +155,8 @@ msgid " %4i %s\n" msgstr "" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:551 -#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2605 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@ -251,7 +251,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:819 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "" @@ -260,31 +260,31 @@ msgstr "" msgid "Cannot get debconf version. Is debconf installed?" msgstr "" -#: ftparchive/apt-ftparchive.cc:168 ftparchive/apt-ftparchive.cc:342 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "" -#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:184 -#: ftparchive/apt-ftparchive.cc:207 ftparchive/apt-ftparchive.cc:257 -#: ftparchive/apt-ftparchive.cc:271 ftparchive/apt-ftparchive.cc:293 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:255 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "" -#: ftparchive/apt-ftparchive.cc:372 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "" -#: ftparchive/apt-ftparchive.cc:402 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:557 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -326,131 +326,131 @@ msgid "" " -o=? Set an arbitrary configuration option" msgstr "" -#: ftparchive/apt-ftparchive.cc:763 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "" -#: ftparchive/apt-ftparchive.cc:836 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." msgstr "" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "" -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "" -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "" -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr "" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -464,88 +464,88 @@ msgstr "" msgid "realloc - Failed to allocate memory" msgstr "" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "" @@ -554,7 +554,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1659 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -713,12 +713,12 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2321 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2353 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "" @@ -746,7 +746,7 @@ msgstr "" msgid "After unpacking %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2207 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -772,7 +772,7 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2136 msgid "Abort." msgstr "" @@ -780,7 +780,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2250 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -789,7 +789,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2259 msgid "Download complete and in download only mode" msgstr "" @@ -915,7 +915,7 @@ msgid "" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 msgid "The following information may help to resolve the situation:" msgstr "" @@ -932,32 +932,32 @@ msgstr "" msgid "Couldn't find task %s" msgstr "" -#: cmdline/apt-get.cc:1646 cmdline/apt-get.cc:1682 +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1669 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1699 +#: cmdline/apt-get.cc:1711 #, c-format msgid "%s set to manual installed.\n" msgstr "" -#: cmdline/apt-get.cc:1712 +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1715 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1727 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -965,159 +965,173 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1863 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1864 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1892 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1900 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2075 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2339 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2371 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2126 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"'%s'\n" +msgstr "" + +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"Please use: 'bzr get %s'\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2186 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2210 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:2183 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2186 +#: cmdline/apt-get.cc:2218 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2224 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2223 +#: cmdline/apt-get.cc:2255 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2251 +#: cmdline/apt-get.cc:2283 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2264 +#: cmdline/apt-get.cc:2296 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2281 +#: cmdline/apt-get.cc:2313 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2300 +#: cmdline/apt-get.cc:2332 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2316 +#: cmdline/apt-get.cc:2348 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2344 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2364 +#: cmdline/apt-get.cc:2396 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2416 +#: cmdline/apt-get.cc:2448 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2468 +#: cmdline/apt-get.cc:2500 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2503 +#: cmdline/apt-get.cc:2535 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2528 +#: cmdline/apt-get.cc:2560 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2542 +#: cmdline/apt-get.cc:2574 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2546 +#: cmdline/apt-get.cc:2578 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2578 +#: cmdline/apt-get.cc:2610 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2651 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1242,188 +1256,188 @@ msgstr "" msgid "Merging available information" msgstr "" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 #, c-format msgid "Unable to read %s" msgstr "" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:752 -#: apt-pkg/pkgcachegen.cc:821 apt-pkg/pkgcachegen.cc:826 -#: apt-pkg/pkgcachegen.cc:949 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1431,77 +1445,77 @@ msgid "" "package!" msgstr "" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "" @@ -1599,7 +1613,7 @@ msgstr "" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:472 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "" @@ -1611,7 +1625,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:511 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "" @@ -1665,7 +1679,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1796,282 +1810,282 @@ msgstr "" msgid "Read error from %s process" msgstr "" -#: methods/http.cc:376 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "" -#: methods/http.cc:522 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:530 +#: methods/http.cc:531 msgid "Bad header line" msgstr "" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:585 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:600 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:602 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:626 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "" -#: methods/http.cc:773 +#: methods/http.cc:774 msgid "Select failed" msgstr "" -#: methods/http.cc:778 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "" -#: methods/http.cc:801 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:832 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "" -#: methods/http.cc:860 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:876 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1107 +#: methods/http.cc:1108 msgid "Bad header data" msgstr "" -#: methods/http.cc:1124 +#: methods/http.cc:1125 msgid "Connection failed" msgstr "" -#: methods/http.cc:1215 +#: methods/http.cc:1216 msgid "Internal error" msgstr "" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/strutl.cc:982 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "" -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "" -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "" -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 #, c-format msgid "Unable to change to %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:83 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:88 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:106 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:110 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:378 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:388 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:391 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:393 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:437 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:493 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:523 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:598 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:604 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:615 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "" @@ -2148,93 +2162,93 @@ msgstr "" msgid "extra" msgstr "" -#: apt-pkg/depcache.cc:98 apt-pkg/depcache.cc:127 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "" -#: apt-pkg/depcache.cc:99 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "" -#: apt-pkg/depcache.cc:128 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "" -#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 msgid "Reading state information" msgstr "" -#: apt-pkg/depcache.cc:196 +#: apt-pkg/depcache.cc:198 #, c-format msgid "Failed to open StateFile %s" msgstr "" -#: apt-pkg/depcache.cc:202 +#: apt-pkg/depcache.cc:204 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:451 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" -#: apt-pkg/packagemanager.cc:403 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2242,60 +2256,60 @@ msgid "" "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:34 #, c-format msgid "Index file type '%s' is not supported" msgstr "" -#: apt-pkg/algorithms.cc:254 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1110 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1112 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "" -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "" -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:384 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -2309,126 +2323,126 @@ msgstr "" msgid "Unable to determine a suitable packaging system type" msgstr "" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "" -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "" -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "" -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/pkgcachegen.cc:76 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "" -#: apt-pkg/pkgcachegen.cc:119 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "" -#: apt-pkg/pkgcachegen.cc:134 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:157 +#: apt-pkg/pkgcachegen.cc:153 #, c-format msgid "Error occured while processing %s (NewFileDesc1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:182 +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:186 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:217 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:221 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" -#: apt-pkg/pkgcachegen.cc:225 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:249 +#: apt-pkg/pkgcachegen.cc:245 #, c-format msgid "Error occured while processing %s (NewFileDesc2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:255 +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:258 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:261 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:264 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:292 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" -#: apt-pkg/pkgcachegen.cc:305 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" -#: apt-pkg/pkgcachegen.cc:311 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:682 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:767 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:894 apt-pkg/pkgcachegen.cc:901 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "" @@ -2475,80 +2489,80 @@ msgstr "" msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:532 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:541 apt-pkg/cdrom.cc:623 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:566 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "" -#: apt-pkg/cdrom.cc:586 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:604 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:608 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:616 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:634 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:671 #, c-format msgid "" "Found %i package indexes, %i source indexes, %i translation indexes and %i " "signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:711 +#: apt-pkg/cdrom.cc:708 #, c-format msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:740 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:760 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "" -#: apt-pkg/cdrom.cc:786 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:795 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/cdrom.cc:837 +#: apt-pkg/cdrom.cc:834 msgid "Unmounting CD-ROM...\n" msgstr "" @@ -2572,52 +2586,52 @@ msgstr "" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:355 #, c-format msgid "Preparing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:356 #, c-format msgid "Unpacking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:361 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:362 #, c-format msgid "Configuring %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Installed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:368 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:369 #, c-format msgid "Removing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:375 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:376 #, c-format msgid "Completely removed %s" msgstr "" -- cgit v1.2.3 From 06cea6004b46ca310dcf169dd91c6ef4206c6775 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 18 Jun 2007 14:30:09 +0200 Subject: * debian/apt.cron.daily: - fix incorrect merge --- debian/apt.cron.daily | 4 ---- 1 file changed, 4 deletions(-) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 127ecf47d..778e3cefe 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -158,10 +158,6 @@ UnattendedUpgradeInterval=0 eval $(apt-config shell UnattendedUpgradeInterval APT::Periodic::Unattended-Upgrade) -UnattendedUpgradeInterval=0 -eval $(apt-config shell UnattendedUpgradeInterval APT::Periodic::Unattended-Upgrade) - - # laptop check, on_ac_power returns: # 0 (true) System is on mains power # 1 (false) System is not on mains power -- cgit v1.2.3 From 625034652b68e5619af154f09779003e1f3117dd Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 18 Jun 2007 14:30:50 +0200 Subject: * debian/changelog: - updated changelog to contain remaining difference between debian and ubuntu apt --- debian/changelog | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0482dff3c..fccdaf90e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,7 +9,16 @@ apt (0.7.2ubuntu1) gutsy; urgency=low (Fixes LP:#115959) * merged from debian/unstable, remaining changes: - maintainer field changed - + - merged the apt--mirror branch + http://people.ubuntu.com/~mvo/bzr/apt/apt--mirror/ + - apport reporting on package install/upgrade/remove failure + - support for "Originial-Maintainer" field + - merged apt--xs-vcs-bzr branch + (http://people.ubuntu.com/~mvo/bzr/apt/xs-vcs-bzr/) + - use ubuntu archive keyring by default + - debian/apt.conf.autoremove + + install recommands for section "metapackages" + + do not mark direct dependencies of "metapackages" as autoremoved -- Michael Vogt Thu, 14 Jun 2007 10:38:36 +0200 -- cgit v1.2.3 From 541c83b92a4919ba0aed6150f71e227d07f93a02 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 27 Jun 2007 13:34:34 +0200 Subject: * cmdline/apt-get.cc: - fix InstallTask code when a pkgRecord ends with a single '\n' (thanks to Soren Hansen for reporting) --- cmdline/apt-get.cc | 2 +- debian/changelog | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 51bcfde12..974427f51 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1519,7 +1519,7 @@ bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix, // build regexp for the task char S[300]; - snprintf(S, sizeof(S), "^Task:.*[^a-z]%s[^a-z].*\n", taskname); + snprintf(S, sizeof(S), "^Task:.*[^a-z]%s[^a-z].*$", taskname); regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE); bool found = false; diff --git a/debian/changelog b/debian/changelog index 50c050dcb..84cf54d75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.2ubuntu3) gutsy; urgency=low + + * cmdline/apt-get.cc: + - fix InstallTask code when a pkgRecord ends + with a single '\n' (thanks to Soren Hansen for reporting) + + -- Michael Vogt Wed, 27 Jun 2007 13:33:38 +0200 + apt (0.7.2ubuntu2) gutsy; urgency=low * fixed compile errors with g++ 7.3 (thanks to -- cgit v1.2.3 From 927677f0ae5f92bb6935c91b08ee6ffe220d4bfa Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 28 Jun 2007 18:19:58 +0200 Subject: * cmdline/apt-get.cc: - make the ouput more friendly for copy and paste (thanks to Matt Zimmerman) --- cmdline/apt-get.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 51bcfde12..930d88d99 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2128,7 +2128,8 @@ bool DoSource(CommandLine &CmdL) "'%s'\n"), Src.c_str(), vcs.c_str(), uri.c_str()); if(vcs == "Bzr") - ioprintf(c1out,_("Please use: 'bzr get %s'\n" + ioprintf(c1out,_("Please use:\n" + "bzr get %s\n" "to modify the package.\n"), uri.c_str()); ioprintf(c1out, "Are you sure you want to continue [yN]? "); -- cgit v1.2.3 From 8756297c0f5987d2320955c21e5c64395ce311cc Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 28 Jun 2007 18:38:55 +0200 Subject: * cmdline/apt-get.cc: - remove '' around xs-vcs-$repo to make pasting easier --- cmdline/apt-get.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 930d88d99..fa7ae32eb 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2125,7 +2125,7 @@ bool DoSource(CommandLine &CmdL) string uri = srec.substr(pos,epos-pos).c_str(); ioprintf(c1out, _("WARNING: '%s' is maintained in " "the '%s' version control system at:\n" - "'%s'\n"), + "%s\n"), Src.c_str(), vcs.c_str(), uri.c_str()); if(vcs == "Bzr") ioprintf(c1out,_("Please use:\n" -- cgit v1.2.3 From 774a66876919712d5b8e12174f01f0337d2f3393 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 29 Jun 2007 13:04:17 +0200 Subject: * cmdline/apt-get.cc: - ignore Vcs-Browser flag (#121770) --- cmdline/apt-get.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index fa7ae32eb..08bb1bc34 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2116,10 +2116,15 @@ bool DoSource(CommandLine &CmdL) string srec = Last->AsStr(); string::size_type pos = srec.find("\nVcs-"); - if (pos != string::npos ) + while (pos != string::npos) { pos += strlen("\nVcs-"); string vcs = srec.substr(pos,srec.find(":",pos)-pos); + if(vcs == "Browser") + { + pos = srec.find("\nVcs-", pos); + continue; + } pos += vcs.length()+2; string::size_type epos = srec.find("\n", pos); string uri = srec.substr(pos,epos-pos).c_str(); @@ -2135,6 +2140,8 @@ bool DoSource(CommandLine &CmdL) ioprintf(c1out, "Are you sure you want to continue [yN]? "); if(!YnPrompt(false)) return _error->Error(_("Abort.")); + else + break; } // Back track -- cgit v1.2.3 From 94d1fa98304a9aa1108daa765acbc4a90a0e17d2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 29 Jun 2007 15:55:33 +0200 Subject: * debian/apt.conf.autoremove: - added "linux-ubuntu-modules" to APT::NeverAutoRemove --- debian/apt.conf.autoremove | 1 + debian/changelog | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove index 3a9945b54..4a3010208 100644 --- a/debian/apt.conf.autoremove +++ b/debian/apt.conf.autoremove @@ -4,6 +4,7 @@ APT { "^linux-image.*"; "^linux-restricted-modules.*"; + "^linux-ubuntu-modules-.*"; }; Install-Recommends-Section "metapackages"; diff --git a/debian/changelog b/debian/changelog index 96dfafa5a..4f14b4131 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ apt (0.7.2ubuntu4) unstable; urgency=low - make the XS-Vcs-$foo warning more copy'n'paste friendly (thanks to Matt Zimmerman) - ignore the Vcs-Browser tag (Fixes LP: #121770) + * debian/apt.conf.autoremove: + - added "linux-ubuntu-modules" to APT::NeverAutoRemove -- -- cgit v1.2.3 From be7f42304a5dd381f2ad82a921e9041df55b5ec9 Mon Sep 17 00:00:00 2001 From: Sarah Hobbs Date: Fri, 6 Jul 2007 17:47:07 +1000 Subject: Adds support for installing recommends from *metapackages, including universe/metapackages, so things like x/k/ubuntu-restricted-extras packages work. This currently doesnt build - but builds more than it did before! --- configure.in | 2 +- debian/apt.conf.autoremove | 4 +- debian/changelog | 19 +- debian/control | 4 +- doc/examples/configure-index | 4 +- po/apt-all.pot | 941 +++++++++++++++++++----------------- po/bg.po | 1021 +++++++++++++++++++++------------------ po/bs.po | 1013 +++++++++++++++++++++----------------- po/ca.po | 1021 ++++++++++++++++++++++----------------- po/cs.po | 1019 +++++++++++++++++++++----------------- po/cy.po | 1020 ++++++++++++++++++++------------------ po/da.po | 1021 +++++++++++++++++++++------------------ po/de.po | 1023 +++++++++++++++++++++------------------ po/el.po | 1025 +++++++++++++++++++++------------------ po/en_GB.po | 1021 +++++++++++++++++++++------------------ po/es.po | 1023 +++++++++++++++++++++------------------ po/eu.po | 1021 +++++++++++++++++++++------------------ po/fi.po | 1021 +++++++++++++++++++++------------------ po/fr.po | 1101 ++++++++++++++++++++++++------------------ po/gl.po | 1021 +++++++++++++++++++++------------------ po/he.po | 1011 +++++++++++++++++++++----------------- po/hu.po | 1036 +++++++++++++++++++++------------------ po/it.po | 1023 +++++++++++++++++++++------------------ po/ja.po | 1021 +++++++++++++++++++++------------------ po/ko.po | 1021 +++++++++++++++++++++------------------ po/nb.po | 1021 +++++++++++++++++++++------------------ po/nl.po | 1019 +++++++++++++++++++++----------------- po/nn.po | 1023 +++++++++++++++++++++------------------ po/pl.po | 1034 +++++++++++++++++++++------------------ po/pt.po | 1025 +++++++++++++++++++++------------------ po/pt_BR.po | 1022 +++++++++++++++++++++------------------ po/ro.po | 1021 ++++++++++++++++++++++----------------- po/ru.po | 1021 +++++++++++++++++++++------------------ po/sk.po | 1021 +++++++++++++++++++++------------------ po/sl.po | 1023 +++++++++++++++++++++------------------ po/sv.po | 1021 +++++++++++++++++++++------------------ po/tl.po | 1023 +++++++++++++++++++++------------------ po/vi.po | 1019 +++++++++++++++++++++----------------- po/zh_CN.po | 1021 +++++++++++++++++++++------------------ po/zh_TW.po | 1021 +++++++++++++++++++++------------------ 40 files changed, 19687 insertions(+), 16105 deletions(-) diff --git a/configure.in b/configure.in index e92f3ffd2..89586a4ee 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.2ubuntu3") +AC_DEFINE_UNQUOTED(VERSION,"0.7.2ubuntu5") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove index 4a3010208..f77e1cfbf 100644 --- a/debian/apt.conf.autoremove +++ b/debian/apt.conf.autoremove @@ -7,6 +7,6 @@ APT "^linux-ubuntu-modules-.*"; }; - Install-Recommends-Section "metapackages"; - Never-MarkAuto-Section "metapackages"; + Install-Recommends-Section "*metapackages"; + Never-MarkAuto-Section "*metapackages"; }; diff --git a/debian/changelog b/debian/changelog index 4f14b4131..c3afcf403 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -apt (0.7.2ubuntu4) unstable; urgency=low +apt (0.7.2ubuntu5) UNRELEASED; urgency=low + [ Michael Vogt] * cmdline/apt-get.cc: - make the XS-Vcs-$foo warning more copy'n'paste friendly (thanks to Matt Zimmerman) @@ -7,7 +8,21 @@ apt (0.7.2ubuntu4) unstable; urgency=low * debian/apt.conf.autoremove: - added "linux-ubuntu-modules" to APT::NeverAutoRemove - -- + [ Sarah Hobbs ] + * Change metapackages to *metapackages in Install-Recommends-Section + and Never-MarkAuto-Section of debian/apt.conf.autoremove, so that + the Recommends of metapackages in universe and multiverse will get + installed. + * Also make this change in doc/examples/configure-index. + * Added a Build Dependancies of autoconf, xsltproc, docbook-xsl to fix FTBFS + + -- Sarah Hobbs Fri, 06 Jul 2007 17:44:45 +1000 + +apt (0.7.2ubuntu4) gutsy; urgency=low + + * Rebuild for the libcurl4 -> libcurl3 transition mess. + + -- Steve Kowalik Fri, 6 Jul 2007 12:44:05 +1000 apt (0.7.2ubuntu3) gutsy; urgency=low diff --git a/debian/control b/debian/control index ffb387b62..f0503f746 100644 --- a/debian/control +++ b/debian/control @@ -5,9 +5,9 @@ Maintainer: Ubuntu Core Developers XSBC-Original-Maintainer: APT Development Team Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt Standards-Version: 3.7.2.2 -Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.15.5) +Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.15.5), autoconf, xsltproc, docbook-xsl Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) -XS-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/apt/ubuntu +XS-Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/apt/ubuntu Package: apt Architecture: any diff --git a/doc/examples/configure-index b/doc/examples/configure-index index e5c4551a1..ef2c10631 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -101,10 +101,10 @@ APT Install-Suggests "false"; // install recommends automatically for packages in this section - Install-Recommends-Section "metapackages"; + Install-Recommends-Section "*metapackages"; // consider dependencies of packages in this section manual - Never-MarkAuto-Section "metapackages"; + Never-MarkAuto-Section "*metapackages"; // Write progress messages on this fd (for stuff like base-config) Status-Fd "-1"; diff --git a/po/apt-all.pot b/po/apt-all.pot index e19032f10..b308fb316 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-04-27 15:16+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -15,145 +15,153 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "" -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr "" -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr "" -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "" -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total Distinct Descriptions: " +msgstr "" + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "" -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "" -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "" + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "" -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "" -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "" -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr "" -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr "" -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr "" #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr "" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -243,8 +251,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:819 -#: apt-pkg/pkgcachegen.cc:815 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "" @@ -253,31 +260,31 @@ msgstr "" msgid "Cannot get debconf version. Is debconf installed?" msgstr "" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -319,131 +326,131 @@ msgid "" " -o=? Set an arbitrary configuration option" msgstr "" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." msgstr "" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "" -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "" -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "" -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr "" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -457,307 +464,307 @@ msgstr "" msgid "realloc - Failed to allocate memory" msgstr "" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr "" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "" -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "" -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "" -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "" -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr "" -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr "" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "" -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "" -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -765,74 +772,74 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr "" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -840,79 +847,117 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "" + +#: cmdline/apt-get.cc:1479 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, c-format +msgid "Couldn't find task %s" +msgstr "" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, c-format +msgid "%s set to manual installed.\n" +msgstr "" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -920,163 +965,174 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:100 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1091,6 +1147,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1200,192 +1257,188 @@ msgstr "" msgid "Merging available information" msgstr "" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 methods/mirror.cc:82 -#: apt-pkg/contrib/configuration.cc:747 apt-pkg/contrib/cdromutl.cc:150 -#: apt-pkg/sourcelist.cc:320 apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:752 -#: apt-pkg/pkgcachegen.cc:821 apt-pkg/pkgcachegen.cc:826 -#: apt-pkg/pkgcachegen.cc:949 apt-pkg/pkgcachegen.cc:748 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 #: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 #: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1393,77 +1446,77 @@ msgid "" "package!" msgstr "" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "" @@ -1561,8 +1614,7 @@ msgstr "" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 -#: apt-pkg/contrib/fileutl.cc:469 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "" @@ -1574,8 +1626,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 -#: apt-pkg/contrib/fileutl.cc:508 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "" @@ -1833,382 +1884,373 @@ msgstr "" msgid "Internal error" msgstr "" -#: apt-pkg/contrib/mmap.cc:82 apt-pkg/contrib/mmap.cc:78 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "" -#: apt-pkg/contrib/mmap.cc:87 apt-pkg/contrib/mmap.cc:83 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/strutl.cc:981 apt-pkg/contrib/strutl.cc:978 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "" -#: apt-pkg/contrib/configuration.cc:436 apt-pkg/contrib/configuration.cc:433 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "" -#: apt-pkg/contrib/configuration.cc:494 apt-pkg/contrib/configuration.cc:491 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:512 apt-pkg/contrib/configuration.cc:509 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "" -#: apt-pkg/contrib/configuration.cc:608 apt-pkg/contrib/configuration.cc:605 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/contrib/configuration.cc:627 apt-pkg/contrib/configuration.cc:624 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/contrib/configuration.cc:644 apt-pkg/contrib/configuration.cc:641 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/contrib/configuration.cc:684 apt-pkg/contrib/configuration.cc:681 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/contrib/configuration.cc:691 apt-pkg/contrib/configuration.cc:688 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/contrib/configuration.cc:704 apt-pkg/contrib/configuration.cc:701 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/contrib/configuration.cc:738 apt-pkg/contrib/configuration.cc:735 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" -#: apt-pkg/contrib/progress.cc:155 apt-pkg/contrib/progress.cc:152 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "" -#: apt-pkg/contrib/progress.cc:157 apt-pkg/contrib/progress.cc:154 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "" -#: apt-pkg/contrib/cmndline.cc:80 apt-pkg/contrib/cmndline.cc:77 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "" -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 apt-pkg/contrib/cmndline.cc:103 -#: apt-pkg/contrib/cmndline.cc:111 apt-pkg/contrib/cmndline.cc:119 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "" -#: apt-pkg/contrib/cmndline.cc:127 apt-pkg/contrib/cmndline.cc:124 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 #: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "" -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 #: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" -#: apt-pkg/contrib/cmndline.cc:237 apt-pkg/contrib/cmndline.cc:234 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "" -#: apt-pkg/contrib/cmndline.cc:268 apt-pkg/contrib/cmndline.cc:265 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "" -#: apt-pkg/contrib/cmndline.cc:301 apt-pkg/contrib/cmndline.cc:298 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "" -#: apt-pkg/contrib/cmndline.cc:351 apt-pkg/contrib/cmndline.cc:348 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:55 apt-pkg/contrib/cdromutl.cc:52 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 -#: methods/mirror.cc:88 apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 -#: apt-pkg/clean.cc:40 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:190 apt-pkg/contrib/cdromutl.cc:187 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:82 apt-pkg/contrib/fileutl.cc:80 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:87 apt-pkg/contrib/fileutl.cc:85 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:105 apt-pkg/contrib/fileutl.cc:103 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:109 apt-pkg/contrib/fileutl.cc:107 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:377 apt-pkg/contrib/fileutl.cc:375 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:387 apt-pkg/contrib/fileutl.cc:385 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:390 apt-pkg/contrib/fileutl.cc:388 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:436 apt-pkg/contrib/fileutl.cc:434 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:492 apt-pkg/contrib/fileutl.cc:490 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:522 apt-pkg/contrib/fileutl.cc:520 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:597 apt-pkg/contrib/fileutl.cc:595 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:603 apt-pkg/contrib/fileutl.cc:601 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:614 apt-pkg/contrib/fileutl.cc:612 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "" -#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "" -#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "" -#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "" -#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "" -#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "" -#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "" -#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "" -#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "" -#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "" -#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "" -#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "" -#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226 +#: apt-pkg/pkgcache.cc:226 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "" -#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "" -#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "" -#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "" -#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "" -#: apt-pkg/depcache.cc:103 apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:100 -#: apt-pkg/depcache.cc:129 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "" -#: apt-pkg/depcache.cc:104 apt-pkg/depcache.cc:101 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "" -#: apt-pkg/depcache.cc:133 apt-pkg/depcache.cc:130 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "" -#: apt-pkg/depcache.cc:154 apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:177 #: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 msgid "Reading state information" msgstr "" -#: apt-pkg/depcache.cc:201 apt-pkg/depcache.cc:198 +#: apt-pkg/depcache.cc:198 #, c-format msgid "Failed to open StateFile %s" msgstr "" -#: apt-pkg/depcache.cc:207 apt-pkg/depcache.cc:204 +#: apt-pkg/depcache.cc:204 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "" -#: apt-pkg/tagfile.cc:106 apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:193 apt-pkg/tagfile.cc:189 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:94 apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:96 apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:99 apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:105 apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:112 apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:203 apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 apt-pkg/sourcelist.cc:216 -#: apt-pkg/cdrom.cc:448 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:240 apt-pkg/sourcelist.cc:236 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:244 apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" -#: apt-pkg/packagemanager.cc:403 apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2216,193 +2258,192 @@ msgid "" "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -#: apt-pkg/pkgrecords.cc:35 apt-pkg/pkgrecords.cc:32 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "" -#: apt-pkg/algorithms.cc:248 apt-pkg/algorithms.cc:247 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1104 apt-pkg/algorithms.cc:1103 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1106 apt-pkg/algorithms.cc:1105 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/acquire.cc:62 apt-pkg/acquire.cc:59 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "" -#: apt-pkg/acquire.cc:66 apt-pkg/acquire.cc:63 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 apt-pkg/acquire.cc:827 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:832 apt-pkg/acquire.cc:829 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "" -#: apt-pkg/acquire-worker.cc:113 apt-pkg/acquire-worker.cc:110 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "" -#: apt-pkg/acquire-worker.cc:162 apt-pkg/acquire-worker.cc:159 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:384 apt-pkg/acquire-worker.cc:381 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:123 apt-pkg/init.cc:126 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:139 apt-pkg/init.cc:142 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "" -#: apt-pkg/clean.cc:61 apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "" -#: apt-pkg/srcrecords.cc:48 apt-pkg/srcrecords.cc:44 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "" -#: apt-pkg/cachefile.cc:73 apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "" -#: apt-pkg/cachefile.cc:77 apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "" -#: apt-pkg/policy.cc:270 apt-pkg/policy.cc:267 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "" -#: apt-pkg/policy.cc:292 apt-pkg/policy.cc:289 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:300 apt-pkg/policy.cc:297 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/pkgcachegen.cc:76 apt-pkg/pkgcachegen.cc:72 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "" -#: apt-pkg/pkgcachegen.cc:119 apt-pkg/pkgcachegen.cc:115 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "" -#: apt-pkg/pkgcachegen.cc:134 apt-pkg/pkgcachegen.cc:130 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:157 apt-pkg/pkgcachegen.cc:153 +#: apt-pkg/pkgcachegen.cc:153 #, c-format msgid "Error occured while processing %s (NewFileDesc1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:182 apt-pkg/pkgcachegen.cc:178 +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:186 apt-pkg/pkgcachegen.cc:182 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:217 apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:221 apt-pkg/pkgcachegen.cc:217 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" -#: apt-pkg/pkgcachegen.cc:225 apt-pkg/pkgcachegen.cc:221 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:249 apt-pkg/pkgcachegen.cc:245 +#: apt-pkg/pkgcachegen.cc:245 #, c-format msgid "Error occured while processing %s (NewFileDesc2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:255 apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:258 apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:261 apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:257 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:264 apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:292 apt-pkg/pkgcachegen.cc:288 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" -#: apt-pkg/pkgcachegen.cc:305 apt-pkg/pkgcachegen.cc:301 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" -#: apt-pkg/pkgcachegen.cc:311 apt-pkg/pkgcachegen.cc:307 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:682 apt-pkg/pkgcachegen.cc:678 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:767 apt-pkg/pkgcachegen.cc:763 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:894 apt-pkg/pkgcachegen.cc:901 #: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "" @@ -2412,37 +2453,36 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:293 apt-pkg/acquire-item.cc:1039 #: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 #: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:733 apt-pkg/acquire-item.cc:1156 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:847 apt-pkg/acquire-item.cc:1270 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:906 apt-pkg/acquire-item.cc:1329 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:942 apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1029 apt-pkg/acquire-item.cc:1452 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "" @@ -2451,77 +2491,81 @@ msgstr "" msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:531 apt-pkg/cdrom.cc:529 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:538 -#: apt-pkg/cdrom.cc:620 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:565 apt-pkg/cdrom.cc:563 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "" -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:603 apt-pkg/cdrom.cc:601 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:607 apt-pkg/cdrom.cc:605 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:615 apt-pkg/cdrom.cc:613 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:633 apt-pkg/cdrom.cc:631 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:673 apt-pkg/cdrom.cc:671 +#: apt-pkg/cdrom.cc:671 #, c-format msgid "" "Found %i package indexes, %i source indexes, %i translation indexes and %i " "signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:739 apt-pkg/cdrom.cc:737 +#: apt-pkg/cdrom.cc:708 +#, c-format +msgid "Found label '%s'\n" +msgstr "" + +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:755 apt-pkg/cdrom.cc:753 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:759 apt-pkg/cdrom.cc:757 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "" -#: apt-pkg/cdrom.cc:785 apt-pkg/cdrom.cc:783 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:794 apt-pkg/cdrom.cc:792 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/cdrom.cc:836 -msgid "Unmounting CD-ROM..." +#: apt-pkg/cdrom.cc:834 +msgid "Unmounting CD-ROM...\n" msgstr "" #: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 @@ -2544,69 +2588,60 @@ msgstr "" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:358 apt-pkg/deb/dpkgpm.cc:357 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:359 apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:364 apt-pkg/deb/dpkgpm.cc:363 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:365 apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:366 apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:371 apt-pkg/deb/dpkgpm.cc:370 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:372 apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:373 apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:378 apt-pkg/deb/dpkgpm.cc:377 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:379 apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "" -#: methods/rsh.cc:330 -msgid "Connection closed prematurely" -msgstr "" - -#: apt-pkg/cdrom.cc:708 -#, c-format -msgid "Found label '%s'\n" -msgstr "" - -#: apt-pkg/cdrom.cc:834 -msgid "Unmounting CD-ROM...\n" -msgstr "" - #: methods/rred.cc:219 msgid "Could not patch file" msgstr "" + +#: methods/rsh.cc:330 +msgid "Connection closed prematurely" +msgstr "" diff --git a/po/bg.po b/po/bg.po index 0738441b9..9c759de25 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2006-10-12 20:14+0300\n" "Last-Translator: Yavor Doganov \n" "Language-Team: Bulgarian \n" @@ -16,146 +16,156 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Пакет %s версия %s има неудовлетворена зависимост:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Пакетът %s не може да бъде намерен" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "Общо имена на пакети : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Нормални пакети: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Чисти виртуални пакети: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Единични виртуални пакети: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Смесени виртуални пакети: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Липсващи: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Общо уникални версии: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Общо уникални версии: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Общо зависимости: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Общо отношения версия/файл: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Общо отношения версия/файл: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Общо отношения „Осигурява“: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Общо разгърнати низове: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Общо пространство за зависимости по версии: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Общо празно пространство: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Общо отчетено пространство: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Пакетният файл %s не е синхронизиран." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Трябва да въведете само един израз" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Няма намерени пакети" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Пакетни файлове:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Кешът не е синхронизиран, не може да се изпълни „x-ref“ на пакетен файл" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Отбити пакети:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(не са намерени)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Инсталирана: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(няма)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Кандидат: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Отбиване на пакета: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Таблица с версиите:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s за %s %s, компилиран на %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -306,7 +316,7 @@ msgstr "" " -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "Неуспех при записа на %s" @@ -315,31 +325,31 @@ msgstr "Неуспех при записа на %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Не може да се извлече версията на debconf. Debconf инсталиран ли е?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Списъкът с разширения на пакети и твърде дълъг" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "Грешка при обработката на директория %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Списъкът с разширения на източници е твърде дълъг" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Грешка при запазването на заглавната част във файла със съдържание" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Грешка при обработката на съдържание %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -424,26 +434,26 @@ msgstr "" " -c=? Четене на този конфигурационен файл.\n" " -o=? Настройване на произволна конфигурационна опция" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Няма съвпадения на избора" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Липсват някои файлове от групата с файлови пакети „%s“" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "БД е повредена, файлът е преименуван на %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "БД е стара, опит за актуализиране на %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." @@ -451,106 +461,106 @@ msgstr "" "Форматът на БД е невалиден. Ако сте обновили от стара версия на apt, " "премахнете базата от данни и я създайте наново." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Неуспех при отварянето на файл %s от БД: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "Грешка при получаването на атрибути за %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "В архива няма поле „control“" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Неуспех при получаването на курсор" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Неуспех при четенето на директория %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Неуспех при четенето на %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "E: Грешките се отнасят за файла " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "Неуспех при превръщането на %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "Неуспех при обхода на дървото" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "Неуспех при отварянето на %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr "DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "Неуспех при прочитането на връзка %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "Неуспех при премахването на връзка %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Неуспех при създаването на връзка %s към %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "Превишен лимит на DeLink от %sB.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Архивът няма поле „package“" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s няма запис „override“\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " поддържащия пакета %s е %s, а не %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr " %s няма запис „source override“\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s няма също и запис „binary override“\n" @@ -564,165 +574,165 @@ msgstr "Вътрешна грешка, неуспех при намиранет msgid "realloc - Failed to allocate memory" msgstr "realloc - Неуспех при заделянето на памет" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Неуспех при отварянето на %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Неправилно форматиран override %s, ред %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Неправилно форматиран override %s, ред %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Неправилно форматиран override %s, ред %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Неуспех при четенето на override файл %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Непознат алгоритъм за компресия „%s“" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Компресираният изход %s изисква настройка за компресирането" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Неуспех при създаването на IPC pipe към подпроцеса" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "Неуспех при създаването на FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "Неуспех при пускането на подпроцес" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "Процес-потомък за компресиране" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "Вътрешна грешка, неуспех при създаването на %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "Неуспех при създаването на подпроцес IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "Неуспех при изпълнението на компресиращата програма " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "декомпресираща програма" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "В/И към подпроцеса/файла пропадна" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "Неуспех при четене докато се изчислява MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "Неуспех при премахването на връзка на %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Неуспех при преименуването на %s на %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "Грешка при компилирането на регулярния израз - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "Следните пакети имат неудовлетворени зависимости:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "но е инсталиран %s" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "но ще бъде инсталиран %s" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "но той не може да бъде инсталиран" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "но той е виртуален пакет" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "но той не е инсталиран" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "но той няма да бъде инсталиран" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " или" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "Следните НОВИ пакети ще бъдат инсталирани:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "Следните пакети ще бъдат ПРЕМАХНАТИ:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "Следните пакети няма да бъдат променени:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "Следните пакети ще бъдат актуализирани:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "Следните пакети ще бъдат ВЪРНАТИ КЪМ ПО-СТАРА ВЕРСИЯ:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "Следните задържани пакети ще бъдат променени:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (поради %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -730,146 +740,146 @@ msgstr "" "ПРЕДУПРЕЖДЕНИЕ: Следните необходими пакети ще бъдат премахнати.\n" "Това НЕ би трябвало да става освен ако знаете точно какво правите!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu актуализирани, %lu нови инсталирани, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu преинсталирани, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu върнати към по-стара версия, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu за премахване и %lu без промяна.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu не са напълно инсталирани или премахнати.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Коригиране на зависимостите..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " пропадна." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Неуспех при коригирането на зависимостите" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Неуспех при минимизирането на набора актуализации" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Готово" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "Възможно е да изпълните „apt-get -f install“, за да коригирате тези " "неизправности." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Неудовлетворени зависимости. Опитайте с „-f“." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ПРЕДУПРЕЖДЕНИЕ: Следните пакети не могат да бъдат удостоверени!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Предупреждението за удостоверяването е пренебрегнато.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Инсталиране на тези пакети без проверка [y/N]?" -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Някои пакети не можаха да бъдат удостоверени" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Има проблеми и „-y“ е използвано без „--force-yes“" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Вътрешна грешка, „InstallPackages“ е предизвикано при счупени пакети!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Трябва да бъдат премахнати пакети, но премахването е изключено." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Вътрешна грешка, „Ordering“ не завърши" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "Неуспех при заключването на директорията за изтегляне" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Списъкът с източници не можа да бъде прочетен." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Странно.. Размерите не съвпадат, изпратете е-поща на apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Необходимо е да се изтеглят %sB/%sB архиви.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Необходимо е да се изтеглят %sB архиви.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "След разпакетирането ще бъде използвано %sB дисково пространство.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "След разпакетирането ще бъде освободено %sB дисково пространство.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "Неуспех при определянето на свободното пространство в %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Нямате достатъчно свободно пространство в %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Указано е „Trivial Only“, но това не е тривиална операция." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Да, прави каквото казвам!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -880,28 +890,28 @@ msgstr "" "За да продължите, въведете фразата „%s“\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "Прекъсване." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Искате ли да продължите [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Неуспех при изтеглянето на %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Някои файлове не можаха да бъдат изтеглени" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "Изтеглянето завърши в режим само на изтегляне" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -909,47 +919,47 @@ msgstr "" "Неуспех при изтеглянето на някои архиви, може да изпълните „apt-get update“ " "или да опитате с „--fix-missing“?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "„--fix-missing“ и превключване на носители не се поддържа все още" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Неуспех при коригирането на липсващите пакети." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Прекъсване на инсталирането." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Забележете, избиране на %s вместо %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Пропускане на %s, вече е инсталиран и не е маркиран за актуализация.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Пакетът %s не е инсталиран, така че не е премахнат\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Пакетът %s е виртуален пакет, осигурен от:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Инсталиран]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Трябва изрично да изберете един за инсталиране." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -960,49 +970,49 @@ msgstr "" "Това може да означава, че пакета липсва, остарял е, или е достъпен\n" "само от друг източник\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Обаче следните пакети го заместват:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Пакетът %s няма кандидат за инсталиране" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Преинсталацията на %s не е възможна, не може да бъде изтеглен.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s вече е най-новата версия.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Не е намерено издание „%s“ на „%s“" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Не е намерена версия „%s“ на „%s“" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Избрана е версия %s (%s) за %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Командата „update“ не възприема аргументи" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Неуспех при заключването на директорията със списъка на пакетите" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1010,25 +1020,66 @@ msgstr "" "Някои индексни файлове не можаха да бъдат изтеглени, те са пренебрегнати или " "са използвани по-стари." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Следните НОВИ пакети ще бъдат инсталирани:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "" +"Следната информация може да помогне за намиране на изход от ситуацията:" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Неуспех при намирането на пакет %s" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "Неуспех при намирането на пакет %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Забележете, избиране на %s за регулярен израз „%s“\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "но ще бъде инсталиран %s" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1036,7 +1087,7 @@ msgstr "" "Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или " "укажете разрешение)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1048,7 +1099,7 @@ msgstr "" "дистрибуция, че някои необходими пакети още не са създадени или пък\n" "са били преместени от Incoming." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1058,123 +1109,133 @@ msgstr "" "да не може да бъде инсталиран; в такъв случай би трябвало да се подаде\n" "доклад за грешка за този пакет." -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "" -"Следната информация може да помогне за намиране на изход от ситуацията:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "Счупени пакети" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "Следните допълнителни пакети ще бъдат инсталирани:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "Предложени пакети:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "Препоръчвани пакети:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "Изчисляване на актуализацията..." -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Неуспех" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "Готово" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "Неуспех при намирането на изходен код на пакет %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускане на вече изтегления файл „%s“\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "Нямате достатъчно свободно пространство в %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "Изтегляне на изходен код %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "Неуспех при изтеглянето на някои архиви." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Командата за разпакетиране „%s“ пропадна.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "Командата за компилиране „%s“ пропадна.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "Процесът-потомък пропадна" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "" "Трябва да укажете поне един пакет за проверка на зависимости за компилиране" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Неуспех при получаването на информация за зависимостите за компилиране на %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "%s няма зависимости за компилиране.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1183,7 +1244,7 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s " "не може да бъде намерен" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1193,32 +1254,33 @@ msgstr "" "налични версии на пакета %s, които могат да удовлетворят изискването за " "версия" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният " "пакет %s е твърде нов" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "Неуспех при обработката на зависимостите за компилиране" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "Поддържани модули:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1233,6 +1295,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1397,189 +1460,189 @@ msgstr "" msgid "Merging available information" msgstr "Смесване на наличната информация" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Неуспех при създаването на програмни канали" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Неуспех при изпълнението на gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Развален архив" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Невярна контролна сума на tar, развален архив" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Непозната заглавна част на TAR тип %u, елемент %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Невалиден подпис на архива" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Грешка при четене на заглавната част на елемента на архива" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Невалидна заглавна част на елемента на архива" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Архивът е твърде кратък" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Неуспех при четенето на заглавните части на архива" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "Извикан е DropNode за все още използван възел" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Грешка при намирането на хеш-елемента!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Неуспех при установяване на отклонението" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Вътрешна грешка в AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Опит за изменение на отклонение, %s -> %s и %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Двойно добавяне на отклонение %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Дублиран конфигурационен файл %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Неуспех при запис на файл %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Неуспех при затварянето на файл %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Пътят %s е твърде дълъг" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Разпакетиране на %s повече от веднъж" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Директорията %s е отклонена" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Пакетът се опитва да пише в целта за отклонение %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Пътят за отклонение е твърде дълъг" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Директорията %s се заменя с не-директория" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Неуспех при намирането на възел в неговия хеш" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Пътят е твърде дълъг" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Файловете се заменят със съдържанието на пакета %s без версия" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Файл %s/%s заменя този в пакет %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Неуспех при четенето на %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Неуспех при получаването на атрибути за %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Неуспех при премахването на %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Неуспех при създаването на %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Неуспех при получаването на атрибути %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "" "Директориите info и temp трябва да бъдат на една и съща файлова система" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "Четене на списъците с пакети" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Неуспех при преминаването в администраторската директория %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "Вътрешна грешка при получаването на името на пакета" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Четене на списъка на файловете" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1590,77 +1653,77 @@ msgstr "" "възстановите този файл, запишете го като празен и веднага преинсталирайте " "същата версия на пакета!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Неуспех при четенето на списъка с файлове %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Вътрешна грешка при получаването на възел" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Неуспех при отварянето на файл с отклонения %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Файлът с отклонения е повреден" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "Неправилен ред във файла с отклонения: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Вътрешна грешка при добавянето на отклонение" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Първо трябва да се инициализира кеша с пакети" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Неуспех при намирането на заглавна част „Package:“, изместване %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Неправилна секция „ConfFile“ във файла за състояние. Изместване %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Грешка при анализирането на MD5. Изместване %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Това не е валиден DEB архив, липсва елемент „%s“" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "Това не е валиден DEB архив, няма елемент „%s“ или „%s“" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "Неуспех при преминаването в %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "Вътрешна грешка, не може да се открие елемент" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "Неуспех при намирането на валиден контролен файл" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "Контролен файл, невъзможен за анализ" @@ -1695,11 +1758,12 @@ msgid "File not found" msgstr "Файлът не е намерен" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Неуспех при получаването на атрибути" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Неуспех при задаването на време на промяна" @@ -1761,7 +1825,7 @@ msgstr "Допустимото време за свързването изтеч msgid "Server closed the connection" msgstr "Сървърът разпадна връзката" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "Грешка при четене" @@ -1773,7 +1837,7 @@ msgstr "Отговорът препълни буфера." msgid "Protocol corruption" msgstr "Развален протокол" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "Грешка при запис" @@ -1829,7 +1893,7 @@ msgstr "Времето за установяване на връзка с гне msgid "Unable to accept connection" msgstr "Невъзможно е да се приеме свързването" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Проблем при хеширане на файла" @@ -1856,39 +1920,39 @@ msgstr "Запитване" msgid "Unable to invoke " msgstr "Неуспех при извикването на " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Свързване с %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Неуспех при създаването на гнездо за %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Не може да се започне свързване с %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Неуспех при свързване с %s:%s (%s), допустимото време изтече" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Неуспех при свързване с %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Свързване с %s" @@ -1968,436 +2032,456 @@ msgstr "Неуспех при отварянето на програмен ка msgid "Read error from %s process" msgstr "Грешка при четене от процес %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Чакане на заглавни части" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Получен е един ред на заглавна част с над %u символа" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Невалиден ред на заглавна част" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP сървърът изпрати невалидна заглавна част като отговор" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Length“" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Range“" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "HTTP сървърът няма поддръжка за прехвърляне на фрагменти на файлове" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Неизвестен формат на дата" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Неуспех на избора" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Допустимото време за свързване изтече" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Грешка при записа на изходен файл" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Грешка при записа на файл" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Грешка при записа на файла" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Грешка при четене от сървъра" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Невалидни данни на заглавната част" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Неуспех при свързването" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Вътрешна грешка" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "Невъзможно е да се прехвърли в паметта празен файл" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Неуспех при прехвърлянето в паметта на %lu байта" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "Изборът %s не е намерен" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Неизвестен тип на абревиатура: „%c“" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "Отваряне на конфигурационен файл %s" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "Ред %d е твърде дълъг (максимум %d)" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Синтактична грешка %s:%u: В началото на блока няма име." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Синтактична грешка %s:%u: Лошо форматиран таг" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Синтактична грешка %s:%u: Излишни символи след стойността" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Синтактична грешка %s:%u: Директиви могат да се задават само в най-горното " "ниво" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Синтактична грешка %s:%u: Твърде много вложени „include“" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Синтактична грешка %s:%u: Извикан „include“ оттук" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Синтактична грешка %s:%u: Неподдържана директива „%s“" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Синтактична грешка %s:%u: Излишни символи в края на файла" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Грешка!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... Готово" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Неизвестна опция за команден ред „%c“ [от %s]." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "Опцията за команден ред %s не е разпозната" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Опцията за команден ред %s не е булева" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Опция %s изисква аргумент." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Опция %s: Значението трябва да има =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Опция %s изисква аргумент цяло число, не „%s“" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Опция „%s“ е твърде дълга" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Смисълът %s не е ясен, опитайте true или false." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Невалидна операция %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Неуспех при намирането на атрибутите на точка за монтиране %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Неуспех при преминаването в %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "Неуспех при намирането на атрибутите на cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Не се използва заключване за файл за заключване %s, който е само за четене" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "Неуспех при отварянето на файл за заключване %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Не се използва заключване за файл за заключване %s, който е монтиран по NFS" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "Неуспех при достъпа до заключване %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Изчака се завършването на %s, но той не беше пуснат" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Нарушение на защитата на паметта (segmentation fault) в подпроцеса %s." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Подпроцесът %s върна код за грешка (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Подпроцесът %s завърши неочаквано" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "Неуспех при отварянето на файла %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "" "грешка при четене, все още има %lu за четене, но няма нито един останал" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "грешка при запис, все още име %lu за запис, но не успя" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "Проблем при затварянето на файла" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "Проблем при премахването на връзка към файла" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "Проблем при синхронизиране на файла" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Празен кеш на пакети" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Файлът за кеш на пакети е повреден" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Файлът за кеш на пакети е несъвместима версия" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Тази версия на APT не поддържа система за версии „%s“" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Кешът на пакети е бил направен за различна архитектура" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Зависи от" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Предварително зависи от" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Предлага се" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Препоръчва се" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Конфликтира с" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Заменя" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Изважда от употреба" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "важен" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "изискван" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "стандартен" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "незадължителен" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "допълнителен" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "Изграждане на дървото със зависимости" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "Версии кандидати" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "Генериране на зависимости" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "Смесване на наличната информация" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Неуспех при отварянето на %s" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Неуспех при запис на файл %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Неуспех при анализирането на пакетен файл %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Неуспех при анализирането на пакетен файл %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (адрес-URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (дистрибуция)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s (неограничена дистрибуция)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s (анализ на дистрибуция)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Отваряне на %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Ред %u в списъка с източници %s е твърде дълъг." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Лошо форматиран ред %u в списъка с източници %s (тип)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен." -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" "Лошо форматиран ред %u в списъка с източници %s (идентификатор на " "производител)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2409,12 +2493,12 @@ msgstr "" "пакет %s. Това често е лошо, но ако наистина искате да го направите, " "активирайте опцията APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Не се поддържа индексен файл от типа „%s“" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2422,7 +2506,7 @@ msgstr "" "Пакетът %s трябва да бъде преинсталиран, но не може да се намери архив за " "него." -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2430,187 +2514,203 @@ msgstr "" "Грешка, pkgProblemResolver::Resolve генерира повреди, това може да е " "причинено от задържани пакети." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Неуспех при коригирането на проблемите, имате задържани счупени пакети." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Директорията със списъци %spartial липсва." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Директорията за архиви %spartial липсва." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Изтегляне на файл %li от %li (остават %s)" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "Изтегляне на файл %li от %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Неуспех при намирането на драйвер за метод %s." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Методът %s не стартира правилно" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Пакетната система „%s“ не е поддържана" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "Неуспех при определянето на подходяща пакетна система" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Неуспех при получаването на атрибути на %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Трябва да добавите адреси-URI от тип „source“ в sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Списъците с пакети или файлът за състояние не можаха да бъдат анализирани " "или отворени." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Може да искате да изпълните „apt-get update“, за да коригирате тези проблеми" -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Невалиден запис във файла с настройки, няма заглавна част Package" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Неизвестен тип за отбиване %s" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Няма указан приоритет (или е нула) на отбиването" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Кешът има несъвместима система за версии" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Възникна грешка при обработката на %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Възникна грешка при обработката на %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Възникна грешка при обработката на %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Възникна грешка при обработката на %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Възникна грешка при обработката на %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Възникна грешка при обработката на %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Възникна грешка при обработката на %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Възникна грешка при обработката на %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Възникна грешка при обработката на %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Еха, надхвърлихте броя имена на пакети, на който е способна тази версия на " "APT." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Еха, надхвърлихте броя версии, на който е способна тази версия на APT." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Еха, надхвърлихте броя версии, на който е способна тази версия на APT." + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Еха, надхвърлихте броя зависимости, на който е способна тази версия на APT." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Възникна грешка при обработката на %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Възникна грешка при обработката на %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Пакетът %s %s не беше открит при обработката на файла със зависимости" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "" "Неуспех при получаването на атрибути на списъка с пакети с изходен код %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "Събиране на информация за „Осигурява“" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "преименуването се провали, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Несъответствие на контролна сума MD5" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2619,7 +2719,7 @@ msgstr "" "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет (поради пропусната архитектура)." -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2628,14 +2728,14 @@ msgstr "" "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет." -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s." -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Несъответствие на размера" @@ -2644,7 +2744,7 @@ msgstr "Несъответствие на размера" msgid "Vendor block %s contains no fingerprint" msgstr "Блокът на производителя %s не съдържа отпечатък" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2653,54 +2753,56 @@ msgstr "" "Използване на точка за монтиране на CD-ROM %s\n" "Монтиране на CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "Идентифициране..." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "Запазен етикет: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Използване на точка за монтиране на CD-ROM %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "Демонтиране на CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "Чакане за диск...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "Монтиране на CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "Сканиране на диска за индексни файлове...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "" "Намерени са %i индекса на пакети, %i индекса на пакети с изходен код и %i " "подписа.\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "Запазен етикет: %s \n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "Това не е валидно име, опитайте отново.\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2709,93 +2811,98 @@ msgstr "" "Наименование на този диск: \n" "„%s“\n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Копиране на списъците с пакети..." -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Запазване на новия списък с източници\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Записите в списъка с източници за този диск са:\n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "Демонтиране на CD-ROM..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Записани са %i записа.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Записани са %i записа с %i липсващи файла.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Записани са %i записа с %i несъответстващи файла\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Записани са %i записа с %i липсващи и %i несъответстващи файла\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Подготвяне на %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Разпакетиране на %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Подготвяне на %s за конфигуриране" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Конфигуриране на %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "%s е инсталиран" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Подготвяне за премахване на %s" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Премахване на %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "%s е премахнат" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Подготовка за пълно премахване на %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "%s е напълно премахнат" +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Неуспех при отварянето на файла %s" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Връзката прекъсна преждевременно" diff --git a/po/bs.po b/po/bs.po index aaa8a5948..0a7907f99 100644 --- a/po/bs.po +++ b/po/bs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Šećerović \n" "Language-Team: Bosnian \n" @@ -14,145 +14,155 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Paket %s verzije %s ima nezadovoljenu zavisnost:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Ne mogu pronaći paket %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "Ukupno naziva paketa:" -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Normalni paketi:" -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Čisto virtuelni paketi:" -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Pojedinačni virutuelni paketi:" -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Miješani virtuelni paketi:" -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Nedostajući:" -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Ukupno različitih verzija:" -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Ukupno različitih verzija:" + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Ukupno zavisnosti:" -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Ukupno Verzija/Datoteka odnosa:" -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Ukupno Verzija/Datoteka odnosa:" + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "" -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "" -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "" -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Paketi nisu pronađeni" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Datoteke paketa:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Instalirano:" -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr "" -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr "" #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr "" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -254,7 +264,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "Ne mogu zapisati na %s" @@ -264,31 +274,31 @@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "" "Ne mogu odrediti verziju debconf programa. Da li je debconf instaliran?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -330,131 +340,131 @@ msgid "" " -o=? Set an arbitrary configuration option" msgstr "" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB je bila oštećena, datoteka preimenovana u %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB je stara, pokušavam nadogradnju %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." msgstr "" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, fuzzy, c-format msgid "Unable to open DB file %s: %s" msgstr "Ne mogu otvoriti DB datoteku %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Arhiva nema kontrolnog zapisa" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "" -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "" -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "" -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "Ne mogu otvoriti %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr "" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -468,309 +478,309 @@ msgstr "" msgid "realloc - Failed to allocate memory" msgstr "" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "ali je %s instaliran" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "ali se %s treba instalirati" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "ali se ne može instalirati" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "ali je virtuelni paket" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "ali nije instaliran" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "ali se neće instalirati" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " ili" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "Slijedeći NOVI paketi će biti instalirani:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "Slijedeći paketi će biti UKLONJENI:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 #, fuzzy msgid "The following packages have been kept back:" msgstr "Slijedeći paketi su zadržani:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "Slijedeći paketi će biti nadograđeni:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "" -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "" -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "" -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Ispravljam zavisnosti..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr "" -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Ne mogu ispraviti zavisnosti" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Urađeno" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 #, fuzzy msgid "WARNING: The following packages cannot be authenticated!" msgstr "Slijedeći paketi će biti nadograđeni:" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "" -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Da, uradi kako kažem!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -778,75 +788,75 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "Odustani." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 #, fuzzy msgid "Do you want to continue [Y/n]? " msgstr "Da li želite nastaviti? [Y/n]" -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Odustajem od instalacije." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr "[Instalirano]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -854,79 +864,118 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Međutim, slijedeći paketi ga zamjenjuju:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Slijedeći NOVI paketi će biti instalirani:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "" + +#: cmdline/apt-get.cc:1479 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, c-format +msgid "Couldn't find task %s" +msgstr "" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "ali se %s treba instalirati" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -934,163 +983,174 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "Oštećeni paketi" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "Slijedeći dodatni paketi će biti instalirani:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "Predloženi paketi:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "Preporučeni paketi:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "Računam nadogradnju..." -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Neuspješno" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "Urađeno" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "Podržani moduli:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1105,6 +1165,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1214,188 +1275,188 @@ msgstr "" msgid "Merging available information" msgstr "Sastavljam dostupne informacije" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Ne mogu izvršiti gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Oštećena arhiva" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Provjera Tar kontrolnog zbira nije uspjela, arhiva oštećena" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Arhiva je prekratka" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, fuzzy, c-format msgid "Failed to write file %s" msgstr "Ne mogu ukloniti %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Putanja je preduga" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Ne mogu čitati %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Ne mogu ukloniti %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Ne mogu kreirati %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "Čitam spiskove paketa" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Čitam spisak datoteke" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1403,77 +1464,77 @@ msgid "" "package!" msgstr "" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "" @@ -1508,11 +1569,12 @@ msgid "File not found" msgstr "Datoteka nije pronađena" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "" @@ -1572,7 +1634,7 @@ msgstr "" msgid "Server closed the connection" msgstr "Server je zatvorio vezu" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "Greška pri čitanju" @@ -1585,7 +1647,7 @@ msgstr "" msgid "Protocol corruption" msgstr "Oštećenje protokola" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "Greška pri pisanju" @@ -1639,7 +1701,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1666,39 +1728,39 @@ msgstr "" msgid "Unable to invoke " msgstr "" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "" -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Povezujem se sa %s" @@ -1771,428 +1833,448 @@ msgstr "" msgid "Read error from %s process" msgstr "" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Čekam na zaglavlja" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Nepoznat oblik datuma" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Povezivanje neuspješno" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Unutrašnja greška" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "" -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "" -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "" -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Zavisi" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Unaprijed zavisi" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Predlaže" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Preporučuje" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 #, fuzzy msgid "Conflicts" msgstr "Sukobljava se sa" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Zamjenjuje" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Zastarijeva" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "važno" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "zahtijevano" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standardno" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opcionalno" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "Gradim stablo zavisnosti" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "Verzije kandidata" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "Stvaranje zavisnosti" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "Sastavljam dostupne informacije" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Ne mogu otvoriti %s" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Ne mogu ukloniti %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Otvaram %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2200,216 +2282,231 @@ msgid "" "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "" -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, fuzzy, c-format msgid "Retrieving file %li of %li" msgstr "Čitam spisak datoteke" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "" -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "" -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "" -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "" -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "" @@ -2418,154 +2515,160 @@ msgstr "" msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 #, fuzzy msgid "Waiting for disc...\n" msgstr "Čekam na zaglavlja" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:671 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, c-format msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 #, fuzzy msgid "Copying package lists..." msgstr "Čitam spiskove paketa" -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "Pogrešan CD" -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, fuzzy, c-format msgid "Preparing %s" msgstr "Otvaram %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Otvaram %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, fuzzy, c-format msgid "Configuring %s" msgstr "Povezujem se sa %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, fuzzy, c-format msgid "Installed %s" msgstr " Instalirano:" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, fuzzy, c-format msgid "Removing %s" msgstr "Otvaram %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, fuzzy, c-format msgid "Removed %s" msgstr "Preporučuje" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Ne mogu ukloniti %s" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "" diff --git a/po/ca.po b/po/ca.po index ae0fc8d2d..3ad8d8b80 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2006-02-05 22:00+0100\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -16,146 +16,156 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "El paquet %s versió %s té una dependència sense satisfer:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "No s'ha trobat el paquet %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "Nombre total de paquets: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Paquets normals: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Paquets virtuals purs: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Paquets virtuals únics: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Paquets virtuals mixtes: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Falten: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Total de versions diferents: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Total de versions diferents: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Total de dependències: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Total de relacions versió/fitxer: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Total de relacions versió/fitxer: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Total dels mapes aportats: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Total de cadenes globals: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Total de l'espai per a dependències de versió: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Total de l'espai desperdiciat: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Total de l'espai atribuit a: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "El fitxer %s del paquet està desincronitzat." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Heu de donar exactament un patró" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "No s'han trobat paquets" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Fitxers de paquets:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Memòria cau no sincronitzada, no es pot fer x-ref a un fitxer del paquet" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Paquets etiquetats:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(no trobat)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Instal·lat: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(cap)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Candidat: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Etiqueta del paquet: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Taula de versió:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s per a %s %s compilat el %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -303,7 +313,7 @@ msgstr "" " -c=? Llegeix aquest fitxer de configuració\n" " -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "No es pot escriure en %s" @@ -312,31 +322,31 @@ msgstr "No es pot escriure en %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "No es pot determinar la versió de debconf. Està instal·lat debconf?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "La llista de les extensions dels paquets és massa llarga" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "S'ha produït un error en processar el directori %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "La llista d'extensions de les fonts és massa llarga" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "S'ha produït un error en escriure la capçalera al fitxer de continguts" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "S'ha produït un error en processar el fitxer de continguts %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -417,26 +427,26 @@ msgstr "" " -c=? Llegeix aquest fitxer de configuració\n" " -o=? Estableix una opció de configuració arbitrària" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "No s'ha trobat cap selecció" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "No es troben alguns fitxers dins del grup de fitxers del paquet `%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "La base de dades està corrompuda, fitxer renomenat a %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "La BD és vella, s'està intentant actualitzar %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." @@ -444,106 +454,106 @@ msgstr "" "El format de la base de dades és invàlid. Si heu actualitzat des d'una " "versió més antiga de l'apt, eliminieu i torneu a crear la base de dades." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "No es pot obrir el fitxer de DB %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "No es pot determinar l'estat de %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Arxiu sense registre de control" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "No es pot aconseguir un cursor" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: No es pot llegir el directori %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: No es pot veure l'estat %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "A: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "E: Els errors s'apliquen al fitxer " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "No s'ha pogut resoldre %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "L'arbre està fallant" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "No s'ha pogut obrir %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "No s'ha pogut llegir l'enllaç %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "No s'ha pogut alliberar %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** No s'ha pogut enllaçar %s a %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink s'ha arribat al límit de %sB.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Arxiu sense el camp paquet" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s no té una entrada dominant\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " el mantenidor de %s és %s, no %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr " %s no té una entrada dominant de font\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s no té una entrada dominant de binari\n" @@ -557,165 +567,165 @@ msgstr "Error intern, no s'ha pogut localitzar al membre %s" msgid "realloc - Failed to allocate memory" msgstr "realloc - No s'ha pogut assignar espai en memòria" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "No es pot obrir %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Línia predominant %s línia malformada %lu núm 1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Línia predominant %s línia malformada %lu núm 2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Línia predominant %s línia malformada %lu núm 3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "No s'ha pogut llegir la línia predominant del fitxer %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algorisme de compressió desconegut '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "L'eixida comprimida %s necessita un joc de compressió" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "No s'ha pogut crear el conducte IPC al subprocés" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "No s'ha pogut crear FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "No s'ha pogut bifurcar" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "Comprimeix el fil" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "S'ha produït un error intern, no s'ha pogut crear %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "No s'ha pogut crear el subprocés IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "No s'ha pogut executar el compressor " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "decompressor" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "Ha fallat l'E/S del subprocés sobre el fitxer" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "No s'ha pogut llegir mentre es calculava la suma MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "S'ha trobat un problema treient l'enllaç %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "No s'ha pogut canviar el nom de %s a %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "S'ha produït un error de compilació de l'expressió regular - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "Els següents paquets tenen dependències sense satisfer:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "però està instal·lat %s" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "però s'instal·larà %s" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "però no és instal·lable" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "però és un paquet virtual" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "però no està instal·lat" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "però no serà instal·lat" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " o" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "S'instal·laran els següents paquets NOUS:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "S'ELIMINARAN els següents paquets:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "S'han mantingut els següents paquets:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "S'actualitzaran els següents paquets:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "Es DESACTUALITZARAN els següents paquets:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "Es canviaran els següents paquets mantinguts:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (per %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -723,146 +733,146 @@ msgstr "" "AVÍS: Els següents paquets essencials seran eliminats.\n" "Això NO s'ha de fer a menys que sapigueu exactament el que esteu fent!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualitzats, %lu nous a instal·lar, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstal·lats, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualitzats, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a eliminar i %lu no actualitzats.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu no instal·lats o eliminats completament.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "S'estan corregint les dependències..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " ha fallat." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "No es poden corregir les dependències" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "No es pot minimitzar el joc de versions revisades" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Fet" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Dependències sense satisfer. Proveu-ho usant -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVÍS: No es poden autenticar els següents paquets!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "S'ha descartat l'avís d'autenticació.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Voleu instal·lar aquests paquets sense verificar-los [s/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "No s'ha pogut autenticar alguns paquets" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Hi ha problemes i s'ha usat -y sense --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "S'ha produït un error intern, s'ha cridat a InstallPackages amb paquets " "trencats!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Els paquets necessiten ser eliminats però Remove està inhabilitat." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "S'ha produït un error intern, l'ordenació no ha acabat" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "No és possible blocar el directori de descàrrega" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "No s'ha pogut llegir la llista de les fonts." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Què estrany... les mides no coincideixen, informeu a apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Es necessita obtenir %sB/%sB d'arxius.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Es necessita obtenir %sB d'arxius.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Després de desempaquetar s'usaran %sB d'espai en disc addicional.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Després de desempaquetar s'alliberaran %sB d'espai en disc.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "No s'ha pogut determinar l'espai lliure en %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "No teniu prou espai lliure en %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Es va especificar Trivial Only però aquesta operació no és trivial." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Sí, fes el que et dic!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -873,28 +883,28 @@ msgstr "" "Per a continuar escriviu la frase «%s»\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "Avortat." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Voleu continuar [S/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "No s'ha pogut obtenir %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Alguns fitxers no s'han pogut descarregar" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "Descàrrega completa i en mode de només descàrrega" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -902,48 +912,48 @@ msgstr "" "No es poden descarregar alguns arxius, potser executant apt-get update o " "intenteu-ho amb --fix-missing." -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing i medi d'intercanvi actualment no estan suportats" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "No es poden corregir els paquets que falten." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "S'està avortant la instal·lació." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota: s'està seleccionant %s en comptes de %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "S'està ometent %s, ja està instal·lat i l'actualització no està establerta.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "El paquet %s no està instal·lat, així que no s'eliminarà\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "El paquet %s és un paquet virtual proveït per:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Instal·lat]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Necessiteu seleccionar-ne un explícitament per a instal·lar-lo." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -954,50 +964,50 @@ msgstr "" "en fa referència. Això normalment vol dir que el paquet falta,\n" "s'ha tornat obsolet o només és disponible des d'una altra font.\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Tot i que els següents paquets el reemplacen:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "El paquet %s no té candidat d'instal·lació" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "No es possible la reinstal·lació del paquet %s, no es pot descarregar.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ja es troba en la versió més recent.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "No s'ha trobat la versió puntual «%s» per a «%s»" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "No s'ha trobat la versió «%s» per a «%s»" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versió seleccionada %s (%s) per a %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "L'ordre update no pren arguments" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "No es pot blocar el directori de la llista" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1005,25 +1015,66 @@ msgstr "" "No es poden descarregar alguns fitxers índex, s'han ignorat o en el seu lloc " "s'han usat els antics." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "S'instal·laran els següents paquets NOUS:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "La següent informació pot ajudar-vos a resoldre la situació:" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "" +"S'ha produït un error intern, el solucionador de problemes ha trencat coses" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error intern, AllUpgrade ha trencat coses" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "No s'ha pogut trobar el paquet %s" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "No s'ha pogut trobar el paquet %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota: s'està seleccionant %s per a l'expressió regular '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "però s'instal·larà %s" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1031,7 +1082,7 @@ msgstr "" "Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o " "especifiqueu una solució)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1043,7 +1094,7 @@ msgstr "" "unstable i alguns paquets requerits encara no han estat creats o bé\n" "encara no els hi han afegit." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1053,124 +1104,135 @@ msgstr "" "probable que el paquet no sigui instal·lable i que s'hagi d'emetre\n" "un informe d'error en contra d'aquest per a arxivar-lo." -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "La següent informació pot ajudar-vos a resoldre la situació:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "Paquets trencats" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "S'instal·laran els següents paquets extres:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "Paquets suggerits:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "Paquets recomanats:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "S'està calculant l'actualització... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Ha fallat" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "Fet" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "" "S'ha produït un error intern, el solucionador de problemes ha trencat coses" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "Haureu d'especificar un paquet de codi font per a descarregar" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "No es pot trobar un paquet de fonts per a %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "S'està ometent el fitxer ja descarregat «%s»\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "No teniu prou espai lliure en %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es necessita descarregar %sB/%sB d'arxius font.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es necessita descarregar %sB d'arxius font.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "Font descarregada %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "No s'ha pogut descarregar alguns arxius." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "L'ordre de desempaquetar «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comproveu si el paquet «dpkgdev» està instal·lat.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "L'ordre de construir «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "Ha fallat el procés fill" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "" "S'ha d'especificar un paquet per a verificar les dependències de construcció " "per a" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "No es pot obtenir informació sobre les dependències de construcció per a %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "%s no té dependències de construcció.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1179,7 +1241,7 @@ msgstr "" "La dependència %s en %s no es pot satisfer per que no es pot trobar el " "paquet %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1188,32 +1250,33 @@ msgstr "" "La dependència %s per a %s no es pot satisfer per que cap versió del paquet %" "s pot satisfer els requeriments de versions" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "No s'ha pogut satisfer la dependència %s per a %s: El paquet instal·lat %s " "és massa nou" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No s'han pogut satisfer les dependències de construcció per a %s" -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "No es poden processar les dependències de construcció" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "Mòduls suportats:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1228,6 +1291,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1394,190 +1458,190 @@ msgstr "" msgid "Merging available information" msgstr "S'està fusionant la informació disponible" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "No es poden crear els conductes" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "No es pot executar el gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Arxiu corromput" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "La suma de comprovació de tar ha fallat, arxiu corromput" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Capçalera TAR desconeguda del tipus %u, membre %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Signatura de l'arxiu no vàlida" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Error llegint la capçalera del membre de l'arxiu" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Capçalera del membre de l'arxiu no vàlida" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "L'arxiu és massa petit" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Ha fallat la lectura de les capçaleres de l'arxiu" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode crida a un node que encara està enllaçat" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "No s'ha trobat l'element diseminat!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "No s'ha pogut assignar la desviació" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "S'ha produït un error intern en AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "S'està intentant sobreescriure una desviació, %s -> %s i %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Afegit doble d'una desviació %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Fitxer de conf. duplicat %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "No s'ha pogut escriure el fitxer %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Ha fallat el tancament del fitxer %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "La ruta %s és massa llarga" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "S'està desempaquetant %s més d'una vegada" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "El directori %s està desviat" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "El paquet està intentant escriure en l'objectiu desviat %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "La ruta de desviació és massa llarga" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "El directori %s està sent reemplaçat per un no-directori" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "No s'ha trobat el node dins de la taula" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "La ruta és massa llarga" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "S'està sobreescrivint el corresponent paquet sense versió per a %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "El fitxer %s/%s sobreescriu al que està en el paquet %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "No es pot llegir %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "No es pot veure l'estat de %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "No es pot eliminar %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "No es pot crear %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "No s'ha pogut fer «stat» de %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "" "La info i els directoris temp necessiten estar en el mateix sistema de " "fitxers" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "S'està llegint la llista de paquets" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "No s'ha pogut canviar al directori d'admininstració %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "S'ha produït un error intern en obtenir un nom de paquet" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "S'està llegint el llistat de fitxers" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1588,77 +1652,77 @@ msgstr "" "aquest fitxer, creeu-lo buit i torneu a instal·lar immediatament la mateixa " "versió del paquet!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "No s'ha pogut llegir la llista del fitxer %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "S'ha produït un error en obtenir un node" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "S'ha produït un error en obrir el fitxer de desviació %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "El fitxer de desviació està corrupte" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "Línia no vàlida en el fitxer de desviació: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "S'ha produït un error intern en afegir una desviació" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Primer s'ha d'inicialitzar la memòria cau d'aquest paquet" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "No s'ha trobat una capçalera Package:, desplaçament %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Secció ConfFile dolenta en el fitxer d'estat. Desplaçament %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "S'ha produït un error en analitzar la suma MD5. Desplaçament %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Aquest no és un arxiu DEB vàlid, falta el membre «%s»" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "Aquest no és un arxiu DEB vàlid, falten els membres «%s» o «%s»" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "No s'ha pogut canviar a %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "S'ha produït un error intern, no s'ha trobat el membre" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "No s'ha trobat un fitxer de control vàlid" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "El fitxer de control no es pot analitzar" @@ -1693,11 +1757,12 @@ msgid "File not found" msgstr "Fitxer no trobat" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "L'estat ha fallat" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "No s'ha pogut establir el temps de modificació" @@ -1759,7 +1824,7 @@ msgstr "Temps de connexió finalitzat" msgid "Server closed the connection" msgstr "El servidor ha tancat la connexió" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "Error de lectura" @@ -1771,7 +1836,7 @@ msgstr "Una resposta ha desbordat la memòria temporal." msgid "Protocol corruption" msgstr "Protocol corrumput" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "Error d'escriptura" @@ -1826,7 +1891,7 @@ msgstr "S'ha esgotat el temps de connexió al sòcol de dades" msgid "Unable to accept connection" msgstr "No es pot acceptar la connexió" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema escollint el fitxer" @@ -1853,39 +1918,39 @@ msgstr "Consulta" msgid "Unable to invoke " msgstr "No es pot invocar" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "S'està connectant amb %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "No s'ha pogut crear un sòcol per a %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "No es pot iniciar la connexió amb %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "No s'ha pogut connectar amb %s:%s (%s), temps de connexió excedit" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "No s'ha pogut connectar amb %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "S'està connectant amb %s" @@ -1965,427 +2030,447 @@ msgstr "No s'ha pogut obrir un conducte per a %s" msgid "Read error from %s process" msgstr "Error llegint des del procés %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "S'estan esperant les capçaleres" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "S'ha aconseguit una sola línia de capçalera més de %u caràcters" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Línia de capçalera incorrecta" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "El servidor http ha enviat una capçalera de resposta no vàlida" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "El servidor http ha enviat una capçalera de Content-Length no vàlida" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "El servidor http ha enviat una capçalera de Content-Range no vàlida" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Aquest servidor http té el suport d'abast trencat" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Format de la data desconegut" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Ha fallat la selecció" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Connexió finalitzada" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Error escrivint en el fitxer d'eixida" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Error escrivint en el fitxer" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Error escrivint en el fitxer" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Error llegint, el servidor remot ha tancat la connexió" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Error llegint des del servidor" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Capçalera de dades no vàlida" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Ha fallat la connexió" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Error intern" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "No es pot transferir un fitxer buit a memòria" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "No s'ha pogut crear un mapa de memòria de %lu octets" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "No s'ha trobat la selecció %s" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Abreujament de tipus no reconegut: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "S'està obrint el fitxer de configuració %s" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "Línia %d massa llarga (màx %d)" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Error sintàctic %s:%u: No comença el camp amb un nom." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Error sintàctic %s:%u: Etiqueta malformada" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Error sintàctic %s:%u Text extra després del valor" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Error sintàctic %s:%u: Es permeten directrius només al nivell més alt" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Error sintàctic %s:%u: Hi ha masses fitxers include niats" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Error sintàctic %s:%u: Inclusió des d'aqui" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Error sintàctic %s:%u: Directriu no suportada '%s'" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Error sintàctic %s:%u: Text extra al final del fitxer" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Error!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... Fet" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "L'opció de la línia d'ordres '%c' [de %s] és desconeguda." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "No s'entén l'opció de la línia d'ordres %s" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "No és lògica l'opció de la línia d'ordres %s" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "L'opció de la línia d'ordres %s precisa un paràmetre." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Opció %s: Paràmetre de configuració ha de ser en la forma =" -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "L'opció %s precisa un paràmetre numèric, no '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "L'opció '%s' és massa llarga" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "El sentit %s no s'entén, proveu 'true' (vertader) o 'false' (fals)." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Operació no vàlida %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "No es pot obtenir informació del punt de muntatge %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "No es pot canviar a %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "No s'ha pogut fer «stat» del cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "No s'usen blocats per a llegir el fitxer de blocat de sols lectura %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "No es pot resoldre el fixter de blocat %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "No s'usen blocats per al fitxer de blocat %s de muntar nfs" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "No s'ha pogut blocar %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperava %s però no hi era" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Sub-procés %s ha rebut una violació de segment." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Sub-procés %s ha retornat un codi d'error (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Sub-procés %s ha eixit inesperadament" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "No s'ha pogut obrir el fitxer %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "llegits, falten %lu per llegir, però no queda res" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "escrits, falten %lu per escriure però no s'ha pogut" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "Ha hagut un problema en tancar el fitxer" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "Ha hagut un problema en desenllaçar el fitxer" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "Ha hagut un problema en sincronitzar el fitxer" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Memòria cau de paquets és buida" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "El fitxer de memòria cau de paquets està corromput" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "El fitxer de memòria cau de paquets és una versió incompatible" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Aquest APT no suporta el sistema de versions '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "La memòria cau de paquets fou creada per a una arquitectura diferent" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Depén" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Predepén" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Suggereix" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Recomana" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Entra en conflicte" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Reemplaça" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Fa obsolet" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "important" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "requerit" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "estàndard" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opcional" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "S'està construint l'arbre de dependències" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "Versions candidates" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "Dependències que genera" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "S'està fusionant la informació disponible" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "No s'ha pogut obrir %s" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "No s'ha pogut escriure el fitxer %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "No es pot analitzar el fitxer del paquet %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "No es pot analitzar el fitxer del paquet %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Línia %lu malformada en la llista de fonts %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Línia %lu malformada en la llista de fonts %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Línia %lu malformada en la llista de fonts %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Línia %lu malformada en la llista de fonts %s (analitzant dist)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "S'està obrint %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "La línia %u és massa llarga en la llista de fonts %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "La línia %u és malformada en la llista de fonts %s (tipus)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "La línia %u és malformada en la llista de fonts %s (id del proveïdor)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2397,19 +2482,19 @@ msgstr "" "dolenta, però si realment desitgeu fer-la, activeu l'opció APT::Force-" "LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "El tipus de fitxer índex '%s', no està suportat" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "El paquet %s necessita ser reinstal·lat, però no se li pot trobar un arxiu." -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2417,187 +2502,204 @@ msgstr "" "Error, pkgProblemResolver::Resolve ha generat pauses, això pot haver estat " "causat per paquets mantinguts." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "" "No es poden corregir els problemes, teniu paquets mantinguts que estan " "trencats." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Falta el directori de llistes %spartial." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Falta el directori d'arxiu %spartial." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "S'està obtenint el fitxer %li de %li (falten %s)" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "S'està obtenint el fitxer %li de %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "No s'ha pogut trobar el mètode de control %s." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "El mètode %s no s'ha iniciat correctament" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Inseriu el disc amb l'etiqueta: «%s» en la unitat «%s» i premeu Intro." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "El sistema d'empaquetament '%s' no està suportat" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat." -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "No es pot veure l'estat de %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Heu de posar algunes URI 'font' en el vostre sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "" "No s'han pogut analitzar o obrir les llistes de paquets o el fitxer d'estat." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Potser voldreu executar apt-get update per a corregir aquests problemes" -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Registre no vàlid en el fitxer de preferències, paquet sense capçalera" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "No s'ha entès el pin de tipus %s" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "No hi ha prioritat especificada per al pin (o és zero)" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "La memòria cau té un sistema de versions incompatible" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "S'ha produït un error durant el processament de %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "S'ha produït un error durant el processament de %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "S'ha produït un error durant el processament de %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "S'ha produït un error durant el processament de %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "S'ha produït un error durant el processament de %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "S'ha produït un error durant el processament de %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "S'ha produït un error durant el processament de %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "S'ha produït un error durant el processament de %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "S'ha produït un error durant el processament de %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Uau, heu excedit el nombre de paquets dels que aquest APT és capaç." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Uau, heu excedit el nombre de versions de les que aquest APT és capaç. " -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"Uau, heu excedit el nombre de versions de les que aquest APT és capaç. " + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Uau, heu excedit el nombre de dependències de les que aquest APT és capaç." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "S'ha produït un error durant el processament de %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" "S'ha produït un error durant el processament de %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "No s'ha trobat el paquet %s %s en processar les dependències del fitxer" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "No s'ha pogut llegir la llista de paquets font %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "S'estan recollint els fitxers que proveeixen" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "Error d'E/S en desar la memòria cau de la font" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Suma MD5 diferent" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2607,7 +2709,7 @@ msgstr "" "significar que haureu d'arreglar aquest paquet manualment (segons " "arquitectura)." -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2616,7 +2718,7 @@ msgstr "" "No s'ha trobat un fitxer pel paquet %s. Això podria significar que haureu " "d'arreglar aquest paquet manualment." -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2624,7 +2726,7 @@ msgstr "" "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp " "per al paquet %s." -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "La mida no concorda" @@ -2633,7 +2735,7 @@ msgstr "La mida no concorda" msgid "Vendor block %s contains no fingerprint" msgstr "El camp del proveïdor %s no té una empremta digital" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2642,52 +2744,54 @@ msgstr "" "S'està utilitzant el punt de muntatge de CD-ROM %s\n" "S'està muntant el CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "S'està identificant..." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "S'ha emmagatzemat l'etiqueta: %s\n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "S'està utilitzant el punt de muntatge de CD-ROM %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "S'està desmuntant el CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "S'està esperant al disc...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "S'està muntant el CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "S'està analitzant el disc per a fitxers d'índex...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "S'han trobat %i índex de paquets, %i índex de fonts i %i signatures\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "S'ha emmagatzemat l'etiqueta: %s\n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "Aquest no és un nom vàlid, torneu-ho a provar.\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2696,95 +2800,100 @@ msgstr "" "El disc es diu:\n" "«%s»\n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "S'estan copiant les llistes de paquets..." -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "S'està escrivint una nova llista de fonts\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Les entrades de la llista de fonts per a aquest disc són:\n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "S'esta desmuntant el CD-ROM..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "S'han escrit %i registres.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "S'han escrit %i registres, on falten %i fitxers.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "S'han escrit %i registres, on hi ha %i fitxers no coincidents\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "S'han escrit %i registres, on falten %i fitxers i hi ha %i fitxers no " "coincidents\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "S'està preparant el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "S'està desempaquetant %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "S'està preparant per a configurar el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "S'està configurant el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "S'ha instal·lat el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "S'està preparant per a l'eliminació del paquet %s" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "S'està eliminant el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "S'ha eliminat el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "S'està preparant per a eliminar completament el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "S'ha eliminat completament el paquet %s" +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "No s'ha pogut obrir el fitxer %s" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "La connexió s'ha tancat prematurament" diff --git a/po/cs.po b/po/cs.po index 41d41ce5b..0222c9fcd 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2006-10-04 18:53+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -15,145 +15,155 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Balík %s verze %s má nesplněné závislosti:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Nemohu najít balík %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "Celkem názvů balíků: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Normálních balíků: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Čistě virtuálních balíků: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Jednoduchých virtuálních balíků: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Smíšených virtuálních balíků: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Chybějících: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Celkem různých verzí: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Celkem různých verzí: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Celkem závislostí: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Celkem vztahů ver/soubor: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Celkem vztahů ver/soubor: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Celkem poskytnutých mapování: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Celkem globovaných řetězců: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Celkem místa závislých verzí: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Celkem jalového místa: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Celkem přiřazeného místa: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Soubor balíku %s je špatně synchronizovaný." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Musíte zadat právě jeden vzor" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Nebyly nalezeny žádné balíky" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Soubory balíku:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cache není synchronizovaná, nemohu se odkázat na soubor balíku" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Vypíchnuté balíky:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(nenalezeno)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Instalovaná verze: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(žádná)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Kandidát: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Vypíchnutý balík: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Tabulka verzí:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pro %s %s zkompilován na %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -299,7 +309,7 @@ msgstr "" " -c=? Načte tento konfigurační soubor\n" " -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "Nemohu zapsat do %s" @@ -308,31 +318,31 @@ msgstr "Nemohu zapsat do %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nemohu určit verzi programu debconf. Je debconf nainstalován?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Seznam rozšíření balíku je příliš dlouhý" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "Chyba zpracování adresáře %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Seznam zdrojových rozšíření je příliš dlouhý" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Chyba při zapisování hlavičky do souboru" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Chyba při zpracovávání obsahu %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -412,26 +422,26 @@ msgstr "" " -c=? Načte tento konfigurační soubor\n" " -o=? Nastaví libovolnou volbu" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Žádný výběr nevyhověl" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Některé soubory chybí v balíkovém souboru skupiny %s" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB je porušená, soubor přejmenován na %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB je stará, zkouším aktualizovat %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." @@ -439,106 +449,106 @@ msgstr "" "Formát databáze je neplatný. Pokud jste přešli ze starší verze apt, databázi " "prosím odstraňte a poté ji znovu vytvořte." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Nemohu otevřít DB soubor %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "Nemohu vyhodnotit %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Archiv nemá kontrolní záznam" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Nemohu získat kurzor" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Nemohu číst adresář %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Nemohu vyhodnotit %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "E: Chyby se týkají souboru " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "Chyba při zjišťování %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "Průchod stromem selhal" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "Nelze otevřít %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr "Odlinkování %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "Nemohu přečíst link %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "Nemohu odlinkovat %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Nezdařilo se slinkovat %s s %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Odlinkovací limit %sB dosažen.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Archiv nemá pole Package" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s nemá žádnou položku pro override\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " správce %s je %s, ne %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr " %s nemá žádnou zdrojovou položku pro override\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nemá ani žádnou binární položku pro override\n" @@ -552,165 +562,165 @@ msgstr "Vnitřní chyba, nemohu najít část %s" msgid "realloc - Failed to allocate memory" msgstr "realloc - Selhal pokus o přidělení paměti" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Nemohu otevřít %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Zkomolený soubor %s, řádek %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Zkomolený soubor %s, řádek %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Zkomolený soubor %s, řádek %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Nezdařilo se přečíst override soubor %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Neznámý kompresní algoritmus '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimovaný výstup %s potřebuje kompresní sadu" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Selhalo vytvoření meziprocesové roury k podprocesu" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "Selhalo vytvoření FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "Volání fork() se nezdařilo" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "Komprimovat potomka" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "Interní chyba, nezdařilo se vytvořit %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "Nemohu vytvořit podproces IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "Nezdařilo se spustit kompresor " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "dekompresor" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "V/V operace s podprocesem/souborem selhala" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "Chyba čtení při výpočtu MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "Problém s odlinkováním %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Selhalo přejmenování %s na %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba při kompilaci regulárního výrazu - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "Následující balíky mají nesplněné závislosti:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "ale %s je nainstalován" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "ale %s se bude instalovat" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "ale nedá se nainstalovat" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "ale je to virtuální balík" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "ale není nainstalovaný" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "ale nebude se instalovat" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " nebo" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "Následující NOVÉ balíky budou nainstalovány:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "Následující balíky budou ODSTRANĚNY:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "Následující balíky jsou podrženy v aktuální verzi:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "Následující balíky budou aktualizovány:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "Následující balíky budou DEGRADOVÁNY:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "Následující podržené balíky budou změněny:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (kvůli %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -718,144 +728,144 @@ msgstr "" "VAROVÁNÍ: Následující nezbytné balíky budou odstraněny.\n" "Pokud přesně nevíte, co děláte, NEDĚLEJTE to!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizováno, %lu nově instalováno, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalováno, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu degradováno, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu k odstranění a %lu neaktualizováno.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu instalováno nebo odstraněno pouze částečně.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Opravuji závislosti..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " selhalo." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Nemohu opravit závislosti" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Nemohu minimalizovat sadu pro aktualizaci" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Hotovo" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Pro opravení můžete spustit `apt-get -f install'." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Nesplněné závislosti. Zkuste použít -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "VAROVÁNÍ: Následující balíky nemohou být autentizovány!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Autentizační varování potlačeno.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Instalovat tyto balíky bez ověření [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Některé balíky nemohly být autentizovány" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Vyskytly se problémy a -y bylo použito bez --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Vnitřní chyba, InstallPackages byl zavolán s porušenými balíky!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Vnitřní chyba, třídění nedoběhlo do konce" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "Nemohu zamknout adresář pro stahování" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Nelze přečíst seznam zdrojů." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Jak podivné... velikosti nesouhlasí, ohlaste to na apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Potřebuji stáhnout %sB/%sB archivů.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Potřebuji stáhnout %sB archivů.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Po rozbalení bude na disku použito dalších %sB.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po rozbalení bude na disku uvolněno %sB.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nemohu určit volné místo v %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "V %s nemáte dostatek volného místa." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Udáno 'pouze triviální', ovšem toto není triviální operace." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Ano, udělej to tak, jak říkám!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -866,28 +876,28 @@ msgstr "" "Pro pokračování opište frázi '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "Přerušeno." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovat [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Selhalo stažení %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Některé soubory nemohly být staženy" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "Stahování dokončeno v režimu pouze stáhnout" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -895,47 +905,47 @@ msgstr "" "Nemohu stáhnout některé archivy. Možná spusťte apt-get update nebo zkuste --" "fix-missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing a výměna média nejsou momentálně podporovány" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Nemohu opravit chybějící balíky." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Přerušuji instalaci." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Pozn: Vybírám %s místo %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Přeskakuji %s, protože je již nainstalován.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Balík %s není nainstalován, nelze tedy odstranit\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Balík %s je virtuální balík poskytovaný:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr "[Instalovaný]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Měli byste explicitně vybrat jeden k instalaci." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -946,49 +956,49 @@ msgstr "" "To může znamenat že balík chybí, byl zastarán, nebo je dostupný\n" "pouze z jiného zdroje\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Nicméně následující balíky jej nahrazují:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Balík %s nemá kandidáta pro instalaci" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Reinstalace %s není možná, protože nelze stáhnout.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s je již nejnovější verze.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Vydání '%s' pro '%s' nebylo nalezeno" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Verze '%s' pro '%s' nebyla nalezena" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Vybraná verze %s (%s) pro %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Příkaz update neakceptuje žádné argumenty" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Nemohu uzamknout list adresář" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -996,25 +1006,65 @@ msgstr "" "Některé indexové soubory se nepodařilo stáhnout, jsou ignorovány, nebo jsou " "použity starší verze." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Následující NOVÉ balíky budou nainstalovány:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Vnitřní chyba, řešitel problémů pokazil věci" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnitřní chyba, AllUpgrade pokazil věci" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Nemohu najít balík %s" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "Nemohu najít balík %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Pozn: vybírám %s pro regulární výraz '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "ale %s se bude instalovat" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Pro opravení následujících můžete spustit `apt-get -f install':" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1022,7 +1072,7 @@ msgstr "" "Nesplněné závislosti. Zkuste spustit 'apt-get -f install' bez balíků (nebo " "navrhněte řešení)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1033,7 +1083,7 @@ msgstr "" "nemožnou situaci, nebo, pokud používáte nestabilní distribuci, že\n" "vyžadované balíky ještě nebyly vytvořeny nebo přesunuty z Příchozí fronty." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1043,128 +1093,139 @@ msgstr "" "balík není instalovatelný a měl byste o tom zaslat hlášení o chybě\n" "(bug report)." -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "Poškozené balíky" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "Následující extra balíky budou instalovány:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "Doporučované balíky:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "Propočítávám aktualizaci... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Selhalo" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "Vnitřní chyba, řešitel problémů pokazil věci" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "Nemohu najít zdrojový balík pro %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Přeskakuji dříve stažený soubor '%s'\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatek volného místa" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potřebuji stáhnout %sB zdrojových archivů.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "Stáhnout zdroj %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "Stažení některých archivů selhalo." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Příkaz pro rozbalení '%s' selhal.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Zkontrolujte, zda je nainstalován balíček 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "Příkaz pro sestavení '%s' selhal.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "Synovský proces selhal" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "" "Musíte zadat alespoň jeden balík, pro který budou kontrolovány závislosti " "pro sestavení" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nemohu získat závislosti pro sestavení %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žádné závislosti pro sestavení.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1173,31 +1234,32 @@ msgstr "" "%s závislost pro %s nemůže být splněna protože není k dispozici verze balíku " "%s, která odpovídá požadavku na verzi" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Selhalo splnění %s závislosti pro %s: Instalovaný balík %s je příliš nový" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Selhalo splnění %s závislosti pro %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti pro sestavení %s nemohly být splněny." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "Chyba při zpracování závislostí pro sestavení" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1212,6 +1274,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1371,188 +1434,188 @@ msgstr "chyby nad touto hláškou. Opravte je a poté znovu spusťte [I]nstalova msgid "Merging available information" msgstr "Slučuji dostupné informace" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Selhalo vytvoření roury" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Selhalo spuštění gzipu " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Porušený archiv" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Kontrolní součet taru selhal, archiv je poškozený" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Neznámá hlavička TARu typ %u, člen %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Neplatný podpis archivu" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Chyba při čtení záhlaví prvku archivu" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Neplatné záhlaví prvku archivu" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Archiv je příliš krátký" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Chyba při čtení hlaviček archivu" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "Pokus o uvolnění uzlu (DropNode) na stále propojeném uzlu" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Nemohu lokalizovat hashovací prvek!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Nemohu alokovat diverzi" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Vnitřní chyba při AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Pokus o přepsání diverze, %s -> %s a %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Dvojí přidání diverze %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Duplicitní konfigurační soubor %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Selhal zápis souboru %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Selhalo zavření souboru %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Cesta %s je příliš dlouhá" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Rozbaluji %s vícekrát" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Adresář %s je odkloněn" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Balík se pokouší zapisovat do diverzního cíle %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Diverzní cesta je příliš dlouhá" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Adresář %s bude nahrazen neadresářem" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Nemohu nalézt uzel v jeho hashovacím kbelíku" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Cesta je příliš dlouhá" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Přepsat vyhovující balík bez udání verze pro %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Soubor %s/%s přepisuje ten z balíku %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Nemohu číst %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Nemohu vyhodnotit %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Selhalo odstranění %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Nemohu vytvořit %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Selhalo vyhodnocení %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "Adresáře info a temp musí být na stejném souborovém systému" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "Čtu seznamy balíků" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Nepodařilo se změnit na admin adresář %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "Vnitřní chyba při získávání jména balíku" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Čtu výpis souborů" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1563,77 +1626,77 @@ msgstr "" "obnovit, vytvořte jej nový prázdný a ihned znovu nainstalujte tu samou verzi " "balíku!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Chyba při čtení souboru se seznamy %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Vnitřní chyba při získávání uzlu" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Selhalo otevření souboru s diverzemi %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Diverzní soubor je porušen" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "Neplatná řádka v diverzním souboru: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Vnitřní chyba při přidávání diverze" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Cache balíků se musí nejprve inicializovat" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Chyba při hledání Balíku: Hlavička, offset %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Špatná sekce ConfFile ve stavovém souboru na pozici %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Chyba při zpracování MD5. Offset %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Toto není platný DEB archiv, chybí část '%s'" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "Toto není platný DEB archiv, neobsahuje část '%s' ani '%s'" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "Nemohu přejít do %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "Vnitřní chyba, nemohu nalézt člen" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "Nelze najít platný kontrolní soubor" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "Nezpracovatelný kontrolní soubor" @@ -1668,11 +1731,12 @@ msgid "File not found" msgstr "Soubor nebyl nalezen" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Selhalo vyhodnocení" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Nelze nastavit čas modifikace" @@ -1734,7 +1798,7 @@ msgstr "Čas spojení vypršel" msgid "Server closed the connection" msgstr "Server uzavřel spojení" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "Chyba čtení" @@ -1746,7 +1810,7 @@ msgstr "Odpověď přeplnila buffer." msgid "Protocol corruption" msgstr "Porušení protokolu" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "Chyba zápisu" @@ -1800,7 +1864,7 @@ msgstr "Spojení datového socketu vypršelo" msgid "Unable to accept connection" msgstr "Nemohu přijmout spojení" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problém s hashováním souboru" @@ -1827,39 +1891,39 @@ msgstr "Dotaz" msgid "Unable to invoke " msgstr "Nemohu vyvolat " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Připojuji se k %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Nemohu vytvořit socket pro %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Nemohu navázat spojení na %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Nemohu se připojit k %s:%s (%s), čas spojení vypršel" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Nemohu se připojit k %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Připojuji se k %s" @@ -1934,428 +1998,448 @@ msgstr "Nemohu otevřít rouru pro %s" msgid "Read error from %s process" msgstr "Chyba čtení z procesu %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Čekám na hlavičky" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Získal jsem jednu řádku hlavičky přes %u znaků" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Chybná hlavička" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Http server poslal neplatnou hlavičku odpovědi" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Http server poslal neplatnou hlavičku Content-Length" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Http server poslal neplatnou hlavičku Content-Range" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Tento HTTP server má porouchanou podporu rozsahů" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Neznámý formát data" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Výběr selhal" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Čas spojení vypršel" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupního souboru" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Chyba čtení ze serveru" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Špatné datové záhlaví" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Spojení selhalo" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Vnitřní chyba" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "Nemohu provést mmap prázdného souboru" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Nešlo mmapovat %lu bajtů" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "Výběr %s nenalezen" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Nerozpoznaná zkratka typu: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "Otevírám konfigurační soubor %s" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "Řádek %d je příliš dlouhý (max %d)" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaktická chyba %s:%u: Blok nezačíná jménem." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaktická chyba %s:%u: Zkomolená značka" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaktická chyba %s:%u: Za hodnotou následuje zbytečné smetí" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Syntaktická chyba %s:%u: Direktivy je možné provádět pouze na nejvyšší úrovni" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaktická chyba %s:%u: Příliš mnoho vnořených propojení (include)" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaktická chyba %s:%u: Zahrnuto odtud" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktiva '%s'" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaktická chyba %s:%u: Na konci souboru je zbytečné smetí" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Chyba!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... Hotovo" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Parametr příkazové řádky '%c' [z %s] je neznámý" -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "Nerozumím parametru %s příkazové řádky" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Parametr příkazové řádky %s není pravdivostní hodnota" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Volba %s vyžaduje argument." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Parametr %s: Zadání konfigurační položky musí obsahovat =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Volba %s vyžaduje jako argument celé číslo (integer), ne '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Volba '%s' je příliš dlouhá" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Nechápu význam %s, zkuste true nebo false." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Neplatná operace %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Nelze vyhodnotit přípojný bod %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Nemohu přejít do %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "Nezdařilo se vyhodnotit cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Nepoužívám zamykání pro zámkový soubor %s, který je pouze pro čtení" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "Nešlo otevřít zámkový soubor %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nepoužívám zamykání pro zámkový soubor %s připojený přes nfs" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "Nemohu získat zámek %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Čekal jsem na %s, ale nebyl tam" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Podproces %s obdržel chybu segmentace." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s vrátil chybový kód (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s neočekávaně skončil" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "Nemohu otevřít soubor %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "čtení, stále mám k přečtení %lu, ale už nic nezbývá" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "zápis, stále mám %lu k zápisu, ale nejde to" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "Problém při zavírání souboru" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "Problém při odstraňování souboru" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "Problém při synchronizování souboru" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Cache balíků je prázdná" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Cache soubor balíků je poškozen" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Cache soubor balíků je v nekompatibilní verzi" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Tento APT nepodporuje systém pro správu verzí '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Cache balíků byla vytvořena pro jinou architekturu" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Závisí na" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Předzávisí na" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Navrhuje" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Doporučuje" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Koliduje s" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Nahrazuje" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Zastarává" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "důležitý" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "vyžadovaný" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standardní" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "volitelný" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "Vytvářím strom závislostí" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "Kandidátské verze" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "Generování závislostí" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "Slučuji dostupné informace" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Nelze otevřít %s" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Selhal zápis souboru %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Nelze zpracovat soubor %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nelze zpracovat soubor %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (Absolutní dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování dist)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Otevírám %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Řádek %u v seznamu zdrojů %s je příliš dlouhý." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ '%s' na řádce %u v seznamu zdrojů %s není známý" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Zkomolený řádek %u v seznamu zdrojů %s (id výrobce)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2366,18 +2450,18 @@ msgstr "" "smyčce v Conflicts/Pre-Depends. To je často špatné, ale pokud to skutečně " "chcete udělat, aktivujte možnost APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Indexový typ souboru '%s' není podporován" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Balík %s je potřeba přeinstalovat, ale nemohu pro něj nalézt archiv." -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2385,182 +2469,198 @@ msgstr "" "Chyba, pkgProblemResolver::Resolve vytváří poruchy, to může být způsobeno " "podrženými balíky." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "Nemohu opravit problémy, některé balíky držíte v porouchaném stavu." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Adresář seznamů %spartial chybí." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Archivní adresář %spartial chybí." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Stahuji soubor %li z %li (%s zbývá)" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "Stahuji soubor %li z %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Ovladač metody %s nemohl být nalezen." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Metoda %s nebyla spuštěna správně" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Vložte prosím disk nazvaný '%s' do mechaniky '%s' a stiskněte enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Balíčkovací systém '%s' není podporován" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "Nebylo možno určit vhodný typ balíčkovacího systému" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Nebylo možno vyhodnotit %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Do sources.list musíte zadat 'zdrojové' URI" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Seznamy balíků nebo stavový soubor nemohly být zpracovány nebo otevřeny." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "Pro nápravu těchto problémů můžete zkusit spustit apt-get update" -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Neplatný záznam v souboru preferencí, žádné záhlaví balíku" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Nerozumím vypíchnutí typu %s" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Pro vypíchnutí nebyla zadána žádná (nebo nulová) priorita" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Cache má nekompatibilní systém správy verzí" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Při zpracování %s se objevila chyba (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Při zpracování %s se objevila chyba (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Při zpracování %s se objevila chyba (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Při zpracování %s se objevila chyba (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Při zpracování %s se objevila chyba (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Při zpracování %s se objevila chyba (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Při zpracování %s se objevila chyba (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Při zpracování %s se objevila chyba (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Při zpracování %s se objevila chyba (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Wow, překročili jste počet jmen balíků, které tato APT zvládá zpracovat." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Wow, překročili jste počet verzí, které tato APT zvládá zpracovat." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Wow, překročili jste počet verzí, které tato APT zvládá zpracovat." + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Wow, překročili jste počet závislostí, které tato APT zvládá zpracovat." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Chyba při zpracování %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Při zpracování %s se objevila chyba (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Při zpracování závislostí nebyl nalezen balík %s %s" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "Collecting File poskytuje" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "Chyba IO při ukládání zdrojové cache" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "přejmenování selhalo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Neshoda MD5 součtů" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "K následujícím ID klíčů není dostupný veřejný klíč:\n" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2569,7 +2669,7 @@ msgstr "" "Nebyl jsem schopen nalézt soubor s balíkem %s. To by mohlo znamenat, že " "tento balík je třeba opravit ručně (kvůli chybějící architektuře)" -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2578,14 +2678,14 @@ msgstr "" "Nebyl jsem schopen nalézt soubor s balíkem %s. Asi budete muset tento balík " "opravit ručně." -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s." -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Velikosti nesouhlasí" @@ -2594,7 +2694,7 @@ msgstr "Velikosti nesouhlasí" msgid "Vendor block %s contains no fingerprint" msgstr "Blok výrobce %s neobsahuje otisk klíče" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2603,52 +2703,54 @@ msgstr "" "Používám přípojný bod %s\n" "Připojuji CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "Rozpoznávám... " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "Uložený název: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Používám přípojný bod %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "Odpojuji CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "Čekám na disk...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "Připojuji CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "Hledám na disku indexové soubory...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "Nalezl jsem indexy balíků (%i), indexy zdrojů (%i) a podpisy (%i)\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "Uložený název: %s \n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "Nejedná se o platné jméno, zkuste to znovu.\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2657,94 +2759,99 @@ msgstr "" "Tento disk se nazývá: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Kopíruji seznamy balíků..." -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Zapisuji nový seznam balíků\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Seznamy zdrojů na tomto disku jsou:\n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "Odpojuji CD-ROM..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Zapsal jsem %i záznamů.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Zapsal jsem %i záznamů s chybějícími soubory (%i).\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Zapsal jsem %i záznamů s nesouhlasícími soubory (%i).\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "Zapsal jsem %i záznamů s chybějícími (%i) a nesouhlasícími (%i) soubory.\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Připravuji %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Rozbaluji %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Připravuji nastavení %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Nastavuji %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "Nainstalován %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Připravuji odstranění %s" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Odstraňuji %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "Odstraněn %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Připravuji úplné odstranění %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "Kompletně odstraněn %s" +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Nemohu otevřít soubor %s" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Spojení bylo předčasně ukončeno" diff --git a/po/cy.po b/po/cy.po index a0db79e08..90916af31 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" @@ -14,162 +14,172 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Ni ellir lleoli'r pecyn %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 #, fuzzy msgid "Total package names : " msgstr "Cyfanswm Enwau Pecynnau : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 #, fuzzy msgid " Normal packages: " msgstr " Pecynnau Normal: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 #, fuzzy msgid " Pure virtual packages: " msgstr " Pecynnau Cwbl Rhithwir: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 #, fuzzy msgid " Single virtual packages: " msgstr " Pecynnau Rhithwir Sengl: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 #, fuzzy msgid " Mixed virtual packages: " msgstr " Pecynnau Rhithwir Cymysg: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Ar Goll: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 #, fuzzy msgid "Total distinct versions: " msgstr "Cyfanswm Fersiynau Gwahanol: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Cyfanswm Fersiynau Gwahanol: " + +#: cmdline/apt-cache.cc:297 #, fuzzy msgid "Total dependencies: " msgstr "Cyfanswm Dibyniaethau: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 #, fuzzy msgid "Total ver/file relations: " msgstr "Cyfanswm perthyniadau fersiwn/ffeil: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Cyfanswm perthyniadau fersiwn/ffeil: " + +#: cmdline/apt-cache.cc:304 #, fuzzy msgid "Total Provides mappings: " msgstr "Cyfanswm Mapiau Darpariath: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 #, fuzzy msgid "Total globbed strings: " msgstr "Cyfanswm Llinynau Glob: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 #, fuzzy msgid "Total dependency version space: " msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 #, fuzzy msgid "Total slack space: " msgstr "Cyfanswm gofod Slac: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 #, fuzzy msgid "Total space accounted for: " msgstr "Cyfanswm Gofod Cyfrifwyd: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Rhaid i chi ddarparu un patrwm yn union" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Canfuwyd dim pecyn" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 #, fuzzy msgid "Package files:" msgstr "Ffeiliau Pecynnau:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 #, fuzzy msgid "Pinned packages:" msgstr "Pecynnau wedi eu Pinio:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(heb ganfod)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Wedi Sefydlu: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(dim)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Ymgeisydd: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 #, fuzzy msgid " Package pin: " msgstr " Pin Pecyn: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 #, fuzzy msgid " Version table:" msgstr " Tabl Fersiynnau:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -324,7 +334,7 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad hwn\n" " -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "Ni ellir ysgrifennu i %s" @@ -333,32 +343,32 @@ msgstr "Ni ellir ysgrifennu i %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Mae'r rhestr estyniad pecyn yn rhy hir." -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, fuzzy, c-format msgid "Error processing directory %s" msgstr "Gwall wrth brosesu'r cyfeiriadur %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, fuzzy, c-format msgid "Error processing contents %s" msgstr "Gwall wrth Brosesu Cynnwys %s" # FIXME: full stops -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 #, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" @@ -440,132 +450,132 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad hwn\n" " -o=? Gosod opsiwn cyfluniad mympwyol" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Dim dewisiadau'n cyfateb" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn `%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Hen gronfa data, yn ceisio uwchraddio %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." msgstr "" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Ni ellir agor y ffeil DB2 %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "Methodd stat() o %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Does dim cofnod rheoli gan yr archif" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Ni ellir cael cyrchydd" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "Rh: Ni ellir gwneud stat() o %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "G: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "Rh: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "G: Mae gwallau yn cymhwyso i'r ffeil " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "Methwyd datrys %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "Methwyd cerdded y goeden" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "Methwyd agor %s" # FIXME -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr " DatGysylltu %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "Methwyd darllen y cyswllt %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "Methwyd datgysylltu %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Methwyd cysylltu %s at %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Tarwyd y terfyn cyswllt %sB.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Doedd dim maes pecyn gan yr archif" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Cynaliwr %s yw %s nid %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" @@ -579,169 +589,169 @@ msgstr "Gwall Mewnol, methwyd lleoli aelod %s" msgid "realloc - Failed to allocate memory" msgstr "realloc - Methwyd neilltuo cof" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Ni ellir agor %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Gwrthwneud camffurfiol %s llinell %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Gwrthwneud camffurfiol %s llinell %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Gwrthwneud camffurfiol %s llinell %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Methwydd darllen y ffeil dargyfeirio %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, fuzzy, c-format msgid "Unknown compression algorithm '%s'" msgstr "Dull Cywasgu Anhysbys '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Methwyd creu pibell cyfathrebu at isbroses" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "Methwyd creu FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "Methodd fork()" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 #, fuzzy msgid "Compress child" msgstr "Plentyn Cywasgu" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, fuzzy, c-format msgid "Internal error, failed to create %s" msgstr "Gwall Mewnol, Methwyd creu %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "Methwyd creu isbroses IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "Methwyd gweithredu cywasgydd " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "datgywasgydd" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "Methodd MA i isbroses/ffeil" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "Methwyd darllen wrth gyfrifo MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "Gwall wrth datgysylltu %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Methwyd ailenwi %s at %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "I" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "Gwall crynhoi patrwm - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "ond mae %s wedi ei sefydlu" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "ond ni ellir ei sefydlu" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "ond mae'n becyn rhithwir" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "ond nid yw wedi ei sefydlu" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "ond nid yw'n mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " neu" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "Caiff y pecynnau canlynol eu TYNNU:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 #, fuzzy msgid "The following packages have been kept back:" msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 #, fuzzy msgid "The following packages will be upgraded:" msgstr "Caiff y pecynnau canlynol eu uwchraddio" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 #, fuzzy msgid "The following packages will be DOWNGRADED:" msgstr "Caiff y pecynnau canlynol eu ISRADDIO" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (oherwydd %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -751,147 +761,147 @@ msgstr "" "NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n" "ei wneud!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu wedi ailsefydlu, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu wedi eu israddio, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Yn cywiro dibyniaethau..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " wedi methu." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Ni ellir cywiro dibyniaethau" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Ni ellir bychanu y set uwchraddio" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Wedi Gorffen" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 #, fuzzy msgid "WARNING: The following packages cannot be authenticated!" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 #, fuzzy msgid "Some packages could not be authenticated" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Mae problemau a defnyddwyd -y heb --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 #, fuzzy msgid "Packages need to be removed but remove is disabled." msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Methwyd darllen y rhestr ffynhonellau." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Mae angen cyrchu %sB o archifau.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Does dim digon o le rhydd gennych yn %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Ie, gwna fel rydw i'n dweud!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -902,29 +912,29 @@ msgstr "" "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n" " ?]" -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "Erthylu." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 #, fuzzy msgid "Do you want to continue [Y/n]? " msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Methodd rhai ffeiliau lawrlwytho" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -932,49 +942,49 @@ msgstr "" "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu " "geidio defnyddio --fix-missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Ni ellir cywiro pecynnau ar goll." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 #, fuzzy msgid "Aborting install." msgstr "Yn Erthylu'r Sefydliad." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Sefydliwyd]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Dylech ddewis un yn benodol i'w sefydlu." # FIXME: punctuation -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, fuzzy, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -986,49 +996,49 @@ msgstr "" "gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n" "ffeil sources.list.\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' " -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Ni ellir cloi'r cyfeiriadur rhestr" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1036,27 +1046,67 @@ msgstr "" "Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen " "rai eu defnyddio yn lle." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" + +#: cmdline/apt-get.cc:1498 #, fuzzy msgid "Internal error, AllUpgrade broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Methwyd canfod pecyn %s" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "ond mae %s yn mynd i gael ei sefydlu" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain:" # FIXME -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1065,7 +1115,7 @@ msgstr "" "pecyn (neu penodwch ddatrys)" # FIXME: needs commas -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1078,7 +1128,7 @@ msgstr "" "heb gael eu symud allan o Incoming." # FIXME: commas, wrapping -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1087,122 +1137,133 @@ msgstr "" "Gan y gofynnoch am weithred syml yn unig, mae'n debygol nad yw'r pecyn\n" "yn sefydladwy a dylid cyflwyno adroddiad nam yn erbyn y pecyn hwnnw." -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "Pecynnau wedi torri" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "Pecynnau a awgrymmir:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "Pecynnau a argymhellir:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 #, fuzzy msgid "Calculating upgrade... " msgstr "Yn Cyfrifo'r Uwchraddiad... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Methwyd" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "Wedi Gorffen" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, fuzzy, c-format msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "" "Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1211,7 +1272,7 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %" "s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1220,34 +1281,34 @@ msgstr "" "Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd " "ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy " "newydd" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 #, fuzzy msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1263,6 +1324,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1429,197 +1491,197 @@ msgstr "" msgid "Merging available information" msgstr "Yn cyfuno manylion Ar Gael" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Methwyd creu pibau" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Methwyd gweithredu gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Archif llygredig" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 #, fuzzy msgid "Tar checksum failed, archive corrupted" msgstr "Methodd swm gwirio Tar, archif llygredig" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Math pennawd TAR anhysbys %u, aelod %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Llofnod archif annilys" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Gwall wrth ddarllen pennawd aelod archif" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Pennawd aelod archif annilys" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Mae'r archif yn rhy fyr" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Methwyd darllen pennawdau'r archif" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Methyd lleoli yr elfen !" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Methwyd neilltuo dargyfeiriad" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 #, fuzzy msgid "Internal error in AddDiversion" msgstr "Gwall Mewnol yn AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s" # FIXME: "the" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Ffeil cyfluniad dyblyg %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, fuzzy, c-format msgid "Failed to write file %s" msgstr "Methwyd ysgrifennu ffeil %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Methwyd cau ffeil %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Mae'r llwybr %s yn rhy hir" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Yn dadbacio %s mwy nag unwaith" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Mae llwybr y dargyfeiriad yn rhy hir" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "" "Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Methwyd lleoli nôd yn ei fwced stwnsh" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Mae'r llwybr yn rhy hir" # FIXME: wtf? -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Ni ellir darllen %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Ni ellir gwneud stat() o %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Methwyd dileu %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Ni ellir creu %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Methwyd stat() ar %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 #, fuzzy msgid "Reading package lists" msgstr "Yn Darllen Rhestrau Pecynnau" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo" # FIXME -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 #, fuzzy msgid "Internal error getting a package name" msgstr "Gwall mewnol wrth gyrchu enw pecyn" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 #, fuzzy msgid "Reading file listing" msgstr "Yn Darllen Rhestr Ffeiliau" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1630,82 +1692,82 @@ msgstr "" "gwnewch e'n wag ac yna ail sefydlwch yr un ferswin o'r pecyn yn syth!" # FIXME -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Methwyd darllen y ffeil rhestr %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 #, fuzzy msgid "Internal error getting a node" msgstr "Gwall Mewnol wrth gael Nôd" # FIXME: literal -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Methwyd agor y ffeil dargyfeirio %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Mae'r ffeil dargyfeirio wed ei lygru" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "Llinell annilys yn y ffeil dargyfeirio: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 #, fuzzy msgid "Internal error adding a diversion" msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 #, fuzzy msgid "The pkg cache must be initialized first" msgstr "Rhaid i'r storfa pecynnau gael ei ymgychwyn yn gyntaf" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, fuzzy, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Methwyd canfod pennawd \"Package:\". Atred: %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Adrean \"ConfFile\" gwael yn y ffeil statws. Atred: %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Gwall wrth ramadegu MD5. Atred: %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, fuzzy, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "Methwyd newid i %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 #, fuzzy msgid "Internal error, could not locate member" msgstr "Gwall Methwyd, methwyd lleoli aelod" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "Methwyd lleoli ffeil rheoli dilys" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 #, fuzzy msgid "Unparsable control file" msgstr "Ffeil rheoli ni ellir ei ramadegu" @@ -1745,11 +1807,12 @@ msgid "File not found" msgstr "Ffeil heb ei ganfod" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Methwyd stat()" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Methwyd gosod amser newid" @@ -1812,7 +1875,7 @@ msgstr "Goramser cysylltu" msgid "Server closed the connection" msgstr "Caeodd y gweinydd y cysylltiad" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "Gwall darllen" @@ -1824,7 +1887,7 @@ msgstr "Gorlifodd ateb y byffer." msgid "Protocol corruption" msgstr "Llygr protocol" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "Gwall ysgrifennu" @@ -1880,7 +1943,7 @@ msgstr "Goramserodd cysylltiad y soced data" msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" @@ -1908,39 +1971,39 @@ msgstr "Ymholiad" msgid "Unable to invoke " msgstr "Methwyd gweithredu " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Yn cysylltu i %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Methwyd creu soced ar gyfer %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Methwyd cysylltu i %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Yn cysylltu i %s" @@ -2013,446 +2076,466 @@ msgstr "Methwyd agor pibell ar gyfer %s" msgid "Read error from %s process" msgstr "Gwall darllen o broses %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Yn aros am benawdau" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Derbynnwyd llinell pennaws sengl dros %u nod" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Llinell pennawd gwael" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 #, fuzzy msgid "The HTTP server sent an invalid reply header" msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys" -#: methods/http.cc:586 +#: methods/http.cc:585 #, fuzzy msgid "The HTTP server sent an invalid Content-Length header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys" -#: methods/http.cc:601 +#: methods/http.cc:600 #, fuzzy msgid "The HTTP server sent an invalid Content-Range header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys" -#: methods/http.cc:603 +#: methods/http.cc:602 #, fuzzy msgid "This HTTP server has broken range support" msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:875 +#: methods/http.cc:874 #, fuzzy msgid "Error reading from server. Remote end closed connection" msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" -#: methods/http.cc:1108 +#: methods/http.cc:1110 #, fuzzy msgid "Bad header data" msgstr "Data pennawd gwael" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Gwall mewnol" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "Ni ellir defnyddio mmap() ar ffeil gwag" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Methwyd gwneud mmap() efo %lu beit" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "Ni chanfuwyd y dewis %s" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Talgryniad math anhysbys: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "Linell %d yn rhy hir (uchaf %d)" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw." # FIXME -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, fuzzy, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Gwall!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... Wedi Gorffen" # FIXME -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Mae'r opsiwn %s yn mynnu ymresymiad." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Mae'r opsiwn %s yn mynnu ymresymiad cyfanrif, nid '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Opsiwn '%s' yn rhy hir" # FIXME: 'Sense'? -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Gweithred annilys %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Ni ellir newid i %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "Methwyd gwneud stat() o'r CD-ROM" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "Methwyd agor y ffeil clo %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Ddim yn cloi'r ffeil clo ar NFS %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "Methwyd cael y clo %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, fuzzy, c-format msgid "Waited for %s but it wasn't there" msgstr "Arhoswyd am %s ond nid oedd e yna" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Dychwelodd is-broses %s gôd gwall (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Gorffenodd is-broses %s yn annisgwyl" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "Methwyd agor ffeil %s" # FIXME -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "o hyd %lu i ddarllen ond dim ar ôl" # FIXME -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "o hyd %lu i ysgrifennu ond methwyd" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "Gwall wrth dadgysylltu'r ffeil" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "Gwall wrth gyfamseru'r ffeil" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Storfa pecyn gwag" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Mae'r ffeil storfa pecyn yn llygredig" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn" # FIXME: capitalisation? -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, fuzzy, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Dibynnu" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "CynDdibynnu" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Awgrymu" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Argymell" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Gwrthdaro" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Amnewid" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Darfodi" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "pwysig" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "angenrheidiol" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "safonnol" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opsiynnol" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "ychwanegol" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 #, fuzzy msgid "Building dependency tree" msgstr "Yn Aideladu Coeden Dibyniaeth" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 #, fuzzy msgid "Candidate versions" msgstr "Fersiynau Posib" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 #, fuzzy msgid "Dependency generation" msgstr "Cynhyrchaid Dibyniaeth" +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "Yn cyfuno manylion Ar Gael" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Methwyd agor %s" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Methwyd ysgrifennu ffeil %s" + # FIXME: number? -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ni ellir gramadegu ffeil becynnau %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, fuzzy, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Yn agor %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, fuzzy, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" # FIXME: %s may have an arbirrary length -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2463,12 +2546,12 @@ msgstr "" "oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir " "eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Ni chynhelir y math ffeil mynegai '%s'" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2476,7 +2559,7 @@ msgstr "" "Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar " "ei gyfer." -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2484,44 +2567,44 @@ msgstr "" "Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi " "ei achosi gan pecynnau wedi eu dal." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Mae'r cyfeiriadur archif %spartial ar goll." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, fuzzy, c-format msgid "Retrieving file %li of %li" msgstr "Yn Darllen Rhestr Ffeiliau" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Methwyd canfod y gyrrydd dull %s." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Ni gychwynodd y dull %s yn gywir" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, fuzzy, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -2529,145 +2612,161 @@ msgstr "" " '%s'\n" "yn y gyrriant '%s' a gwasgwch Enter\n" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Ni chynhelir y system pecynnu '%s'" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 #, fuzzy msgid "Unable to determine a suitable packaging system type" msgstr "Ni ellir canfod math system addas" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Ni ellir gwneud stat() o %s." # FIXME: ...file -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn." # FIXME: literal -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'" # FIXME: tense -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Methwyd daeall y math pin %s" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Mae can y storfa system fersiwn anghyfaddas" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, fuzzy, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:178 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, fuzzy, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Digwyddod gwall wrth brosesu %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei drin." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin." + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, fuzzy, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, fuzzy, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "Yn Casglu Darpariaethau Ffeil" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "methwyd ailenwi, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" # FIXME: case -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2676,7 +2775,7 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)" -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2685,14 +2784,14 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law." -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s." -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Camgyfatebiaeth maint" @@ -2701,155 +2800,162 @@ msgstr "Camgyfatebiaeth maint" msgid "Vendor block %s contains no fingerprint" msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 #, fuzzy msgid "Waiting for disc...\n" msgstr "Yn aros am benawdau" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:671 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, c-format msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 #, fuzzy msgid "Copying package lists..." msgstr "Yn Darllen Rhestrau Pecynnau" -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 #, fuzzy msgid "Writing new source list\n" msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "CD Anghywir" -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, fuzzy, c-format msgid "Preparing %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, fuzzy, c-format msgid "Configuring %s" msgstr "Yn cysylltu i %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, fuzzy, c-format msgid "Installed %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, fuzzy, c-format msgid "Removing %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, fuzzy, c-format msgid "Removed %s" msgstr "Argymell" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Methwyd dileu %s" +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Methwyd agor ffeil %s" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Caewyd y cysylltiad yn gynnar" @@ -2857,10 +2963,6 @@ msgstr "Caewyd y cysylltiad yn gynnar" #~ msgid "File date has changed %s" #~ msgstr "Dyddiad ffeil wedi newid %s" -#, fuzzy -#~ msgid "Could not patch file" -#~ msgstr "Methwyd agor ffeil %s" - #, fuzzy #~ msgid "Reading file list" #~ msgstr "Yn Darllen Rhestr Ffeiliau" diff --git a/po/da.po b/po/da.po index 2fb60f6e8..c12fa6862 100644 --- a/po/da.po +++ b/po/da.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-da\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2007-02-03 15:50+0100\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish\n" @@ -19,147 +19,157 @@ msgstr "" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Pakken %s version %s har en uopfyldt afhngighed:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Kunne ikke lokalisere pakken %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "Totale pakkenavne : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Normale pakker: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Rene virtuelle pakker: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Enkelte virtuelle pakker: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Blandede virtuelle pakker: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Manglende: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Totale forskellige versioner: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Totale forskellige versioner: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Totale afhngigheder: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Totale version/fil-relationer: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Totale version/fil-relationer: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Totale 'tilbyder'-markeringer: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Totalle sgemnsterstrenge: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Total afhngighedsversions-plads: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Total 'Slack'-plads: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Total plads, der kan gres rede for: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Pakkefilen %s er ude af trit." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Du skal angive njagtig t mnster" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Fandt ingen pakker" # Overskriften til apt-cache policy, # forkorter "Package" vk. CH -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Pakkefiler:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Mellemlageret er ude af trit, kan ikke krydsreferere en pakkefil" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "'Pinned' pakker:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(ikke fundet)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Installeret: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(ingen)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Kandidat: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Pakke-pin: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Versionstabel:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s oversat p %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -306,7 +316,7 @@ msgstr "" " -c=? Ls denne opstningsfil\n" " -o=? Angiv et opstningstilvalg. F.eks. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "Kunne ikke skrive til %s" @@ -315,31 +325,31 @@ msgstr "Kunne ikke skrive til %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kan ikke finde debconfs version. Er debconf installeret?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Pakkeudvidelseslisten er for lang" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "Fejl under behandling af mappen %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Kildeudvidelseslisten er for lang" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Fejl under skrivning af hovedet til indholdsfil" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Fejl under behandling af indhold %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -419,26 +429,26 @@ msgstr "" " -c=? Ls denne opstningsfil\n" " -o=? St en opstnings-indstilling" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Ingen valg passede" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Visse filer mangler i pakkefilgruppen '%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB var delagt, filen omdbt til %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB er gammel, forsger at opgradere %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." @@ -446,106 +456,106 @@ msgstr "" "Databaseformatet er ugyldigt. Hvis du har opgraderet fra en tidligere " "version af apt, s fjern og genskab databasen." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Kunne ikke bne DB-filen %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "Kunne ikke finde %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Arkivet har ingen kontrolindgang" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Kunne skaffe en markr" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: Kunne ikke lse mappen %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Kunne ikke finde finde %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "F: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "A: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "F: Fejlene vedrrer filen " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "Kunne ikke omstte navnet %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "Trvandring mislykkedes" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "Kunne ikke bne %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "Kunne ikke 'readlink' %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "Kunne ikke frigre %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Kunne ikke lnke %s til %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Nede DeLink-begrnsningen p %sB.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Arkivet havde intet package-felt" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen tvangs-post\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " pakkeansvarlig for %s er %s, ikke %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr " %s har ingen linje med tilsidesttelse af standard for kildefiler\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -560,165 +570,165 @@ msgstr "Intern fejl, kunne ikke finde elementet %s" msgid "realloc - Failed to allocate memory" msgstr "realloc - Kunne ikke allokere hukommelse" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Kunne ikke bne %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Ugyldig gennemtvangs %s-linje %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Ugyldig gennemtvangs %s-linje %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Ugyldig gennemtvangs %s-linje %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Kunne ikke lse gennemtvangsfilen %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Ukendt komprimeringsalgoritme '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimerede uddata %s krver et komprimeringsst" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Kunne ikke oprette IPC-viderefrsel til underproces" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "Kunne ikke oprette FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "Kunne ikke spalte" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "Komprimer barn" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "Intern fejl. Kunne ikke oprette %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "Kunne ikke oprette underproces IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "Kunne ikke udfre komprimeringsprogram" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "dekomprimerings-program" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "IO til underproces/fil mislykkedes" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "Kunne ikke lse under beregning af MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "Problem under aflnkning af %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Kunne ikke omdbe %s til %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "Fejl ved tolkning af regulrt udtryk - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "Flgende pakker har uopfyldte afhngigheder:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "men %s er installeret" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "men %s forventes installeret" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "men den kan ikke installeres" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "men det er en virtuel pakke" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "men den er ikke installeret" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "men den bliver ikke installeret" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " eller" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "Flgende NYE pakker vil blive installeret:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "Flgende pakker vil blive AFINSTALLERET:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "Flgende pakker er blevet holdt tilbage:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "Flgende pakker vil blive opgraderet:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "Flgende pakker vil blive NEDGRADERET:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "Flgende tilbageholdte pakker vil blive ndret:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (grundet %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -726,143 +736,143 @@ msgstr "" "ADVARSEL: Flgende essentielle pakker vil blive afinstalleret\n" "Dette br IKKE ske medmindre du er helt klar over, hvad du laver!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu opgraderes, %lu nyinstalleres, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu geninstalleres, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderes, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu afinstalleres og %lu opgraderes ikke.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ikke fuldstndigt installerede eller afinstallerede.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Retter afhngigheder..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " mislykkedes." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Kunne ikke rette afhngigheder" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Kunne ikke minimere opgraderingssttet" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Frdig" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Du kan muligvis rette dette ved at kre 'apt-get -f install'." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Uopfyldte afhngigheder. Prv med -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ADVARSEL: Flgende pakkers autensitet kunne ikke verificeres!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Autentifikationsadvarsel tilsidesat.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Installr disse pakker uden verifikation (y/N)? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Nogle pakker kunne ikke autentificeres" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Der er problemer og -y blev brugt uden --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Intern fejl. InstallPackages blev kaldt med delagte pakker!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Pakker skal afinstalleres, men Remove er deaktiveret." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Intern fejl. Sortering blev ikke fuldfrt" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "Kunne ikke lse nedhentningsmappen" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Listen med kilder kunne ikke lses." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "Mystisk.. Strrelserne passede ikke, skriv til apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%sB/%sB skal hentes fra arkiverne.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "%sB skal hentes fra arkiverne.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Efter udpakning vil %sB yderligere diskplads vre brugt.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunne ikke bestemme ledig plads i %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Du har ikke nok ledig plads i %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' angivet, men dette er ikke en triviel handling." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Ja, gr som jeg siger!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -873,28 +883,28 @@ msgstr "" "For at fortstte, skal du skrive '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "Afbryder." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortstte [J/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Kunne ikke hente %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Nedhentningen af filer mislykkedes" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -902,49 +912,49 @@ msgstr "" "Kunne ikke hente nogle af arkiverne. Prv evt. at kre 'apt-get update' " "eller prv med --fix-missing." -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing og medieskift understttes endnu ikke" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Kunne ikke rette manglende pakker." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Afbryder installationen." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Bemrk, at %s vlges fremfor %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Overspringer %s, da den allerede er installeret og opgradering er " "deaktiveret.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakken %s er ikke installeret, s den afinstalleres ikke\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakken %s er en virtuel pakke, der kan leveres af:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Installeret]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Du br eksplicit vlge en at installere." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -955,49 +965,49 @@ msgstr "" "anden pakke. Det kan betyde at denne pakke blevet overfldiggjort eller \n" "kun kan hentes fra andre kilder\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Dog kan flgende pakker erstatte den:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakken %s har ingen installationskandidat" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Geninstallering af %s er ikke mulig, da den ikke kan hentes.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s er i forvejen den nyeste version.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Udgaven '%s' for '%s' blev ikke fundet" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versionen '%s' for '%s' blev ikke fundet" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Valgte version %s (%s) af %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "'update'-kommandoen benytter ingen parametre" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Kunne ikke lse listemappen" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1005,25 +1015,65 @@ msgstr "" "Nogle indeksfiler kunne ikke hentes, de er blevet ignoreret eller de gamle " "bruges i stedet." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Flgende NYE pakker vil blive installeret:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "Flgende oplysninger kan hjlpe dig med at klare situationen:" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Intern fejl. Problemlseren delagde noget" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern fejl, AllUpgrade delagde noget" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Kunne ikke finde pakken %s" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "Kunne ikke finde pakken %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Bemrk, vlger %s som regulrt udtryk '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "men %s forventes installeret" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du kan muligvis rette det ved at kre 'apt-get -f install':" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1031,7 +1081,7 @@ msgstr "" "Uopfyldte afhngigheder. Prv 'apt-get -f install' uden pakker (eller angiv " "en lsning)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1042,7 +1092,7 @@ msgstr "" "en umulig situation eller bruger den ustabile distribution, hvor enkelte\n" "pakker endnu ikke er lavet eller gjort tilgngelige." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1051,119 +1101,130 @@ msgstr "" "Siden du kan bad om en enkelt handling, kan pakken hjst sandsynligt slet\n" "ikke installeres og du br indsende en fejlrapport for denne pakke." -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Flgende oplysninger kan hjlpe dig med at klare situationen:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "delagte pakker" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "Flgende yderligere pakker vil blive installeret:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "Foreslede pakker:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "Anbefalede pakker:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "Beregner opgraderingen... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Mislykkedes" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "Frdig" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "Intern fejl. Problemlseren delagde noget" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "Du skal angive mindst n pakke at hente kildeteksten til" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunne ikke finde kildetekstpakken for %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Overspringer allerede hentet fil '%s'\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plads i %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB skal hentes fra kildetekst-arkiverne.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "Henter kildetekst %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "Nogle arkiver kunne ikke hentes." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Udpakningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Tjek om pakken 'dpkg-dev' er installeret.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "Opbygningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "Barneprocessen fejlede" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "Skal angive mindst n pakke at tjekke opbygningsafhngigheder for" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunne ikke hente oplysninger om opbygningsafhngigheder for %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen opbygningsafhngigheder.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1171,7 +1232,7 @@ msgid "" msgstr "" "%s-afhngigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1180,32 +1241,33 @@ msgstr "" "%s-afhngigheden for %s kan ikke opfyldes, da ingen af de tilgngelige " "udgaver af pakken %s kan tilfredsstille versions-kravene" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Kunne ikke opfylde %s-afhngigheden for %s: Den installerede pakke %s er for " "ny" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Kunne ikke opfylde %s-afhngigheden for %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Opbygningsafhngigheden for %s kunne ikke opfyldes." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "Kunne ikke behandler opbygningsafhngighederne" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "Understttede moduler:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1220,6 +1282,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1385,188 +1448,188 @@ msgstr "" msgid "Merging available information" msgstr "Sammenfletter tilgngelighedsoplysninger" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Kunne ikke oprette viderefrsler" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Kunne ikke udfre gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "delagt arkiv" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-tjeksum fejlede, arkivet er delagt" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Ukendt TAR-hovedtype %u, element %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Ugyldig arkivsignatur" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Fejl under lsning af arkivelements hoved" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Ugyldigt arkivelementhoved" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Arkivet er for kort" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Kunne ikke lse arkivhovederne" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode kaldt med endnu forbundet knude" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Kunne ikke finde hash-element!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Kunne ikke allokere omrokering" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Intern fejl i AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Forsger at overskrive en omrokering, %s -> %s og %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Dobbelt tilfjelse af omrokering %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Dobbelt opstningsfil %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Kunne ikke skrive filen %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Kunne ikke lukke filen %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Stien %s er for lang" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Pakkede %s ud flere gange" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Mappen %s er omrokeret" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Pakken forsger at skrive til omrokeret ml %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Omrokeringsstien er for lang" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Mappen %s bliver erstattet af en ikke-mappe" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Kunne ikke finde knuden i sin hash-bucket" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Stien er for lang" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Overskriv pakkematch uden version for %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "File %s/%s overskriver filen i pakken %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Kunne ikke lse %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Kunne ikke finde %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Kunne ikke slette %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Kunne ikke oprette %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Kunne ikke finde %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "Mapperne info og temp skal ligge i samme filsystem" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "Indlser pakkelisterne" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Kunne ikke skifte til admin-mappen %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "Intern fejl under hentning af et pakkenavn" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Lser fillisten" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1577,78 +1640,78 @@ msgstr "" "kan du gre dem tom og med det samme geninstallere den samme version af " "pakken!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Kunne ikke lse listefilen %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Intern fejl under hentning af knude" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Kunne ikke bne omrokeringsfilen %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Pakkeomrokeringsfilen er delagt" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "Ugyldig linje i omrokeringsfilen: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Intern fejl under tilfjelse af omrokering" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "pkg-mellemlageret skal initialiseres frst" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Kunne ikke finde et Package:-hovede, forskydning %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Ugyldig ConfFile-afsnit i statusfilen. Forskydning %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Fejl under tolkning af MD5. Forskydning %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Dette er ikke et gyldigt DEB-arkiv, mangler '%s'-elementet" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "" "Dette er ikke et gyldigt DEB-arkiv, det har intet'%s- eller %s-elementet" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "Kunne ikke skifte til %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "Intern fejl, kunne ikke finde element" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "Kunne ikke finde en gyldig kontrolfil" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "Ikke-tolkbar kontrolfil" @@ -1683,11 +1746,12 @@ msgid "File not found" msgstr "Fil blev ikke fundet" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Kunne ikke finde" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Kunne ikke angive ndringstidspunkt" @@ -1749,7 +1813,7 @@ msgstr "Tidsudl msgid "Server closed the connection" msgstr "Serveren lukkede forbindelsen" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "Lsefejl" @@ -1761,7 +1825,7 @@ msgstr "Mellemlageret blev overfyldt af et svar." msgid "Protocol corruption" msgstr "Protokolfejl" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "Skrivefejl" @@ -1815,7 +1879,7 @@ msgstr "Tidsudl msgid "Unable to accept connection" msgstr "Kunne ikke acceptere forbindelse" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved \"hashing\" af fil" @@ -1842,39 +1906,39 @@ msgstr "Foresp msgid "Unable to invoke " msgstr "Kunne ikke udfre " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Forbinder til %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Kunne ikke oprette sokkel til %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Kan ikke oprette forbindelse til %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Kunne ikke forbinde til %s:%s (%s) grundet tidsudlb" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Kunne ikke forbinde til %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Forbinder til %s" @@ -1950,428 +2014,448 @@ msgstr "Kunne ikke msgid "Read error from %s process" msgstr "Lsefejl fra %s-process" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Afventer hoveder" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Fandt en enkelt linje i hovedet p over %u tegn" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Ugyldig linje i hovedet" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "http-serveren sendte et ugyldigt svarhovede" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "http-serveren sendte et ugyldigt Content-Length-hovede" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "http-serveren sendte et ugyldigt Content-Range-hovede" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "" "Denne http-servere har fejlagtig understttelse af intervaller ('ranges')" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Ukendt datoformat" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Valg mislykkedes" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Tidsudlb p forbindelsen" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Fejl ved skrivning af uddatafil" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Fejl ved skrivning til fil" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Fejl ved skrivning til filen" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Fejl ved lsning fra serveren. Den fjerne ende lukkede forbindelsen" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Fejl ved lsning fra server" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Ugyldige hoved-data" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Forbindelsen mislykkedes" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Intern fejl" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "Kan ikke udfre mmap for en tom fil" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Kunne ikke udfre mmap for %lu byte" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "Det valgte %s blev ikke fundet" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ukendt type-forkortelse: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "bner konfigurationsfilen %s" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "Linjen %d er for lang (m hjst vre %d)" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaksfejl %s:%u: Blokken starter uden navn." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaksfejl %s:%u: Forkert udformet mrke" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaksfejl %s:%u: Overskydende affald efter vrdien" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntaksfejl %s:%u: Direktiver kan kun angives i topniveauet" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaksfejl %s:%u: For mange sammenkdede inkluderinger" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaksfejl %s:%u: Inkluderet herfra" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaksfejl %s:%u: Ikke-understttet direktiv '%s'" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksfejl %s:%u: Overskydende affald i slutningen af filen" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Fejl!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... Frdig" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Kommandolinjetilvalget '%c' [fra %s] kendes ikke." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "Kommandolinjetilvalget %s blev ikke forstet" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Kommandolinjetilvalget %s er ikke boolsk" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Tilvalget %s krver et parameter." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Tilvalg %s: Opstningspostens specifikation skal have en =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Tilvalget %s krver et heltalligt parameter, ikke '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Tilvalget '%s' er for langt" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "%s blev ikke forstet, prv med 'true' eller 'false'." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Ugyldig handling %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Kunne ikke finde monteringspunktet %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Kunne ikke skifte til %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "Kunne ikke finde cdrommen" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Benytter ikke lsning for skrivebeskyttet lsefil %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "Kunne ikke bne lsefilen %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Benytter ikke lsning for nfs-monteret lsefil %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "Kunne ikke opn lsen %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ventede p %s, men den var der ikke" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprocessen %s modtog en segmenteringsfejl." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprocessen %s returnerede en fejlkode (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprocessen %s afsluttedes uventet" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "Kunne ikke bne filen %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "ls, mangler stadig at lse %lu men der er ikke flere" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "skriv, mangler stadig at skrive %lu men kunne ikke" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "Problem under lukning af fil" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "Fejl ved frigivelse af filen" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "Problem under synkronisering af fil" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Tomt pakke-mellemlager" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Pakke-mellemlagerets fil er delagt" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Pakke-mellemlagerets fil er af en inkompatibel version" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Denne APT understtter ikke versionssystemet '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Pakke-mellemlageret er lavet til en anden arkitektur" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Afhngigheder" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Pr-afhngigheder" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Foreslede" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Anbefalede" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Konflikter" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Erstatter" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Overfldiggr" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "vigtig" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "krvet" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "frivillig" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "ekstra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "Opbygger afhngighedstr" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "Kandidatversioner" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "Afhngighedsgenerering" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "Sammenfletter tilgngelighedsoplysninger" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Kunne ikke bne %s" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Kunne ikke skrive filen %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Kunne ikke tolke pakkefilen %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kunne ikke tolke pakkefilen %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Ugyldig linje %lu i kildelisten %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Ugyldig linje %lu i kildelisten %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Ugyldig linje %lu i kildelisten %s (absolut dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "bner %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Linjen %u er for lang i kildelisten %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Ugyldig linje %u i kildelisten %s (type)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen '%s' er ukendt p linje %u i kildelisten %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Ugyldig linje %u i kildelisten %s (producent-id)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2383,19 +2467,19 @@ msgstr "" "id, men hvis du virkelig vil gre det, kan du aktivere valget 'APT::Force-" "LoopBreak'." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Indeksfiler af typen '%s' understttes ikke" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Pakken %s skal geninstalleres, men jeg kan ikke finde noget arkiv med den." -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2403,183 +2487,199 @@ msgstr "" "Fejl, pkgProblemResolver::Resolve satte stopklodser op, det kan skyldes " "tilbageholdte pakker." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Kunne ikke korrigere problemerne, da du har tilbageholdt delagte pakker." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Listemappen %spartial mangler." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Arkivmappen %spartial mangler." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Henter fil %li ud af %li (%s tilbage)" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "Henter fil %li ud af %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Metodedriveren %s blev ikke fundet." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Metoden %s startede ikke korrekt" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Indst disken med navnet: '%s' i drevet '%s' og tryk retur." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet '%s' understttes ikke" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "Kunne ikke bestemme en passende pakkesystemtype" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Kunne ikke finde %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Du skal have nogle 'source'-URI'er i din sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "Pakkelisterne eller statusfilen kunne ikke tolkes eller bnes." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "Du kan muligvis rette problemet ved at kre 'apt-get update'" -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Ugyldig indgang i indstillingsfilen. Pakkehovedet mangler" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Kunne ikke forst pin-type %s" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Ingen prioritet (eller prioritet nul) angivet ved pin" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Mellemlageret benytter en inkompatibel versionsstyring" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Der skete en fejl under behandlingen af %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Der skete en fejl under behandlingen af %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Der skete en fejl under behandlingen af %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Der skete en fejl under behandlingen af %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Hold da op! Du nede over det antal pakkenavne, denne APT kan hndtere." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Hold da op! Du nede over det antal versioner, denne APT kan hndtere." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Hold da op! Du nede over det antal versioner, denne APT kan hndtere." + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Hold da op! Du nede over det antal afhngigheder, denne APT kan hndtere." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Der skete en fejl under behandlingen af %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Der skete en fejl under behandlingen af %s (CollectfileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Pakken %s %s blev ikke fundet under behandlingen af filafhngigheder" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kunne ikke finde kildepakkelisten %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "Samler filudbud" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "IO-fejl ved gemning af kilde-mellemlageret" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "omdbning mislykkedes, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "MD5Sum stemmer ikke" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Der er ingen tilgngelige offentlige ngler for flgende ngle-ID'er:\n" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2588,7 +2688,7 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "ndt til manuelt at reparere denne pakke. (grundet manglende arch)" -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2597,13 +2697,13 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "ndt til manuelt at reparere denne pakke." -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s." -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Strrelsen stemmer ikke" @@ -2612,7 +2712,7 @@ msgstr "St msgid "Vendor block %s contains no fingerprint" msgstr "Leverandrblok %s inderholder intet fingeraftryk" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2621,52 +2721,54 @@ msgstr "" "Bruger cdrom-monteringspunktet %s\n" "Monterer cdrom\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "Identificerer.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "Gemt mrkat: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Bruger cdrom-monteringspunktet %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "Afmonterer cdrom\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "Venter p disken...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "Monterer cdrom...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "Skanner disken for indeksfiler..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "Fandt %i pakkeindekser, %i kildeindekser og %i signaturer\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "Gemt mrkat: %s \n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "Det er ikke et gyldigt navn, prv igen.\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2675,100 +2777,101 @@ msgstr "" "Denne disk hedder: \n" " %s \n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Kopierer pakkelisterne..." -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Skriver ny kildeliste\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Denne disk har flgende kildeliste-indgange:\n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "Afmonterer cdrom..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Skrev %i poster.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Skrev %i poster med %i manglende filer.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Skrev %i poster med %i ikke-trufne filer\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Klargr %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Pakker %s ud" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Gr klar til at stte %s op" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Stter %s op" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "Installerede %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Gr klar til afinstallation af %s" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Fjerner %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "Fjernede %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Gr klar til at fjerne %s helt" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "Fjernede %s helt" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "Kunne ikke pfre filen %s en lap" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Forbindelsen lukkedes for hurtigt" -#~ msgid "Could not patch file" -#~ msgstr "Kunne ikke pfre filen %s en lap" - #~ msgid "File date has changed %s" #~ msgstr "Filens dato er ndret %s" diff --git a/po/de.po b/po/de.po index b5fdcb3e8..b4d22625e 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6.46.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2006-10-24 11:45+0200\n" "Last-Translator: Michael Piefel \n" "Language-Team: \n" @@ -15,145 +15,155 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Paket %s Version %s hat eine nichterfüllte Abhängigkeit:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Kann Paket %s nicht finden" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "Gesamtzahl an Paketnamen: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " davon gewöhnliche Pakete: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " davon rein virtuelle Pakete: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " davon einzelne virtuelle Pakete: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " davon gemischte virtuelle Pakete: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " davon fehlend: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Gesamtzahl an unterschiedlichen Versionen: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Gesamtzahl an unterschiedlichen Versionen: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Gesamtzahl an Abhängigkeiten: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Gesamtzahl an Version/Datei-Beziehungen: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Gesamtzahl an Version/Datei-Beziehungen: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Gesamtzahl an Bereitstellungen: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Gesamtzahl an Mustern: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Gesamtmenge an Abhängigkeits/Versionsspeicher: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Gesamtmenge an Slack: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Gesamtmenge an Speicher: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Paketdatei %s ist nicht synchronisiert." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Sie müssen genau ein Muster angeben" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Keine Pakete gefunden" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Paketdateien:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cache ist nicht sychron, kann eine Paketdatei nicht querverweisen" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Festgehaltene Pakete („Pin“):" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(nicht gefunden)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Installiert:" -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(keine)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Mögliche Pakete:" -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Paketstecknadel: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Versions-Tabelle:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s für %s %s kompiliert am %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -309,7 +319,7 @@ msgstr "" " -o=? Eine beliebige Konfigurationsoption setzen, z. B. -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "Kann nicht nach %s schreiben" @@ -318,31 +328,31 @@ msgstr "Kann nicht nach %s schreiben" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kann debconf-Version nicht ermitteln. Ist debconf installiert?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Paketerweiterungsliste ist zu lang" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "Fehler beim Verarbeiten von Verzeichnis %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Quellerweiterungsliste ist zu lang" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Fehler beim Schreiben des Headers in die Inhaltsdatei" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Fehler beim Verarbeiten der Inhaltsdatei %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -429,26 +439,26 @@ msgstr "" " -c=? diese Konfigurationsdatei lesen\n" " -o=? eine beliebige Konfigurations-Option setzen" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Keine Auswahl passt" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Einige Dateien fehlen in der Paketdateigruppe „%s“" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB wurde beschädigt, Datei umbenannt in %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB ist alt, versuche %s zu erneuern" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." @@ -456,106 +466,106 @@ msgstr "" "DB-Format ist ungültig. Wenn Sie ein Update von einer älteren Version von " "apt gemacht haben, entfernen Sie bitte die Datenbank und erstellen sie neu." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Kann DB-Datei %s nicht öffnen: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "Kann auf %s nicht zugreifen." -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Archiv hat keinen Steuerungs-Datensatz" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Kann keinen Cursor bekommen" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Kann Verzeichnis %s nicht lesen\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Kann nicht zugreifen auf %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "F: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "F: Fehler gehören zu Datei " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "Konnte %s nicht auflösen" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "Baumabschreiten fehlgeschlagen" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "Konnte %s nicht öffnen" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "Kann kein readlink auf %s durchführen" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "Konnte %s nicht entfernen (unlink)" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Konnte keine Verknüpfung von %s zu %s anlegen" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-Limit von %sB erreicht.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Archiv hatte kein Paket-Feld" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s hat keinen Eintrag in der Override-Liste.\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-Maintainer ist %s und nicht %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr " %s hat keinen Eintrag in der Source-Override-Liste.\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s hat keinen Eintrag in der Binary-Override-Liste.\n" @@ -569,165 +579,165 @@ msgstr "Interner Fehler, konnte Bestandteil %s nicht finden" msgid "realloc - Failed to allocate memory" msgstr "realloc – Speicheranforderung fehlgeschlagen" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Kann %s nicht öffnen" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Missgestaltetes Override %s Zeile %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Missgestaltetes Override %s Zeile %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Missgestaltetes Override %s Zeile %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Konnte die Override-Datei %s nicht lesen." -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Unbekannter Komprimierungsalgorithmus „%s“" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimierte Ausgabe %s braucht einen Komprimierungs-Satz" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Konnte Interprozesskommunikation mit Unterprozess nicht erzeugen" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "Konnte FILE* nicht erzeugen" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "Fork Fehlgeschlagen" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "Kindprozess Komprimieren" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "Interner Fehler, konnte %s nicht erzeugen" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "Konnte Interprozesskommunikation mit Unterprozess nicht erzeugen" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "Konnte Komprimierer nicht ausführen" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "Dekomprimierer" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "E/A zu Kindprozess/Datei fehlgeschlagen" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "Kann nicht lesen während der MD5-Berechnung" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "Problem beim Unlinking von %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Konnte %s nicht in %s umbenennen" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "Fehler beim Kompilieren eines regulären Ausdrucks – %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "Die folgenden Pakete haben nichterfüllte Abhängigkeiten:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "aber %s ist installiert" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "aber %s soll installiert werden" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "ist aber nicht installierbar" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "ist aber ein virtuelles Paket" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "ist aber nicht installiert" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "soll aber nicht installiert werden" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " oder " -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "Die folgenden NEUEN Pakete werden installiert:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "Die folgenden Pakete werden ENTFERNT:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "Die folgenden Pakete sind zurückgehalten worden:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "Die folgenden Pakete werden aktualisiert:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "Die folgenden Pakete werden DEAKTUALISIERT:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "Die folgenden gehaltenen Pakete werden verändert:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (wegen %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -735,145 +745,145 @@ msgstr "" "WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n" "Dies sollte NICHT geschehen, wenn Sie nicht genau wissen, was Sie tun!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualisiert, %lu neu installiert, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu erneut installiert, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu deaktualisiert, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nicht vollständig installiert oder entfernt.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Abhängigkeit werden korrigiert..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " fehlgeschlagen." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Kann Abhängigkeiten nicht korrigieren" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Kann die Menge zu erneuernder Pakete nicht minimieren" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Fertig" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Probieren Sie „apt-get -f install“, um diese zu korrigieren." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Nichterfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Authentifizierungswarnung überstimmt.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Diese Pakete ohne Überprüfung installieren [j/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Einige Pakete konnten nicht authentifiziert werden" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Interner Fehler, InstallPackages mit kaputten Pakete aufgerufen!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Interner Fehler, Anordnung beendete nicht" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "Kann kein Lock für das Downloadverzeichnis erhalten." -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Die Liste der Quellen konnte nicht gelesen werden." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Wie merkwürdig... Die Größen haben nicht übereingestimmt, schreiben Sie an " "apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Es müssen noch %sB von %sB Archiven geholt werden.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Es müssen %sB Archive geholt werden.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Nach dem Auspacken werden %sB Plattenplatz zusätzlich benutzt.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Nach dem Auspacken werden %sB Plattenplatz freigegeben worden sein.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "Konnte freien Platz in %s nicht bestimmen" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Sie haben nicht genug Platz in %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "„Nur triviale“ angegeben, aber das ist keine triviale Operation." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Ja, tu was ich sage!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -884,28 +894,28 @@ msgstr "" "Zum Fortfahren geben Sie bitte „%s“ ein.\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "Abbruch." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Möchten Sie fortfahren [J/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Konnte %s nicht holen %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Einige Dateien konnten nicht heruntergeladen werden" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "Herunterladen abgeschlossen und im Nur-Herunterladen-Modus" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -913,48 +923,48 @@ msgstr "" "Konnte einige Archive nicht herunterladen, vielleicht „apt-get update“ oder " "mit „--fix-missing“ probieren?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing und Wechselmedien werden zurzeit nicht unterstützt" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Konnte fehlende Pakete nicht korrigieren." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Installation abgebrochen." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Achtung, wähle %s an Stelle von %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Überspringe %s, es ist schon installiert und „upgrade“ ist nicht gesetzt.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Paket %s ist nicht installiert, wird also auch nicht entfernt\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paket %s ist ein virtuelles Paket, das bereitgestellt wird von:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Installiert]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Sie sollten eines explizit zum Installieren auswählen." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -965,51 +975,51 @@ msgstr "" "Paket referenziert. Das kann heißen, dass das Paket fehlt, dass es veraltet\n" "ist oder nur aus einer anderen Quelle verfügbar ist.\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Doch die folgenden Pakete ersetzen es:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Paket %s hat keinen Installationskandidaten" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Re-Installation von %s ist nicht möglich,\n" "es kann nicht heruntergeladen werden.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ist schon die neueste Version.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release „%s“ für „%s“ konnte nicht gefunden werden" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version „%s“ für „%s“ konnte nicht gefunden werden" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Gewählte Version %s (%s) für %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Der Befehl „update“ nimmt keine Argumente" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Kann kein Lock auf das Listenverzeichnis bekommen" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1017,25 +1027,66 @@ msgstr "" "Einige Indexdateien konnten nicht heruntergeladen werden, sie wurden " "ignoriert oder alte an ihrer Stelle benutzt." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Die folgenden NEUEN Pakete werden installiert:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "" +"Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Konnte Paket %s nicht finden" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "Konnte Paket %s nicht finden" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Achtung, wähle %s für reg. Ausdruck „%s“\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "aber %s soll installiert werden" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Probieren Sie „apt-get -f install“, um diese zu korrigieren:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1043,7 +1094,7 @@ msgstr "" "Nichterfüllte Abhängigkeiten. Versuchen Sie „apt-get -f install“ ohne " "jeglich Pakete (oder geben Sie eine Lösung an)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1055,7 +1106,7 @@ msgstr "" "Unstable-Distribution verwenden, einige erforderliche Pakete noch nicht\n" "kreiert oder aus Incoming herausbewegt wurden." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1066,124 +1117,134 @@ msgstr "" "dass das Paket einfach nicht installierbar ist und eine Fehlermeldung über\n" "dieses Paket erfolgen sollte." -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "" -"Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "Kaputte Pakete" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "Die folgenden zusätzlichen Pakete werden installiert:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "Vorgeschlagene Pakete:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "Empfohlene Pakete:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "Berechne Upgrade..." -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Fehlgeschlagen" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "Fertig" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "" "Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden " "sollen" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "Kann Quellpaket für %s nicht finden" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Überspringe schon heruntergeladene Datei „%s“\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "Sie haben nicht genug freien Platz in %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es müssen noch %sB/%sB der Quellarchive geholt werden.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es müssen %sB der Quellarchive geholt werden.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "Hole Quelle %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "Konnte einige Archive nicht holen." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Entpack-Befehl „%s“ fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Überprüfen Sie, ob das Paket „dpkg-dev“ installiert ist.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build-Befehl „%s“ fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "Kindprozess fehlgeschlagen" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "" "Es muss zumindest ein Paket angegeben werden, dessen Build-Dependencies\n" "überprüft werden sollen." -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Information zu Build-Dependencies für %s konnte nicht gefunden werden." -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "%s hat keine Build-Dependencies.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1192,7 +1253,7 @@ msgstr "" "%s Abhängigkeit für %s kann nicht befriedigt werden, da Paket %s nicht " "gefunden werden kann." -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1201,32 +1262,33 @@ msgstr "" "%s Abhängigkeit für %s kann nicht befriedigt werden, da keine verfügbare " "Version von Paket %s die Versionsanforderungen erfüllen kann." -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Konnte die %s-Abhängigkeit für %s nicht erfüllen: Installiertes Paket %s ist " "zu neu." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Konnte die %s-Abhängigkeit für %s nicht erfüllen: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Build-Abhängigkeiten für %s konnten nicht erfüllt werden." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "Verarbeitung der Build-Abhängigkeiten fehlgeschlagen" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "Unterstützte Module:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1241,6 +1303,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1411,189 +1474,189 @@ msgstr "" msgid "Merging available information" msgstr "Führe Information zur Verfügbarkeit zusammen" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Konnte Weiterleitungen nicht erzeugen" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Konnte gzip nicht ausführen" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Korrumpiertes Archiv" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-Prüfsumme fehlgeschlagen, Archiv korrumpiert" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Unbekannter Tar-Kopf-Typ %u, Bestandteil %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Ungültige Archiv-Signatur" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Fehler beim Lesen der Archivdateienkopfzeilen" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Ungültige Archivdateikopfzeile" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Archiv ist zu kurz" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Konnte Archivköpfe nicht lesen." -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "„DropNode“ auf noch verlinktem Knoten aufgerufen" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Konnte Hash-Element nicht finden!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Konnte Umleitung nicht reservieren" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Interner Fehler in „AddDiversion“" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Versuche, Umleitung zu überschreiben: %s -> %s und %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Doppelte Hinzufügung der Umleitung %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Doppelte Konfigurationsdatei %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Konnte Datei %s nicht schreiben" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Konnte Datei %s nicht schließen" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Der Pfad %s ist zu lang" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Packe %s mehr als einmal aus" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Das Verzeichnis %s ist umgeleitet" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Das Paket versucht, auf das Umleitungsziel %s/%s zu schreiben" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Der Umleitungspfad ist zu lang" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Das Verzeichnis %s wird durch ein Nicht-Verzeichnis ersetzt" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Konnte Knoten nicht in seinem Hash finden" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Der Pfad ist zu lang" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Überschreibe Paket-Treffer ohne Version für %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Datei %s/%s überschreibt die Datei in Paket %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Kann %s nicht lesen" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Kann nicht auf %s zugreifen" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Konnte %s nicht entfernen" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Konnte %s nicht erzeugen" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Kann nicht auf %sinfo zugreifen" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "" "Die „info“- und „temp“-Verzeichnisse müssen im selben Dateisystem liegen" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "Paketlisten werden gelesen" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Kann nicht ins Administrationsverzeichnis %sinfo wechseln" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "Interner Fehler beim Holen des Paket-Namens" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Paketlisten werden gelesen" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1604,77 +1667,77 @@ msgstr "" "wiederherstellen können, dann leeren Sie sie und installieren Sie sofort " "dieselbe Version des Paketes erneut!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Fehler beim Lesen der Listendatei „%sinfo/%s“." -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Interner Fehler beim Holen eines Knotens" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Fehler beim Öffnen der Umleitungsdatei %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Die Umleitungsdatei ist korrumpiert" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "Ungültige Zeile in der Umleitungsdatei: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Interner Fehler beim Hinzufügen einer Umleitung" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Der Paketcache muss erst initialisiert werden" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Konnte keine „Package:“-Kopfzeile finden, Abstand %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Fehlerhafter „ConfFile“-Abschnitt in der Statusdatei, Abstand %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Fehler beim Parsen der MD5-Summe. Abstand %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Dies ist kein gültiges DEB-Archiv, da es „%s“ nicht enthält" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "Dies ist kein gültiges DEB-Archiv, da es weder „%s“ noch „%s“ enthält" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "Konnte nicht in %s wechseln" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "Interner Fehler, konnte Bestandteil nicht finden" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "Konnte gültige Kontroll-Datei nicht finden" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "Unparsbare Kontroll-Datei" @@ -1712,11 +1775,12 @@ msgstr "Datei nicht gefunden" # looks like someone hardcoded English grammar #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Kann nicht zugreifen." #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Kann Änderungszeitpunkt nicht setzen" @@ -1778,7 +1842,7 @@ msgstr "Zeitüberschreitung der Verbindung" msgid "Server closed the connection" msgstr "Der Server hat die Verbindung geschlossen" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "Lesefehler" @@ -1790,7 +1854,7 @@ msgstr "Eine Antwort hat einen Puffer zum Überlaufen gebracht." msgid "Protocol corruption" msgstr "Protokollkorrumption" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "Schreibfehler" @@ -1845,7 +1909,7 @@ msgstr "Datenverbindungsaufbau erlitt Zeitüberschreitung" msgid "Unable to accept connection" msgstr "Kann Verbindung nicht annehmen" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf" @@ -1872,40 +1936,40 @@ msgstr "Abfrage" msgid "Unable to invoke " msgstr "Kann nicht aufrufen: " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Verbinde mit %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Kann keinen Verbindungsendpunkt für %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Kann keine Verbindung mit %s:%s aufbauen (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" "Konnte wegen Zeitüberschreitung keine Verbindung mit %s:%s aufbauen (%s)" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Konnte nicht mit %s:%s verbinden (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Verbinde mit %s" @@ -1984,431 +2048,451 @@ msgstr "Konnte keine Pipe für %s öffnen" msgid "Read error from %s process" msgstr "Lesefehler von Prozess %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Warte auf Kopfzeilen (header)" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Erhielt einzelne Kopfzeile aus %u Zeichen" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Schlechte Kopfzeile" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Der http-Server sandte eine ungültige Antwort-Kopfzeile" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Der http-Server sandte eine ungültige „Content-Length“-Kopfzeile" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Der http-Server sandte eine ungültige „Content-Range“-Kopfzeile" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Der http-Server unterstützt Dateiteilübertragung nur fehlerhaft." -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Unbekanntes Datumsformat" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Auswahl fehlgeschlagen" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Verbindung erlitt Zeitüberschreitung" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Fehler beim Schreiben einer Ausgabedatei" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Fehler beim Schreiben einer Datei" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Fehler beim Schreiben der Datei" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fehler beim Lesen vom Server: Das entfernte Ende hat die Verbindung " "geschlossen" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Fehler beim Lesen vom Server" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Fehlerhafte Kopfzeilendaten" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Verbindung fehlgeschlagen" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Interner Fehler" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "Kann eine leere Datei nicht mit mmap abbilden" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Konnte kein mmap von %lu Bytes durchführen" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "Auswahl %s nicht gefunden" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Nicht erkannte Typabkürzung: „%c“" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "Öffne Konfigurationsdatei %s" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "Zeile %d zu lang (maximal %d)" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaxfehler %s:%u: Block fängt ohne Namen an." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaxfehler %s:%u: Missgestaltetes Tag" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaxfehler %s:%u: Zusätzlicher Müll nach Wert" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Syntaxfehler %s:%u: Direktiven können nur auf oberster Ebene benutzt werden" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaxfehler %s:%u: Zu viele verschachtelte Einbindungen (include)" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaxfehler %s:%u: Einbindung von here" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaxfehler %s:%u: Nicht unterstützte Direktive „%s“" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaxfehler %s:%u: Zusätzlicher Müll am Dateiende" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Fehler!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... Fertig" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Kommandozeilenoption „%c“ [aus %s] ist nicht bekannt." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "Kommandozeilenoption %s wird nicht verstanden" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Kommandozeilenoption %s ist nicht Boole'sch" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Option %s erfordert ein Argument." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Option %s: Konfigurationswertspezifikation muss einen = haben." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Option %s erfordert ein Ganzzahl-Argument, nicht „%s“" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Option „%s“ ist zu lang" # Check for boolean; -1 is unspecified, 0 is yes 1 is no -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Der Sinn von „%s“ ist nicht klar, versuchen Sie „true“ oder „false“." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Ungültige Operation %s." -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Kann auf den Einhängepunkt %s nicht zugreifen." -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Kann nicht nach %s wechseln" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "Konnte auf CD-ROM nicht zugreifen" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Benutze kein Locking für Nur-Lese-Lockdatei %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "Konnte Lockdatei %s nicht öffnen" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Benutze kein Locking für NFS-eingebundene Lockdatei %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "Konnte Lock %s nicht bekommen" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Auf %s gewartet, aber es war nicht da" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Unterprozess %s hat einen Speicherzugriffsfehler erhalten." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Unterprozess %s ist mit einem Fehlercode zurückgekehrt (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Unterprozess %s hat sich unerwartet beendet" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "Konnte Datei %s nicht öffnen" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "Lesen, habe noch %lu zu lesen aber nichts mehr da" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "Schreiben, habe noch %lu zu schreiben, konnte aber nicht" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "Beim Schließen der Datei trat ein Problem auf" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "Beim Unlinking der Datei trat ein Problem auf" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "Beim Synchronisieren einer Datei trat ein Problem auf" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Leerer Paketcache" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Die Paketcachedatei ist korrumpiert" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Die Paketcachedatei liegt in einer inkompatiblen Version vor" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Dieses APT unterstützt das Versionssystem „%s“ nicht" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Der Paketcache wurde für eine andere Architektur aufgebaut" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Hängt ab" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Hängt ab (vorher)" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Schlägt vor" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Empfiehlt" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Kollidiert" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Ersetzt" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Veraltet" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "wichtig" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "erforderlich" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "optional" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "Abhängigkeitsbaum wird aufgebaut" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "Mögliche Versionen" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "Abhängigkeits-Generierung" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "Führe Information zur Verfügbarkeit zusammen" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Konnte %s nicht öffnen" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Konnte Datei %s nicht schreiben" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Kann Paketdatei %s nicht parsen (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kann Paketdatei %s nicht parsen (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Missgestaltete Zeile %lu in Quellliste %s („URI“)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Missgestaltete Zeile %lu in Quellliste %s („dist“)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Missgestaltete Zeile %lu in Quellliste %s („URI parse“)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Missgestaltete Zeile %lu in Quellliste %s („absolute dist“)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Missgestaltete Zeile %lu in Quellliste %s („dist parse“)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s wird geöffnet" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Zeile %u zu lang in der Quellliste %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Missgestaltete Zeile %u in Quellliste %s („type“)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ „%s“ ist unbekannt in Zeile %u der Quellliste %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Missgestaltete Zeile %u in Quellliste %s („vendor id“)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2420,12 +2504,12 @@ msgstr "" "ist oft schlimm, aber wenn Sie es wirklich tun wollen, aktivieren Sie bitte " "die Option APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Indexdateityp „%s“ wird nicht unterstützt" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2433,7 +2517,7 @@ msgstr "" "Das Paket %s muss reinstalliert werden, ich kann aber kein Archiv dafür " "finden." -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2441,192 +2525,210 @@ msgstr "" "Fehler: pkgProblemResolver::Resolve hat Unterbrechungen hervorgerufen, dies " "könnte durch gehaltene Pakete hervorgerufen worden sein." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "Kann Probleme nicht korrigieren, Sie haben gehaltene kaputte Pakete." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Listenverzeichnis %spartial fehlt." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Archivverzeichnis %spartial fehlt." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Hole Datei %li von %li (noch %s)" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "Hole Datei %li von %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Der Treiber für Methode %s konnte nicht gefunden werden." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Methode %s hat nicht korrekt gestartet" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Bitte legen Sie das Medium mit dem Namen „%s“ in Laufwerk „%s“ und drücken " "Sie die Eingabetaste." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketierungssystem „%s“ wird nicht unterstützt" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "Kann keinen passenden Paketierungssystem-Typ bestimmen" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Kann nicht auf %s zugreifen." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "" "Sie müssen einige „source“-URIs für Quellen in die sources.list-Datei " "schreiben." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Die Paketliste oder die Statusdatei konnte nicht geparst oder geöffnet " "werden." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "Probieren Sie „apt-get update“, um diese Probleme zu korrigieren." -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Ungültiger Eintrag in Einstellungs-Datei, kein „Package“-Header" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Konnte Stecknadeltyp („pin type“) %s nicht verstehen" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Keine Priorität (oder Null) für Pin angegeben" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Dieser Paketcache wurde für ein inkompatibles Versionssystem aufgebaut" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Toll, Sie haben die Anzahl an Paketen überschritten, die APT handhaben kann." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Toll, Sie haben die Anzahl an Versionen überschritten, die APT handhaben " "kann." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"Toll, Sie haben die Anzahl an Versionen überschritten, die APT handhaben " +"kann." + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Toll, Sie haben die Anzahl an Abhängigkeiten überschritten, die APT " "handhaben kann." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Fehler trat beim Bearbeiten von %s auf (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Fehler trat beim Bearbeiten von %s auf (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Paket %s %s wurde nicht gefunden beim Verarbeiten der Dateiabhängigkeiten" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kann nicht auf die Liste %s der Quellpakete zugreifen." -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "Sammle Datei-Empfehlungen ein" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "E/A-Fehler beim Sichern des Quellcaches" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "MD5-Summe stimmt nicht" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Es gibt keine öffentlichen Schlüssel für die folgenden Schlüssel-IDs:\n" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2635,7 +2737,7 @@ msgstr "" "Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie " "dieses Paket von Hand korrigieren müssen (aufgrund fehlender Architektur)." -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2644,14 +2746,14 @@ msgstr "" "Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie " "dieses Paket von Hand korrigieren müssen." -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Die Paketindexdateien sind korrumpiert: Kein Filename:-Feld für Paket %s." -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Größe stimmt nicht" @@ -2660,7 +2762,7 @@ msgstr "Größe stimmt nicht" msgid "Vendor block %s contains no fingerprint" msgstr "Herstellerblock %s enthält keinen Fingerabdruck" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2669,52 +2771,54 @@ msgstr "" "Benutze CD-ROM-Einhängpunkt %s\n" "Hänge CD-ROM ein\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "Identifiziere... " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "Gespeicherte Kennzeichnung: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Benutze CD-ROM-Einhängpunkt %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "Hänge CD-ROM aus\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "Warte auf CD...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "Hänge CD-ROM ein...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "Suche auf CD nach Index-Dateien...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "Fand %i Paketindexe, %i Quellenindexe und %i Signaturen\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "Gespeicherte Kennzeichnung: %s \n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "Dies ist kein gültiger Name, versuchen Sie es erneut.\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2723,95 +2827,100 @@ msgstr "" "Diese CD heißt: \n" "„%s“\n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Kopiere Paketlisten..." -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Schreibe neue Quellliste\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Quelllisteneinträge für diese CD sind:\n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "Hänge CD-ROM aus..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Es wurden %i Datensätze geschrieben.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Es wurden %i Datensätze mit %i fehlenden Dateien geschrieben.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Es wurden %i Datensätze mit %i nicht passenden Dateien geschrieben.\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "Es wurden %i Datensätze mit %i fehlenden und %i nicht passenden Dateien " "geschrieben.\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "%s wird vorbereitet" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "%s wird entpackt" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Konfiguration von %s wird vorbereitet" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Konfiguriere %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "%s installiert" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Entfernen von %s wird vorbereitet" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "%s wird entfernt" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "%s entfernt" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Komplettes Entfernen von %s wird vorbereitet" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "%s komplett entfernt" +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Konnte Datei %s nicht öffnen" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Verbindung zu früh beendet" diff --git a/po/el.po b/po/el.po index 61cb583c6..74b99867e 100644 --- a/po/el.po +++ b/po/el.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_el_new\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2006-01-18 15:16+0200\n" "Last-Translator: Konstantinos Margaritis \n" "Language-Team: Greek \n" @@ -29,146 +29,156 @@ msgstr "" "X-Generator: KBabel 1.10.2\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Το πακέτο %s με έκδοση %s έχει ανεπίλυτες εξαρτήσεις:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Αδυναμία εντοπισμού του πακέτου %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "Συνολικά Ονόματα Πακέτων : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Κανονικά Πακέτα: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Πλήρως Εικονικά Πακέτα: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Μονά Εικονικά Πακέτα: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Μικτά Εικονικά Πακέτα: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr "Αγνοούμενα: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Σύνολο Διαφορετικών Εκδόσεων: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Σύνολο Διαφορετικών Εκδόσεων: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Σύνολο Εξαρτήσεων: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Σύνολο σχέσεων Εκδ/Αρχείων: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Σύνολο σχέσεων Εκδ/Αρχείων: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Σύνολο Αντιστοιχίσεων Παροχών: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Σύνολο Κοινών Στοιχειοσειρών : " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Συνολικός χώρος Εξαρτήσεων Εκδόσεων: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Σύνολο χώρου ασφαλείας: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Συνολικός Καταμετρημένος Χώρος: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Το αρχείο πακέτου %s δεν είναι ενημερωμένο." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Πρέπει να δώσετε ακριβώς μία παράσταση" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Δε βρέθηκαν πακέτα" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Αρχεία Πακέτου:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Η cache δεν είναι ενημερωμένη, αδυναμία παραπομπής σε ένα αρχείο πακέτου" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Καθηλωμένα Πακέτα:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(δε βρέθηκαν)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Εγκατεστημένα: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(κανένα)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Υποψήφιο: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Καθήλωση Πακέτου: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Πίνακας Έκδοσης:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s για %s %s είναι μεταγλωττισμένο σε %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -318,7 +328,7 @@ msgstr "" " -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n" " -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "Αδύνατη η εγγραφή στο %s" @@ -327,31 +337,31 @@ msgstr "Αδύνατη η εγγραφή στο %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Δεν βρέθηκε η έκδοση του debconf. Είναι το debconf εγκατεστημένο;" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Ο κατάλογος επεκτάσεων του πακέτου είναι υπερβολικά μακρύς" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "Σφάλμα επεξεργασίας του καταλόγου %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Ο κατάλογος επεκτάσεων των πηγών είναι υπερβολικά μακρύς" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Σφάλμα εγγραφής κεφαλίδων στο αρχείο περιεχομένων" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Σφάλμα επεξεργασίας περιεχομένων του %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -435,131 +445,131 @@ msgstr "" " -c=? Χρήση αυτού του αρχείου ρυθμίσεων\n" " -o=? Ορισμός αυθαίρετης επιλογής ρύθμισης" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Δεν ταιριαξε καμία επιλογή" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Λείπουν μερικά αρχεία από την ομάδα πακέτων '%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Η βάση είναι κατεστραμμένη, το αρχείο μετονομάστηκε σε %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Η βάση δεν είναι ενημερωμένη, γίνεται προσπάθεια να αναβαθμιστεί το %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." msgstr "" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Το άνοιγμά του αρχείου της βάσης %s: %s απέτυχε" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "Αποτυχία εύρεσης της κατάστασης του %s." -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Η αρχειοθήκη δεν περιέχει πεδίο ελέγχου" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Αδύνατη η πρόσβαση σε δείκτη" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Αδύνατη η ανάγνωση του καταλόγου %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Αδύνατη η εύρεση της κατάστασης του %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "E: Σφάλματα στο αρχείο" -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "Αδύνατη η εύρεση του %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "Αποτυχία ανεύρεσης" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "Αποτυχία ανοίγματος του %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr "Αποσύνδεση %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "Αποτυχία ανάγνωσης του %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "Αποτυχία αποσύνδεσης του %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr " Αποτυχία σύνδεσης του %s με το %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Αποσύνδεση ορίου του %sB hit.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Η αρχειοθήκη δεν περιέχει πεδίο πακέτων" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s δεν περιέχει εγγραφή παράκαμψης\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s συντηρητής είναι ο %s όχι ο %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " %s δεν περιέχει εγγραφή παράκαμψης\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " %s δεν περιέχει εγγραφή παράκαμψης\n" @@ -573,165 +583,165 @@ msgstr "Εσωτερικό Σφάλμα, αδυναμία εντοπισμού msgid "realloc - Failed to allocate memory" msgstr "realoc - Αδυναμία εκχώρησης μνήμης" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Αδύνατο το άνοιγμα του %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Αποτυχία ανάγνωσης του αρχείου παράκαμψης %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Άγνωστος Αλγόριθμος Συμπίεσης '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Η συμπιεσμένη έξοδος του %s χρειάζεται καθορισμό συμπίεσης" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Αποτυχία κατά τη δημιουργία διασωλήνωσης IPC στην υποδιεργασία" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "Αποτυχία δημιουργίας του ΑΡΧΕΙΟΥ" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "Αποτυχία αγκίστρωσης" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "Συμπίεση απογόνου" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "Εσωτερικό Σφάλμα, Αποτυχία δημιουργίας του %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "Αποτυχία δημιουργίας IPC στην υποδιεργασία" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "Αποτυχία εκτέλεσης του συμπιεστή " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "αποσυμπιεστής" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "απέτυχε η Ε/Ε στην υποδιεργασία/αρχείο" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "Αποτυχία ανάγνωσης κατά τον υπολογισμό MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "Πρόβλημα κατά την αποσύνδεση του %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Αποτυχία μετονομασίας του %s σε %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "σφάλμα μεταγλωτισμου - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "αλλά το %s είναι εγκατεστημένο" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "αλλά το %s πρόκειται να εγκατασταθεί" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "αλλά δεν είναι εγκαταστάσημο" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "αλλά είναι ένα εικονικό πακέτο" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "αλλά δεν είναι εγκατεστημένο" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "αλλά δεν πρόκειται να εγκατασταθεί" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " η" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "Τα ακόλουθα κρατημένα πακέτα θα αλλαχθούν:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (λόγω του %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -739,148 +749,148 @@ msgstr "" "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα απαραίτητα πακέτα θα αφαιρεθούν\n" "Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu επανεγκατεστημένα," -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu υποβαθμισμένα, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Διόρθωση εξαρτήσεων..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " απέτυχε." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Αδύνατη η διόρθωση των εξαρτήσεων" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Αδύνατη η ελαχιστοποίηση του συνόλου αναβαθμίσεων" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Ετοιμο" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα " "προβλήματα." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε με το -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Τα ακόλουθα πακέτα δεν εξακριβώθηκαν!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Παράκαμψη προειδοποίησης ταυτοποίησης.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευση [ν/Ο]; " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Μερικά πακέτα δεν εξαακριβώθηκαν" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Υπάρχουν προβλήματα και δώσατε -y χωρίς το --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Εσωτερικό σφάλμα, έγινε κλήση του Install Packages με σπασμένα πακέτα!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "" "Μερικά πακέτα πρέπει να αφαιρεθούν αλλά η Αφαίρεση είναι απενεργοποιημένη." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Εσωτερικό Σφάλμα, η Ταξινόμηση δεν ολοκληρώθηκε" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Αδύνατη η ανάγνωση της λίστας πηγών." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Πολύ περίεργο! Τα μεγέθη δεν ταιριάζουν, στείλτε μήνυμα στο apt@packages." "debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB από αρχεία.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB από αρχεία.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Μετά την αποσυμπίεση θα χρησιμοποιηθούν %sB χώρου από το δίσκο.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Μετά την αποσυμπίεση θα ελευθερωθούν %sB χώρου από το δίσκο.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Καθορίσατε συνηθισμένο, αλλά αυτή δεν είναι μια συνηθισμένη εργασία" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Ναι, κανε ότι λέω!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -891,28 +901,28 @@ msgstr "" "Για να συνεχίσετε πληκτρολογήστε τη φράση '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "Εγκατάλειψη." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Θέλετε να συνεχίσετε [Ν/ο]; " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Αποτυχία ανάκτησης του %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -920,49 +930,49 @@ msgstr "" "Αδύνατη η μεταφόρτωση μερικών αρχείων, ίσως αν δοκιμάζατε με apt-get update " "ή το --fix-missing;" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "ο συνδυασμός --fix-missing με εναλλαγή μέσων δεν υποστηρίζεται για την ώρα" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Αδύνατη η επίλυση των χαμένων πακέτων." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Εγκατάλειψη της εγκατάστασης." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Παράκαμψη του %s, είναι εγκατεστημένο και η αναβάθμιση δεν έχει οριστεί.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Το πακέτο %s είναι εικονικό και παρέχεται από τα:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Εγκατεστημένα]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Θα πρέπει επακριβώς να επιλέξετε ένα για εγκατάσταση." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -974,51 +984,51 @@ msgstr "" "Αυτό σημαίνει ότι το πακέτο αυτό λείπει, είναι παλαιωμένο, ή είναι διαθέσιμο " "από άλλη πηγή\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Πάραυτα το ακόλουθο πακέτο το αντικαθιστά:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Το πακέτο %s δεν είναι υποψήφιο για εγκατάσταση" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Η επανεγκατάσταση του %s δεν είναι εφικτή, δεν είναι δυνατή η μεταφόρτωσή " "του\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "το %s είναι ήδη η τελευταία έκδοση.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Η έκδοση %s για το%s δεν βρέθηκε" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Η έκδοση %s για το %s δεν βρέθηκε" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Η εντολή update δεν παίρνει ορίσματα" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1026,25 +1036,67 @@ msgstr "" "Μερικά αρχεία δεν μεταφορτώθηκαν, αγνοήθηκαν ή χρησιμοποιήθηκαν παλαιότερα " "στη θέση τους." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "" +"Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο " +"υλικό" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Εσωτερικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Αδύνατη η εύρεση του πακέτου %s" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "Αδύνατη η εύρεση του πακέτου %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "αλλά το %s πρόκειται να εγκατασταθεί" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Aν τρέξετε 'apt-get f install' ίσως να διορθώσετε αυτά τα προβλήματα:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1052,7 +1104,7 @@ msgstr "" "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε " "πακέτο (ή καθορίστε μια λύση)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1064,7 +1116,7 @@ msgstr "" "διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n" "μετακινηθεί από τα εισερχόμενα." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1074,124 +1126,135 @@ msgstr "" "το πακέτο αυτό δεν είναι εγκαταστάσιμο και θα πρέπει να κάνετε μια\n" "αναφορά σφάλματος για αυτό το πακέτο." -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "Χαλασμένα πακέτα" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "Προτεινόμενα πακέτα:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "Συνιστώμενα πακέτα:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "Υπολογισμός της αναβάθμισης... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Απέτυχε" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "Ετοιμο" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "" "Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο " "υλικό" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον " "κωδικάτου" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "Μεταφόρτωση Κωδικα %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "Απέτυχε η εντολή χτισίματος %s.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "Η απογονική διεργασία απέτυχε" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1199,7 +1262,7 @@ msgid "" msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1208,32 +1271,33 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες " "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s " "είναι νεώτερο" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "Υποστηριζόμενοι Οδηγοί:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1248,6 +1312,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1413,188 +1478,188 @@ msgstr "" msgid "Merging available information" msgstr "Σύμπτυξη Διαθέσιμων Πληροφοριών" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Αποτυχία κατά τη δημιουργία διασωληνώσεων" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Αποτυχία κατά την εκτέλεση του gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Κατεστραμμένη αρχειοθήκη" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Το Checksum του tar απέτυχε, η αρχείοθήκη είναι κατεστραμμένη" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Άγνωστη επικεφαλίδα TAR τύπος %u, μέλος %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Μη έγκυρη υπογραφή αρχειοθήκης" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Σφάλμα κατά την ανάγνωση της επικεφαλίδας του μέλους της αρχειοθήκης" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Μη έγκυρη επικεφαλίδα μέλος της αρχειοθήκης" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Η αρχειοθήκη είναι πολύ μικρή" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Αποτυχία ανάγνωσης των επικεφαλίδων της αρχειοθήκης" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "Κλήση του DropNode σε έναν ήδη συνδεδεμένο κόμβο" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Αποτυχία εντοπισμού του στοιχείου hash!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Αδυναμία εντοπισμού εκτροπής" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Εσωτερικό Σφάλμα στο AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Προσπάθεια για αντικατάσταση εκτροπής, %s -> %s και %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Διπλή προσθήκη εκτροπής %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Διπλό αρχείο ρυθμίσεων %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Αποτυχία εγγραφής του αρχείου %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Αποτυχία στο κλείσιμο του αρχείου %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Η διαδρομή %s έχει υπερβολικό μήκος" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Αποσυμπίεση του %s πάνω από μια φορά" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Ο φάκελος %s έχει εκτραπεί" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Το πακέτο προσπαθεί να γράψει στον προορισμό εκτροπής %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Η διαδρομή εκτροπής έχει υπερβολικό μήκος" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Ο φάκελος %s αντικαθίσταται από ένα μη-φάκελο" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Αποτυχία εντοπισμού του κόμβου στην ομάδα hash του" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Η διαδρομή έχει υπερβολικό μήκος" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Αντικατάσταση πακέτου χωρίς καμία έκδοση %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Το αρχείο %s/%s αντικαθιστά αυτό στο πακέτο %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Αδύνατη η ανάγνωση του %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Αδύνατη η εύρεση της κατάστασης του %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Αποτυχία διαγραφής του %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Αδύνατη η δημιουργία του %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Αποτυχία εύρεσης της κατάστασης του %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "Οι φάκελοι info και temp πρέπει να βρίσκονται στο ίδιο σύστημα αρχείων" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "Ανάγνωση Λιστών Πακέτων" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Αποτυχία αλλαγής καταλόγου στο φάκελο διαχείρισης %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "Εσωτερικό Σφάλμα στην ανάκτηση ενός Ονόματος Πακέτου" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Ανάγνωση Λίστας Πακέτων" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1605,77 +1670,77 @@ msgstr "" "επαναφέρετε το αρχείο, τότε αδειάστε το και άμεσα εγκαταστήστε ξανά την ίδια " "έκδοση του πακέτου!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Αποτυχία κατά την ανάγνωση του αρχείου λίστας %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Εσωτερικό Σφάλμα στη λήψη ενός Κόμβου" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Αποτυχία στο άνοιγμα του αρχείου παρακάμψεων %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Το αρχείο παρακάμψεων είναι κατεστραμμένο" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "Μη έγκυρη γραμμή στο αρχείο παρακάμψεων: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Εσωτερικό Σφάλμα στην προσθήκη μιας παράκαμψης" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Η cache των πακέτων θα πρέπει να πρώτα να αρχικοποιηθεί" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Αποτυχία εύρεσης μιας κεφαλίδας Package:, γραμμή %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Ελαττωματική εγγραφή ConfFile στο αρχείο κατάστασης. Γραμμή %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Σφάλμα στην ανάλυση του MD5. Γραμμή %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Αυτό δεν είναι ένα έγκυρο αρχείο DEB, αγνοείται το μέλος '%s'" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "Μη έγκυρο αρχείο DEB, δεν περιέχει το μέλος %s' or '%s' " -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "Αδύνατη η αλλαγή σε %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "Εσωτερικό Σφάλμα, αδυναμία εντοπισμού του μέλους" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "Αποτυχία εντοπισμού ενός έγκυρου αρχείου control" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "Μη αναλύσιμο αρχείο control" @@ -1710,11 +1775,12 @@ msgid "File not found" msgstr "Το αρχείο Δε Βρέθηκε" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Αποτυχία εύρεσης της κατάστασης" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης" @@ -1776,7 +1842,7 @@ msgstr "Λήξη χρόνου σύνδεσης" msgid "Server closed the connection" msgstr "Ο διακομιστής έκλεισε την σύνδεση" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "Σφάλμα ανάγνωσης" @@ -1788,7 +1854,7 @@ msgstr "Το μήνυμα απάντησης υπερχείλισε την εν msgid "Protocol corruption" msgstr "Αλλοίωση του πρωτοκόλλου" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "Σφάλμα εγγραφής" @@ -1842,7 +1908,7 @@ msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδο msgid "Unable to accept connection" msgstr "Αδύνατη η αποδοχή συνδέσεων" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Πρόβλημα κατά το hashing του αρχείου" @@ -1869,39 +1935,39 @@ msgstr "Επερώτηση" msgid "Unable to invoke " msgstr "Αδύνατη η εκτέλεση" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Σύνδεση στο %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Αδύνατη η δημιουργία υποδοχής για το %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Αδύνατη η αρχικοποίηση της σύνδεσης στο %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Αδύνατη η σύνδεση στο %s:%s (%s), λήξη χρόνου σύνδεσης" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Αδύνατη η σύνδεση στο %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Σύνδεση στο %s" @@ -1977,433 +2043,453 @@ msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το msgid "Read error from %s process" msgstr "Σφάλμα ανάγνωσης από τη διεργασία %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Αναμονή επικεφαλίδων" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Λήψη μίας και μόνης γραμμής επικεφαλίδας πάνω από %u χαρακτήρες" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Ελαττωματική γραμμή επικεφαλίδας" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα απάντησης" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Length" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Range" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρως το range" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Άγνωστη μορφή ημερομηνίας" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Η επιλογή απέτυχε" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Λήξη χρόνου σύνδεσης" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "" "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Σφάλμα στην ανάγνωση από το διακομιστή" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Ελαττωματικά δεδομένα επικεφαλίδας" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Η σύνδεση απέτυχε" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Εσωτερικό Σφάλμα" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "Αδύνατο η απεικόνιση mmap ενός άδειου αρχείου" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Αδύνατη η απεικόνιση μέσω mmap %lu bytes" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "Η επιλογή %s δε βρέθηκε" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Μη αναγνωρισμένος τύπος σύντμησης: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "Η γραμμή %d έχει υπερβολικό μήκος (μέγιστο %d)" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Συντακτικό σφάλμα %s:%u: Το block αρχίζει χωρίς όνομα." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Συντακτικό σφάλμα %s:%u: Λάθος μορφή Ετικέτας (Tag)" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες μετά την τιμή" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Συντακτικό σφάλμα %s:%u: Οι οδηγίες βρίσκονται μόνο στο ανώτατο επίπεδο" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Συντακτικό σφάλμα %s:%u: Υπερβολικός αριθμός συνδυασμένων includes" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Συντακτικό σφάλμα %s:%u: Συμπεριλαμβάνεται από εδώ" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Συντακτικό σφάλμα %s:%u: Μη υποστηριζόμενη εντολή '%s'" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες στο τέλος του αρχείου" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Σφάλμα!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... Ολοκληρώθηκε" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Η επιλογή γραμμής εντολών '%c' [από %s] δεν είναι γνωστή." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "Η επιλογή γραμμής εντολών %s δεν είναι κατανοητή" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Η επιλογή γραμμής εντολών %s δεν είναι boolean" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Η επιλογή %s απαιτεί ένα όρισμα." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" "Επιλογή %s: Οι προδιαγραφές του αντικειμένου ρυθμίσεων απαιτούν =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Επιλογή %s: απαιτείται ένας ακέραιος αριθμός ως όρισμα, όχι '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Η επιλογή '%s' έχει υπερβολικό μήκος" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Η τιμή %s δεν είναι κατανοητή, δοκιμάστε σωστό (true) ή λάθος (false)." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Μη έγκυρη λειτουργία %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Αδύνατη η εύρεση της κατάστασης του σημείου επαφής %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Αδύνατη η αλλαγή σε %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "Αδύνατη η εύρεση της κατάστασης του cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Δε θα χρησιμοποιηθεί κλείδωμα για το ανάγνωσης μόνο αρχείο κλειδώματος %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "Αδύνατο το άνοιγμα του αρχείου κλειδώματος %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Δε θα χρησιμοποιηθεί κλείδωμα για το συναρμοσμένο από nfs αρχείο κλειδώματος " "%s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "Αδύνατο το κλείδωμα %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Η υποδιεργασία %s επέστρεψε ένα κωδικός σφάλματος (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Η υποδιεργασία %s εγκατέλειψε απρόσμενα" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "Αδύνατο το άνοιγμα του αρχείου %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "αναγνώστηκαν, απομένουν ακόμη %lu για ανάγνωση αλλά δεν απομένουν άλλα" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "γράφτηκαν, απομένουν %lu για εγγραφή αλλά χωρίς επιτυχία" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "Πρόβλημα κατά την διαγραφή του αρχείου" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Άδειο cache πακέτων" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Το αρχείο cache των πακέτων είναι κατεστραμμένο" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Το αρχείο cache των πακέτων είναι ασύμβατης έκδοσης" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Αυτό το APT δεν υποστηρίζει το Σύστημα Απόδοσης Έκδοσης '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Η cache πακέτων κατασκευάστηκε για μια διαφορετική αρχιτεκτονική" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Εξαρτάται από" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "ΠροΕξαρτάται από" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Προτείνει" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Συστήνει" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Ασύμβατο με" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Αντικαθιστά" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Απαρχαιώνει" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "σημαντικό" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "απαιτούμενο" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "καθιερωμένο" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "προαιρετικό" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "επιπλέον" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "Κατασκευή Δένδρου Εξαρτήσεων" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "Υποψήφιες Εκδόσεις" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "Παραγωγή Εξαρτήσεων" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "Σύμπτυξη Διαθέσιμων Πληροφοριών" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Αποτυχία ανοίγματος του %s" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Αποτυχία εγγραφής του αρχείου %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Απόλυτο dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Άνοιγμα του %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος " -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (id κατασκευαστή)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2415,12 +2501,12 @@ msgstr "" "είναι καλό, αλλά εάν πραγματικά θέλετε να συνεχίσετε ενεργοποιήστε την " "επιλογή APT::Force-LoopBreak option." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Ο τύπος αρχείου ευρετηρίου '%s' δεν υποστηρίζεται" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2428,7 +2514,7 @@ msgstr "" "Το πακέτο '%s' χρειάζεται να επανεγκατασταθεί, αλλά είναι αδύνατη η εύρεση " "κάποιας κατάλληλης αρχείοθήκης." -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2436,187 +2522,203 @@ msgstr "" "Σφάλμα, το pkgProblemResolver::Resolve παρήγαγε διακοπές, αυτό ίσως " "προκλήθηκε από κρατούμενα πακέτα." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Ο φάκελος λιστών %spartial αγνοείται." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Ο φάκελος αρχειοθηκών %spartial αγνοείται." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, fuzzy, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Κατέβασμα του αρχείου %li του %li (απομένουν %s)" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, fuzzy, c-format msgid "Retrieving file %li of %li" msgstr "Ανάγνωση Λίστας Πακέτων" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Ο οδηγός μεθόδου %s δεν μπορεί να εντοπιστεί." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Παρακαλώ εισάγετε το δίσκο με ετικέτα '%s' στη συσκευή '%s' και πατήστε " "enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Το σύστημα συσκευασίας '%s' δεν υποστηρίζεται" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "Αδύνατος ο καθορισμός ενός κατάλληλου τύπου συστήματος πακέτων" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Αδύνατη η εύρεση της κατάστασης του %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Πρέπει να τοποθετήσετε μερικά URI 'πηγών' στο sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Αδύνατο το άνοιγμα ή η ανάλυση των λιστών πακέτων ή του αρχείου κατάστασης." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Ίσως να πρέπει να τρέξετε apt-get update για να διορθώσετε αυτά τα προβλήματα" -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Μη έγκυρη εγγραφή στο αρχείο προτιμήσεων, καμία επικεφαλίδα Package" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Αδύνατη η κατανόηση του τύπου καθήλωσης %s" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "" "Δεν έχει οριστεί προτεραιότητα (ή έχει οριστεί μηδενική) για την καθήλωση" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Η cache έχει ασύμβατο σύστημα απόδοσης έκδοσης" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Προέκευψε σφάλμα κατά την επεξεργασία του %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Προέκευψε σφάλμα κατά την επεξεργασία του %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Προέκευψε σφάλμα κατά την επεξεργασία του %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Εκπληκτικό, υπερβήκατε τον αριθμό των ονομάτων πακέτων που υποστηρίζει το " "APT." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Εκπληκτικό, υπερβήκατε τον αριθμό των εκδόσεων που υποστηρίζει το APT." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Εκπληκτικό, υπερβήκατε τον αριθμό των εκδόσεων που υποστηρίζει το APT." + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Το πακέτο %s %s δε βρέθηκε κατά την επεξεργασία εξαρτήσεων του αρχείου" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "Συλλογή Παροχών Αρχείου" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "απέτυχε η μετονομασία, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Ανόμοιο MD5Sum" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2625,7 +2727,7 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)" -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2634,7 +2736,7 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο." -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2642,7 +2744,7 @@ msgstr "" "Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο " "πακέτο %s." -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Ανόμοιο μέγεθος" @@ -2651,7 +2753,7 @@ msgstr "Ανόμοιο μέγεθος" msgid "Vendor block %s contains no fingerprint" msgstr "Η εγγραφή κατασκευαστή %s δεν περιέχει ταυτότητα" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2660,52 +2762,54 @@ msgstr "" "Χρησιμοποιείται το σημείο προσάρτησης %s\n" "Προσαρτάται το CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "Αναγνώριση..." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "Αποθήκευση Ετικέτας: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Χρησιμοποιείται το σημείο προσάρτησης %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "Αποπροσάρτηση του CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "Αναμονή για δίσκο...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "Προσάρτηση του CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "Σάρωση του δίσκου για περιεχόμενα...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "Βρέθηκαν %i κατάλογοι πακέτων, %i κατάλογοι πηγαίων και %i υπογραφές\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "Αποθήκευση Ετικέτας: %s \n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "Αυτό δεν είναι έγκυρο όνομα, προσπαθείστε ξανά. \n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2714,93 +2818,98 @@ msgstr "" "Ο δίσκος αυτός ονομάζεται: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Αντιγραφή λιστών πακέτων..." -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Eγγραφή νέας λίστας πηγών\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Οι κατάλογοι με τις πηγές αυτού του δίσκου είναι: \n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "Αποπροσάρτηση του CD-ROM..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Εγιναν %i εγγραφές.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Εγιναν %i εγγραφές με %i ασύμβατα αρχεία.\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία και %i ασύμβατα αρχεία\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Προετοιμασία του %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Ξεπακετάρισμα του %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Προετοιμασία ρύθμισης του %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Ρύθμιση του %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "Εγκατέστησα το %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Προετοιμασία για την αφαίρεση του %s" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Αφαιρώ το %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "Αφαίρεσα το %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Προετοιμασία ρύθμισης του %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Αποτυχία διαγραφής του %s" +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Αδύνατο το άνοιγμα του αρχείου %s" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Η σύνδεση έκλεισε πρόωρα" @@ -2808,10 +2917,6 @@ msgstr "Η σύνδεση έκλεισε πρόωρα" #~ msgid "File date has changed %s" #~ msgstr "Η ημερομηνία του αρχείου %s έχει αλλάξει" -#, fuzzy -#~ msgid "Could not patch file" -#~ msgstr "Αδύνατο το άνοιγμα του αρχείου %s" - #~ msgid "Reading file list" #~ msgstr "Ανάγνωση Λιστών Αρχείων" diff --git a/po/en_GB.po b/po/en_GB.po index decb2b629..803313cfb 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6.46.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2006-10-12 11:07+0100\n" "Last-Translator: Neil Williams \n" "Language-Team: en_GB \n" @@ -15,145 +15,155 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Package %s version %s has an unmet dep:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Unable to locate package %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "Total package names : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Normal packages: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Pure virtual packages: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Single virtual packages: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Mixed virtual packages: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Missing: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Total distinct versions: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Total distinct versions: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Total dependencies: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Total ver/file relations: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Total ver/file relations: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Total Provides mappings: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Total globbed strings: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Total dependency version space: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Total slack space: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Total space accounted for: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Package file %s is out of sync." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "You must give exactly one pattern" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "No packages found" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Package files:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cache is out of sync, can't x-ref a package file" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Pinned packages:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(not found)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Installed: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(none)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Candidate: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Package pin: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Version table:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s compiled on %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -300,7 +310,7 @@ msgstr "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "Unable to write to %s" @@ -309,31 +319,31 @@ msgstr "Unable to write to %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Cannot get debconf version. Is debconf installed?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Package extension list is too long" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "Error processing directory %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Source extension list is too long" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Error writing header to contents file" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Error processing contents %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -413,26 +423,26 @@ msgstr "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "No selections matched" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Some files are missing in the package file group ‘%s’" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB was corrupted, file renamed to %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB is old, attempting to upgrade %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." @@ -440,106 +450,106 @@ msgstr "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Unable to open DB file %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "Failed to stat %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Archive has no control record" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Unable to get a cursor" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Unable to read directory %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Unable to stat %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "E: Errors apply to file " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "Could not resolve ‘%s’" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "Tree walking failed" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "Failed to open %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "Failed to readlink %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "Failed to unlink %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Failed to link %s to %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink limit of %sB hit.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Archive had no package field" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s has no override entry\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s maintainer is %s not %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr " %s has no source override entry\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s has no binary override entry either\n" @@ -553,165 +563,165 @@ msgstr "Internal error, could not locate member %s" msgid "realloc - Failed to allocate memory" msgstr "realloc - Failed to allocate memory" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Unable to open %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Malformed override %s line %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Malformed override %s line %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Malformed override %s line %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Failed to read the override file %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Unknown compression algorithm ‘%s’" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Compressed output %s needs a compression set" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Failed to create IPC pipe to subprocess" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "Failed to create FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "Failed to fork" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "Compress child" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "Internal error, failed to create %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "Failed to create subprocess IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "Failed to exec compressor " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "decompressor" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "IO to subprocess/file failed" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "Failed to read while computing MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "Problem unlinking %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Failed to rename %s to %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "Regex compilation error - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "The following packages have unmet dependencies." -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "but %s is installed" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "but %s is to be installed" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "but it is not installable" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "but it is a virtual package" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "but it is not installed" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "but it is not going to be installed" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " or" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "The following NEW packages will be installed" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "The following packages will be REMOVED" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "The following packages have been kept back:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "The following packages will be upgraded:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "The following packages will be DOWNGRADED:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "The following held packages will be changed:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (due to %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -719,143 +729,143 @@ msgstr "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu upgraded, %lu newly installed, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalled, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu downgraded, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu to remove and %lu not upgraded.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu not fully installed or removed.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Correcting dependencies..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " failed." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Unable to correct dependencies" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Unable to minimise the upgrade set" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr "Done" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "You might want to run ‘apt-get -f install’ to correct these." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Unmet dependencies. Try using -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "WARNING: The following packages cannot be authenticated!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Authentication warning overridden.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Install these packages without verification [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Some packages could not be authenticated" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "There are problems and -y was used without --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Internal error, InstallPackages was called with broken packages!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Packages need to be removed but remove is disabled." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Internal error, Ordering didn't finish" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "Unable to lock the download directory" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "The list of sources could not be read." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "How odd.. The sizes didn't match, email apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Need to get %sB/%sB of archives.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Need to get %sB of archives.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "After unpacking %sB of additional disk space will be used.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "After unpacking %sB disk space will be freed.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "Couldn't determine free space in %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "You don't have enough free space in %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only specified but this is not a trivial operation." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -866,28 +876,28 @@ msgstr "" "To continue type in the phrase ‘%s’\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "Abort." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Do you want to continue [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Failed to fetch %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Some files failed to download" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "Download complete and in download only mode" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -895,47 +905,47 @@ msgstr "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing and media swapping is not currently supported" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Unable to correct missing packages." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Aborting install." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Note, selecting %s for regex ‘%s’\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Skipping %s, it is already installed and upgrade is not set.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Package %s is not installed, so not removed\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Package %s is a virtual package provided by:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Installed]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "You should explicitly select one to install." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -946,49 +956,49 @@ msgstr "" "This may mean that the package is missing, has been obsoleted, or\n" "is only available from another source\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "However the following packages replace it:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Package %s has no installation candidate" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s is already the newest version.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release ‘%s’ for ‘%s’ was not found" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version ‘%s’ for ‘%s’ was not found" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Selected version %s (%s) for %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "The update command takes no arguments" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Unable to lock the list directory" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -996,25 +1006,65 @@ msgstr "" "Some index files failed to download, they have been ignored, or old ones " "used instead." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "The following NEW packages will be installed" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "The following information may help to resolve the situation:" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Internal error, problem resolver broke stuff" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, AllUpgrade broke stuff" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Couldn't find package %s" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "Couldn't find package %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, selecting %s for regex ‘%s’\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "but %s is to be installed" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "You might want to run ‘apt-get -f install’ to correct these:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1022,7 +1072,7 @@ msgstr "" "Unmet dependencies. Try ‘apt-get -f install’ with no packages (or specify a " "solution)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1034,7 +1084,7 @@ msgstr "" "distribution that some required packages have not yet been created\n" "or been moved out of Incoming." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1044,119 +1094,130 @@ msgstr "" "the package is simply not installable and a bug report against\n" "that package should be filed." -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "The following information may help to resolve the situation:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "Broken packages" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "The following extra packages will be installed:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "Suggested packages:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "Recommended packages:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "Calculating upgrade... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Failed" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "Done" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "Internal error, problem resolver broke stuff" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "Must specify at least one package for which to fetch source" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "Unable to find a source package for %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Skipping already downloaded file '%s'\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "You don't have enough free space in %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Need to get %sB/%sB of source archives.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Need to get %sB of source archives.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "Fetch source %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "Failed to fetch some archives." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Skipping unpack of already unpacked source in %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Unpack command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Check if the 'dpkg-dev' package is installed.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "Child process failed" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "Must specify at least one package to check builddeps for" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Unable to get build-dependency information for %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "%s has no build depends.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1165,7 +1226,7 @@ msgstr "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1174,31 +1235,32 @@ msgstr "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Failed to satisfy %s dependency for %s: Installed package %s is too new" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Failed to satisfy %s dependency for %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Build-dependencies for %s could not be satisfied." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "Failed to process build dependencies" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "Supported modules:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1213,6 +1275,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1374,188 +1437,188 @@ msgstr "" msgid "Merging available information" msgstr "Merging available information" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Failed to create pipes" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Failed to exec gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Corrupted archive" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Tar checksum failed, archive corrupted" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Unknown TAR header type %u, member %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Invalid archive signature" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Error reading archive member header" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Invalid archive member header" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Archive is too short" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Failed to read the archive headers" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode called on still linked node" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Failed to locate the hash element!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Failed to allocate diversion" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Internal error in AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Trying to overwrite a diversion, %s -> %s and %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Double add of diversion %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Duplicate conf file %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Failed to write file ‘%s’" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Failed to close file %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "The path %s is too long" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Unpacking %s more than once" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "The directory %s is diverted" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "The package is trying to write to the diversion target %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "The diversion path is too long" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "The directory %s is being replaced by a non-directory" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Failed to locate node in its hash bucket" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "The path is too long" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Overwrite package match with no version for %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "File %s/%s overwrites the one in the package %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Unable to read %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Unable to stat %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Failed to remove %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Unable to create %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Failed to stat %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "The info and temp directories need to be on the same filesystem" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "Reading package lists" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Failed to change to the admin dir %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "Internal error getting a package name" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Reading file listing" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1566,77 +1629,77 @@ msgstr "" "then make it empty and immediately re-install the same version of the " "package!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Failed reading the list file %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Internal error getting a node" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Failed to open the diversions file %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "The diversion file is corrupted" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "Invalid line in the diversion file: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Internal error adding a diversion" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "The pkg cache must be initialised first" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Failed to find a Package: header, offset %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Bad ConfFile section in the status file. Offset %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Error parsing MD5. Offset %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "This is not a valid DEB archive, missing ‘%s’ member" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "This is not a valid DEB archive, it has no %s or ‘%s’ member" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "Couldn't change to %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "Internal error, could not locate member" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "Failed to locate a valid control file" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "Unparsable control file" @@ -1671,11 +1734,12 @@ msgid "File not found" msgstr "File not found" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Failed to stat" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Failed to set modification time" @@ -1737,7 +1801,7 @@ msgstr "Connection timeout" msgid "Server closed the connection" msgstr "Server closed the connection" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "Read error" @@ -1749,7 +1813,7 @@ msgstr "A response overflowed the buffer." msgid "Protocol corruption" msgstr "Protocol corruption" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "Write error" @@ -1803,7 +1867,7 @@ msgstr "Data socket connect timed out" msgid "Unable to accept connection" msgstr "Unable to accept connection" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem hashing file" @@ -1830,39 +1894,39 @@ msgstr "Query" msgid "Unable to invoke " msgstr "Unable to invoke" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Connecting to %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Could not create a socket for %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Cannot initiate the connection to %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Could not connect to %s:%s (%s), connection timed out" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Could not connect to %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Connecting to %s" @@ -1937,427 +2001,447 @@ msgstr "Couldn't open pipe for %s" msgid "Read error from %s process" msgstr "Read error from %s process" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Waiting for headers" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Got a single header line over %u chars" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Bad header line" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "The HTTP server sent an invalid reply header" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "The HTTP server sent an invalid Content-Length header" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "The HTTP server sent an invalid Content-Range header" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "This HTTP server has broken range support" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Unknown date format" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Select failed" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Connection timed out" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Error writing to output file" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Error writing to file" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Error writing to the file" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Error reading from server. Remote end closed connection" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Error reading from server" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Bad header data" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Connection failed" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Internal error" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "Cannot mmap an empty file" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Couldn't make mmap of %lu bytes" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "Selection %s not found" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Unrecognized type abbreviation: ‘%c’" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "Opening configuration file %s" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "Line %d too long (max %d)" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntax error %s:%u: Block starts with no name." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntax error %s:%u: Malformed tag" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntax error %s:%u: Extra junk after value" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntax error %s:%u: Directives can only be done at the top level" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntax error %s:%u: Too many nested includes" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntax error %s:%u: Included from here" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntax error %s:%u: Unsupported directive ‘%s’" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntax error %s:%u: Extra junk at end of file" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Error!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... Done" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Command line option ‘%c’ [from %s] is not known." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "Command line option %s is not understood" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Command line option %s is not boolean" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Option %s requires an argument." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Option %s: Configuration item specification must have an =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Option %s requires an integer argument, not ‘%s’" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Option ‘%s’ is too long" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Sense %s is not understood, try true or false." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Invalid operation %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Unable to stat the mount point %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Unable to change to %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "Failed to stat the cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Not using locking for read only lock file %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "Could not open lock file %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Not using locking for nfs mounted lock file %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "Could not get lock %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Waited for %s but it wasn't there" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Sub-process %s received a segmentation fault." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Sub-process %s returned an error code (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Sub-process %s exited unexpectedly" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "Could not open file %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "read, still have %lu to read but none left" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "write, still have %lu to write but couldn't" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "Problem closing the file" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "Problem unlinking the file" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "Problem syncing the file" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Empty package cache" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "The package cache file is corrupted" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "The package cache file is an incompatible version" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "This APT does not support the Versioning System ‘%s’" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "The package cache was built for a different architecture" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Depends" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "PreDepends" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Suggests" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Recommends" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Conflicts" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Replaces" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Obsoletes" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "important" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "required" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "optional" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "Building dependency tree" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "Candidate versions" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "Dependency generation" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "Merging available information" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Failed to open %s" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Failed to write file ‘%s’" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Unable to parse package file %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Unable to parse package file %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Malformed line %lu in source list %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Malformed line %lu in source list %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Malformed line %lu in source list %s (URI parse)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Malformed line %lu in source list %s (absolute dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Malformed line %lu in source list %s (dist parse)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Opening %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Line %u too long in source list %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Malformed line %u in source list %s (type)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Type ‘%s’ is not known on line %u in source list %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Malformed line %u in source list %s (vendor id)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2368,19 +2452,19 @@ msgstr "" "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " "you really want to do it, activate the APT::Force-LoopBreak option." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Index file type ‘%s’ is not supported" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "The package %s needs to be reinstalled, but I can't find an archive for it." -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2388,180 +2472,196 @@ msgstr "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "Unable to correct problems, you have held broken packages." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Lists directory %spartial is missing." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Archive directory %spartial is missing." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Retrieving file %li of %li (%s remaining)" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "Retrieving file %li of %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "The method driver %s could not be found." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Method %s did not start correctly" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Packaging system ‘%s’ is not supported" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "Unable to determine a suitable packaging system type" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Unable to stat %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "You must put some ‘source’ URIs in your sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "The package lists or status file could not be parsed or opened." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "You may want to run apt-get update to correct these problems" -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Invalid record in the preferences file, no Package header" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Did not understand pin type %s" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "No priority (or zero) specified for pin" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Cache has an incompatible versioning system" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Error occurred while processing %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Error occurred while processing %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Error occurred while processing %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Error occurred while processing %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Error occurred while processing %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Error occurred while processing %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Error occurred while processing %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Error occurred while processing %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Error occurred while processing %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Wow, you exceeded the number of package names this APT can handle.." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Wow, you exceeded the number of versions this APT can handle." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Wow, you exceeded the number of versions this APT can handle." + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Wow, you exceeded the number of dependencies this APT can handle." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Error occurred while processing %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Error occurred while processing %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Package %s %s was not found while processing file dependencies" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "Couldn't stat source package list %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "Collecting File Provides" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "IO Error saving source cache" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "rename failed, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "MD5Sum mismatch" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "There is no public key available for the following key IDs:\n" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2570,7 +2670,7 @@ msgstr "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2579,14 +2679,14 @@ msgstr "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "The package index files are corrupted. No Filename: field for package %s." -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Size mismatch" @@ -2595,7 +2695,7 @@ msgstr "Size mismatch" msgid "Vendor block %s contains no fingerprint" msgstr "Vendor block %s contains no fingerprint" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2604,52 +2704,54 @@ msgstr "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "Identifying.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "Stored label: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Using CD-ROM mount point %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "Unmounting CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "Waiting for disc...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "Mounting CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "Scanning disc for index files..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "Found %i package indexes, %i source indexes and %i signatures\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "Stored label: %s \n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "That is not a valid name, try again.\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2658,96 +2760,97 @@ msgstr "" "This disc is called: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Copying package lists..." -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Writing new source list\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Source list entries for this disc are:\n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "Unmounting CD-ROM..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Wrote %i records.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Wrote %i records with %i missing files.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Wrote %i records with %i mismatched files\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Wrote %i records with %i missing files and %i mismatched files\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Preparing %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Unpacking %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Preparing to configure %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Configuring %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "Installed %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Preparing for removal of %s" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Removing %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "Removed %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparing to completely remove %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "Completely removed %s" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "Could not patch file" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Connection closed prematurely" - -#~ msgid "Could not patch file" -#~ msgstr "Could not patch file" diff --git a/po/es.po b/po/es.po index 4a6254005..0877ef346 100644 --- a/po/es.po +++ b/po/es.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6.42.3exp1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2006-10-08 00:23+0200\n" "Last-Translator: Javier Fernandez-Sanguino \n" "Language-Team: Debian Spanish \n" @@ -18,147 +18,157 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "El paquete %s versin %s tiene dependencias incumplidas:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "No se ha podido localizar el paquete %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "Nombres de paquetes totales: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Paquetes normales: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Paquetes virtuales puros: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Paquetes virtuales nicos: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Paquetes virtuales mixtos: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Faltan: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Versiones diferentes totales: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Versiones diferentes totales: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Dependencias totales: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Relaciones versin/archivo totales: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Relaciones versin/archivo totales: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Mapeo Total de Provisiones: " # globbed -> globalizadas ? (jfs) -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Cadenas globalizadas totales: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Espacio de versin de dependencias total: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Espacio desperdiciado total: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Espacio registrado total: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "El archivo de paquetes %s est desincronizado." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Debe dar exactamente un patrn" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "No se encontr ningn paquete" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Archivos de paquetes:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Cach fuera de sincronismo, no se puede hacer x-ref a un archivo de paquetes" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Paquetes con pin:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(no encontrado)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Instalados: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(ninguno)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Candidato: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Pin del paquete: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Tabla de versin:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado en %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -310,7 +320,7 @@ msgstr "" " -o=? Establece una opcin de configuracin arbitraria, p. ej. -o dir::" "cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "No se puede escribir en %s" @@ -319,31 +329,31 @@ msgstr "No se puede escribir en %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "No se puede encontrar la versin de debconf. Est debconf instalado?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "La lista de extensin de paquetes es demasiado larga" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "Error procesando el directorio %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "La lista de extensin de fuentes es demasiado larga" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Error escribiendo cabeceras de archivos de contenido" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Error procesando contenidos %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -428,26 +438,26 @@ msgstr "" " -c=? Lee este archivo de configuracin\n" " -o=? Establece una opcin de configuracin arbitraria" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Ninguna seleccin coincide" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Faltan algunos archivos en el grupo de archivo de paquetes `%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "BD corrompida, archivo renombrado a %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB anticuada, intentando actualizar %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." @@ -455,106 +465,106 @@ msgstr "" "El formato de la base de datos no es vlido. Debe eliminar y recrear la base " "de datos si ha actualizado de una versin anterior de apt." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "No se pudo abrir el archivo DB %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "No pude leer %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "No hay registro de control del archivo" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "No se pudo obtener un cursor" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: No se pudo leer directorio %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: No se pudo leer %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "A: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "E: Errores aplicables al archivo '" -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "No se pudo resolver %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "Fall el recorrido por el rbol." -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "No se pudo abrir %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "No se pudo leer el enlace %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "No se pudo desligar %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** No pude enlazar %s con %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink se ha llegado al lmite de %sB.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Archivo no tiene campo de paquetes" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s no tiene entrada de predominio\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " el encargado de %s es %s y no %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr " %s no tiene una entrada fuente predominante\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s tampoco tiene una entrada binaria predominante\n" @@ -568,165 +578,165 @@ msgstr "Error interno, no pude localizar el miembro %s" msgid "realloc - Failed to allocate memory" msgstr "realloc - No pudo reservar memoria" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "No se pudo abrir %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Predominio mal formado %s lnea %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Predominio mal formado %s lnea %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Predominio mal formado %s lnea %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "No se pudo leer el archivo de predominio %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritmo desconocido de compresin '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Salida comprimida %s necesita una herramienta de compresin" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Fall la creacin de una tubera IPC para el subproceso" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "No se pudo crear FICHERO*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "No se pudo bifurcar" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "Hijo compresin" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "Error interno, no se pudo crear %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "No se pudo crear el subproceso IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "No se pudo ejecutar el compresor " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "decompresor" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "Fall la ES a subproceso/archivo" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "No se pudo leer mientras se computaba MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "Hay problemas desligando %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Fall el renombre de %s a %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilacin de expresiones regulares - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "Los siguientes paquetes tienen dependencias incumplidas:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "pero %s est instalado" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "pero %s va a ser instalado" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "pero no es instalable" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "pero es un paquete virtual" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "pero no est instalado" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "pero no va a instalarse" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " o" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "Se instalarn los siguientes paquetes NUEVOS:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "Los siguientes paquetes se ELIMINARN:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "Los siguientes paquetes se han retenido:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "Se actualizarn los siguientes paquetes:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "Se DESACTUALIZARN los siguientes paquetes:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "Se cambiarn los siguientes paquetes retenidos:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (por %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -734,146 +744,146 @@ msgstr "" "AVISO: Se van a eliminar los siguientes paquetes esenciales.\n" "NO debe hacerse a menos que sepa exactamente lo que est haciendo!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualizados, %lu se instalarn, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualizados, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu para eliminar y %lu no actualizados.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu no instalados del todo o eliminados.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Corrigiendo dependencias..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " fall." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "No se puede corregir las dependencias" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "No se puede minimizar el conjunto de actualizacin" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Listo" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Dependencias incumplidas. Pruebe de nuevo usando -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO: No se han podido autenticar los siguientes paquetes!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Aviso de autenticacin ignorado.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Instalar estos paquetes sin verificacin [s/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Algunos paquetes no se pueden autenticar" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Hay problemas y se utiliz -y sin --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Error interno, InstallPackages fue llamado con un paquete roto!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Los paquetes necesitan eliminarse pero Remove est deshabilitado." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Error interno, no termin el ordenamiento" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "No se puede bloquear el directorio de descarga" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "No se pudieron leer las listas de fuentes." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Que raro.. Los tamaos no concuerdan, mande un correo a \n" "apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Se necesita descargar %sB/%sB de archivos.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Necesito descargar %sB de archivos.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" "Se utilizarn %sB de espacio de disco adicional despus de desempaquetar.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Se liberarn %sB despus de desempaquetar.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "No pude determinar el espacio libre en %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "No tiene suficiente espacio libre en %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Se especific Trivial Only pero sta no es una operacin trivial." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "S, haga lo que le digo!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -884,28 +894,28 @@ msgstr "" "Para continuar escriba la frase %s\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "Abortado." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Desea continuar [S/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Imposible obtener %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Algunos archivos no pudieron descargarse" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "Descarga completa y en modo de slo descarga" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -913,47 +923,47 @@ msgstr "" "No se pudieron obtener algunos archivos, quizs deba ejecutar\n" "apt-get update o deba intentarlo de nuevo con --fix-missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "Actualmente no estn soportados --fix-missing e intercambio de medio" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "No se pudieron corregir los paquetes que faltan." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Abortando la instalacin." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, seleccionando %s en lugar de %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Ignorando %s, ya esta instalado y la actualizacin no esta activada.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "El paquete %s no esta instalado, no se eliminar\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "El paquete %s es un paquete virtual provisto por:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Instalado]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Necesita seleccionar explcitamente uno para instalar." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -964,49 +974,49 @@ msgstr "" "a l. Esto puede significar que el paquete falta, est obsoleto o slo se\n" "encuentra disponible desde alguna otra fuente\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Sin embargo, los siguientes paquetes lo reemplazan:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "El paquete %s no tiene candidato para su instalacin" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "No es posible reinstalar el paquete %s, no se puede descargar.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ya est en su versin ms reciente.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "No se encontr la Distribucin '%s' para '%s'" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "No se encontr la versin '%s' para '%s'" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versin seleccionada %s (%s) para %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "El comando de actualizacin no toma argumentos" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "No se pudo bloquear el directorio de listas" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1014,25 +1024,67 @@ msgstr "" "Algunos archivos de ndice no se han podido descargar, se han ignorado,\n" "o se ha utilizado unos antiguos en su lugar." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Se instalarn los siguientes paquetes NUEVOS:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "La siguiente informacin puede ayudar a resolver la situacin:" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "" +"Error interno, el sistema de solucin de problemas rompi\n" +"algunas cosas" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error Interno, AllUpgrade rompi cosas" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "No se pudo encontrar el paquete %s" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "No se pudo encontrar el paquete %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, seleccionando %s para la expresin regular '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "pero %s va a ser instalado" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1040,7 +1092,7 @@ msgstr "" "Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o " "especifique una solucin)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1052,7 +1104,7 @@ msgstr "" "inestable, que algunos paquetes necesarios no han sido creados o han\n" "sido movidos fuera de Incoming." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1062,123 +1114,134 @@ msgstr "" "paquete simplemente no sea instalable y debera de rellenar un informe de\n" "error contra ese paquete." -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "La siguiente informacin puede ayudar a resolver la situacin:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "Paquetes rotos" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "Se instalarn los siguientes paquetes extras:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "Paquetes sugeridos:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "Paquetes recomendados" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "Calculando la actualizacin... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Fall" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "Listo" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "" "Error interno, el sistema de solucin de problemas rompi\n" "algunas cosas" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "Debe especificar al menos un paquete para obtener su cdigo fuente" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "No se pudo encontrar un paquete de fuentes para %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Ignorando fichero ya descargado '%s'\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "No tiene suficiente espacio libre en %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Necesito descargar %sB/%sB de archivos fuente.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Necesito descargar %sB de archivos fuente.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "Fuente obtenida %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "No se pudieron obtener algunos archivos." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fall la orden de desempaquetamiento '%s'.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Compruebe que el paquete dpkg-dev est instalado.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fall la orden de construccin '%s'.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "Fall el proceso hijo" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "" "Debe especificar al menos un paquete para verificar sus\n" "dependencias de construccin" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "No se pudo obtener informacin de dependencias de construccin para %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "%s no tiene dependencias de construccin.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1187,7 +1250,7 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede \n" "encontrar el paquete %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1196,32 +1259,33 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque ninguna versin\n" "disponible del paquete %s satisface los requisitos de versin" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es " "demasiado nuevo" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "No se pudo satisfacer la dependencia %s para %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No se pudieron satisfacer las dependencias de construccin de %s." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "No se pudieron procesar las dependencias de construccin" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "Mdulos soportados:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1236,6 +1300,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1405,189 +1470,189 @@ msgstr "" msgid "Merging available information" msgstr "Fusionando informacin disponible" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "No pude crear las tuberas" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "No pude ejecutar gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Archivo corrompido" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "No se aprob la suma de control del tar, archive corrompido" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Cabecera del TAR tipo %u desconocida, miembro %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Firma del archivo invlida" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Error leyendo la cabecera de miembro del archivo" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Cabecera de miembro del archivo invlida" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "El archivo es muy pequeo" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "No pude leer las cabeceras del archivo" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode llamado en un nodo todava ligado" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "No pude localizar el elemento enlazado!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "No pude asignar una desviacin" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Error interno en AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Tratando de sobreescribir una desviacin, %s -> %s y %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Doble suma de desviacin %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Archivo de configuracin duplicado %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Fall la escritura del archivo %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "No pude cerrar el archivo %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "La trayectoria %s es demasiado larga" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Desempaquetando %s ms de una vez" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "El directorio %s est desviado" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "El paquete est tratando de escribir al blanco desviado %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "La trayectoria de desviacin es demasiado larga" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "El directorio %s est siendo reemplazado por un no-directorio" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "No pude localizar el nodo en su bote de enlace" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "La trayectoria es muy larga" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Sobreescribiendo concordancia del paquete sin versin para %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "El archivo %s/%s sobreescribe al que est en el paquete %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "No pude leer %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "No pude leer %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "No pude borrar %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "No pude crear %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "No pude leer %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "" "Los directorios info y temp deben de estar en el mismo sistema de archivos" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "Leyendo lista de paquetes" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "No pude cambiarme al directorio de administracin %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "Error interno obteniendo un Nombre de Paquete" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Leyendo Listado de Archivos" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1598,77 +1663,77 @@ msgstr "" "archivo entonces cree uno vaco e inmediatamente reinstale la misma versin " "del paquete!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "No pude leer el archivo de lista %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Error interno obteniendo un nodo" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "No pude abrir el archivo de desviacin %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "El archive de desviacin esta corrompido" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "Linea invlida en el archivo de desviacin: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Error interno agregando una desviacin" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "El cach del paquete debe de inicializarse primero" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "No pude encontrar un paquete: Cabecera, desplazo %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Mala seccin del ConfFile en el archivo de estado. Desplazo %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Error leyendo Md5. Desplazo %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Este no es un archivo DEB vlido, falta el miembro '%s'" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "Este no es un archivo DEB vlido, falta el miembro '%s' o '%s'" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "No pude cambiar a %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "Error interno, no pude localizar el miembro" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "No pude localizar un archivo de control vlido" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "Archivo de control inanalizable" @@ -1703,11 +1768,12 @@ msgid "File not found" msgstr "Fichero no encontrado" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "No pude leer" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "No pude poner el tiempo de modificacin" @@ -1769,7 +1835,7 @@ msgstr "La conexi msgid "Server closed the connection" msgstr "El servidor cerr la conexin" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "Error de lectura" @@ -1781,7 +1847,7 @@ msgstr "Una respuesta desbord msgid "Protocol corruption" msgstr "Corrupcin del protocolo" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "Error de escritura" @@ -1835,7 +1901,7 @@ msgstr "Expir msgid "Unable to accept connection" msgstr "No pude aceptar la conexin" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Hay problemas enlazando fichero" @@ -1862,39 +1928,39 @@ msgstr "Consulta" msgid "Unable to invoke " msgstr "No pude invocar " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Conectando a %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "No pude crear un socket para %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "No puedo iniciar la conexin a %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "No pude conectarme a %s:%s (%s), expir tiempo para conexin" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "No pude conectarme a %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Conectando a %s" @@ -1971,431 +2037,451 @@ msgstr "No pude abrir una tuber msgid "Read error from %s process" msgstr "Error de lectura de %s procesos" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Esperando las cabeceras" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Obtuve una sola lnea de cabecera arriba de %u caracteres" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Mala lnea de cabecera" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "El servidor de http envi una cabecera de respuesta invlida" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "El servidor de http envi una cabecera de Content-Length invlida" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "El servidor de http envi una cabecera de Content-Range invlida" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "ste servidor de http tiene el soporte de alcance roto" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Formato de fecha desconocido" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Fall la seleccin" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Expir la conexin" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Error escribiendo al archivo de salida" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Error escribiendo a archivo" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Error escribiendo al archivo" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Error leyendo del servidor, el lado remoto cerr la conexin." -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Error leyendo del servidor" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Mala cabecera Data" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Fallo la conexin" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Error interno" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "No puedo hacer mmap de un fichero vaco" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "No pude hacer mmap de %lu bytes" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "Seleccin %s no encontrada" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Tipo de abreviacin no reconocida: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "Abriendo fichero de configuracin %s" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "Lnea %d demasiado larga (mx %d)" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Error de sintaxis %s:%u: No hay un nombre al comienzo del bloque." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Error de sintaxis %s:%u: Marca mal formada" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Error de sintaxis %s:%u: Basura extra despus del valor" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Error de sintaxis %s:%u: Las directivas slo se pueden poner\n" "en el primer nivel" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Error de sintaxis %s:%u: Demasiadas inclusiones anidadas" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Error de sintaxis %s:%u: Incluido desde aqu" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Error de sintaxis %s:%u: Directiva '%s' no soportada" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Error de sintaxis %s:%u: Basura extra al final del archivo" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Error!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... Hecho" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "No se conoce la opcin de lnea de rdenes '%c' [ de %s]" -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "No se entiende la opcin de lnea de rdenes %s" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "La opcin de lnea de rdenes %s no es un booleano" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "La opcin %s necesita un argumento." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" "Opcin %s: La especificacin del elemento de configuracin debe tener un " "=." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "La opcin %s exige un argumento entero, no '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Opcin '%s' demasiado larga" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "El sentido %s no se entiende, pruebe verdadero o falso." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Operacin invlida: %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "No se puede obtener informacin del punto de montaje %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "No se pudo cambiar a %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "No pude montar el cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "No se utiliza bloqueos para el fichero de bloqueo de slo lectura %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "No se pudo abrir el fichero de bloqueo '%s'" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "No se utilizan bloqueos para el fichero de bloqueo de montaje nfs %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "No se pudo bloquear %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperaba %s pero no estaba all" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "El subproceso %s recibi un fallo de segmentacin." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "El subproceso %s devolvi un cdigo de error (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "El subproceso %s termin de forma inesperada" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "No pude abrir el fichero %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "ledos, todava deba leer %lu pero no queda nada" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "escritos, todava tena que escribir %lu pero no pude hacerlo" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "Problemas cerrando el archivo" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "Hay problemas desligando el fichero %s" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "Hay problemas sincronizando el fichero" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Cach de paquetes vaca." -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "El archivo de cach de paquetes esta corrompido" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "El archivo de cach de paquetes es una versin incompatible" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Este APT no soporta el sistema de versiones '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "La cach de paquetes se haba creado para una arquitectura diferente" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Depende" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "PreDepende" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Sugiere" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Recomienda" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Entra en conflicto" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Reemplaza" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Hace obsoleto" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "requiere" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "estndar" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opcional" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "Creando rbol de dependencias" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "Versiones candidatas" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "Generacin de dependencias" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "Fusionando informacin disponible" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "No se pudo abrir %s" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Fall la escritura del archivo %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "No se pudo tratar el archivo de paquetes %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "No se pudo tratar el archivo de paquetes %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Lnea %lu mal formada en lista de fuentes %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Lnea %lu mal formada en lista de fuentes %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Lnea %lu mal formada en lista de fuentes %s (anlisis de URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Lnea %lu mal formada en lista de fuentes %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Lnea %lu mal formada en lista de fuentes %s (anlisis de dist)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Abriendo %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Lnea %u demasiado larga en la lista de fuentes %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Lnea %u mal formada en lista de fuentes %s (tipo)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo '%s' desconocido en la lnea %u de lista de fuentes %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Lnea %u mal formada en la lista de fuentes %s (id del fabricante)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2407,12 +2493,12 @@ msgstr "" "Esto generalmente es malo, pero si realmente quiere hacerlo, active \n" "la opcin APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "No se da soporte para el tipo de archivo de ndice '%s'" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2420,7 +2506,7 @@ msgstr "" "El paquete %s necesita ser reinstalado, pero no se encuentra un archivo para " "ste." -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2428,191 +2514,207 @@ msgstr "" "Error, pkgProblemResolver::Resolve gener cortes, esto puede haber sido " "causado por paquetes retenidos." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "" "No se pudieron corregir los problemas, usted ha retenido paquetes\n" "rotos." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Falta el directorio de listas %spartial." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Falta el directorio de archivos %spartial." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Descargando fichero %li de %li (falta %s)" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "Descargando fichero %li de %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "No se pudo encontrar el mtodo %s." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "El mtodo %s no se inici correctamente" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Por favor, inserte el disco %s en la unidad %s y presione Intro" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "El sistema de paquetes '%s' no est soportado" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "No se pudo determinar un tipo de sistema de paquetes adecuado" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "No se pudo leer %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Debe poner algunos URIs 'fuente' en su sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "" "No se pudieron analizar o abrir las listas de paquetes o el archivo de " "estado." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "Tal vez quiera ejecutar 'apt-get update' para corregir estos problemas" -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "" "Registro invlido en el archivo de preferencias, no hay cabecera de paquete" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "No se entiende el pin tipo %s" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "No hay prioridad especificada para pin (o es cero)" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "La cach tiene una versin incompatible de sistema de versiones" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Ocurri un error mientras se procesaba %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Ocurri un error mientras se procesaba %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Ocurri un error mientras se procesaba %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Ocurri un error mientras se procesaba %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Ocurri un error mientras se procesaba %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Ocurri un error mientras se procesaba %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Ocurri un error mientras se procesaba %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Ocurri un error mientras se procesaba %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Ocurri un error mientras se procesaba %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Vaya, excedi el nmero de nombres de paquetes que este APT es capaz de " "manejar." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Vaya, excedi el nmero de versiones que este APT es capaz de manejar." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Vaya, excedi el nmero de versiones que este APT es capaz de manejar." + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Vaya, excedi el nmero de dependencias que este APT es capaz de manejar." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Ocurri un error mientras procesaba %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Ocurri un error mientras procesaba %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Al procesar las dependencias de archivos no se encontr el\n" "paquete %s %s" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "No se puede leer la lista de paquetes fuente %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "Recogiendo archivos que proveen" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "Error de E/S guardando cach fuente" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "fall el cambio de nombre, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "La suma MD5 difiere" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" "No existe ninguna clave pblica disponible para los siguientes " "identificadores de clave:\n" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2622,7 +2724,7 @@ msgstr "" "que necesita arreglar manualmente este paquete (debido a que falta una " "arquitectura)" -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2631,7 +2733,7 @@ msgstr "" "No se pudo localizar un archivo para el paquete %s. Esto puede significar " "que necesita arreglar manualmente este paquete." -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2639,7 +2741,7 @@ msgstr "" "Los archivos de ndice de paquetes estn corrompidos. El campo 'Filename:' " "no existe para para el paquete %s." -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "El tamao difiere" @@ -2648,7 +2750,7 @@ msgstr "El tama msgid "Vendor block %s contains no fingerprint" msgstr "Bloque de fabricante %s sin huella digital" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2657,52 +2759,54 @@ msgstr "" "Usando el punto de montaje del CD-ROM %s\n" "Montando el CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "Identificando.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "Etiqueta guardada: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Usando el punto de montaje del CD-ROM %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "Desmontando el CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "Esperando el disco...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "Montando el CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "Buscando en el disco archivos de ndices...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "Se encontraron %i ndices de paquetes, %i de fuentes y %i firmas\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "Etiqueta guardada: %s \n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "Ese no es un nombre vlido, intntelo de nuevo.\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2711,101 +2815,102 @@ msgstr "" "Este disco se llama: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Copiando las listas de paquetes..." -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Escribiendo nueva lista de fuente\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Las entradas de la lista de fuentes para este disco son:\n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "Desmontando CD-ROM..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "%i registros escritos.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i registros escritos con %i fichero de menos.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i registros escritos con %i fichero mal emparejado\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "%i registros escritos con %i fichero de menos y %i ficheros mal emparejados\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Preparando %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Desempaquetando %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Preparndose para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Configurando %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "%s instalado" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Preparndose para eliminar %s" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Eliminando %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "%s eliminado" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparndose para eliminar completamente %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "Se borr completamente %s" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "No pude parchear el fichero" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "La conexin se cerr prematuramente" -#~ msgid "Could not patch file" -#~ msgstr "No pude parchear el fichero" - #~ msgid "File date has changed %s" #~ msgstr "Cambi la fecha del archivo %s" diff --git a/po/eu.po b/po/eu.po index 9658ab6d3..e6cb07e0b 100644 --- a/po/eu.po +++ b/po/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_eu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:09+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2006-09-27 13:59+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: librezale \n" @@ -18,147 +18,157 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1)\n" "\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "%s paketeak (%s bertsioa) mendekotasun-arazo bat du:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Ezin da %s paketea lokalizatu" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "Pakete Izenak Guztira : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Pakete normalak:" -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Pakete birtual puruak:" -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Bakanako pakete birtualak: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Nahastutako pakete birtualak: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Falta direnak: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Bertsio Ezberdinak Guztira: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Bertsio Ezberdinak Guztira: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Dependentziak Guztira: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Guztira Bertsio/fitxategi erlazioak: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Guztira Bertsio/fitxategi erlazioak: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Guztira Saltzaile Mapatzea: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Guztira beteratutakokateak: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Guztira bertsio dependentzi lekua: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Guztira galdutako tokia:" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Guztira erregitratutako lekua: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "%s pakete-fitxategia ez dago sinkronizatuta." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Zehazki eredu bat eman behar duzu." -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Ez da paketerik aurkitu" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Pakete Fitxatefiak:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Cachea ez dago sinkronizatuta, ezin zaio erreferentziarik (x-ref) egin " "pakete-fitxategi bati" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Pin duten Paketeak:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(ez da aurkitu)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Instalatuta: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(bat ere ez)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Hautagaia: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Paketearen pin-a:" #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Bertsio tabla:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s (%s %s) konpilatua: %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -305,7 +315,7 @@ msgstr "" " -c=? Irakurri konfigurazio-fitxategi hau\n" " -o=? Ezarri konfigurazio-aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "%s : ezin da idatzi" @@ -314,31 +324,31 @@ msgstr "%s : ezin da idatzi" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ezin da debconf bertsioa eskuratu. Debconf instalatuta dago?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Pakete-luzapenen zerrenda luzeegia da" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "Errorea direktorioa prozesatzean %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Iturburu-luzapenen zerrenda luzeegia da" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Errorea eduki-fitxategiaren goiburua idaztean" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Errorea edukiak prozesatzean %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -417,26 +427,26 @@ msgstr "" " -c=? Irakurri konfigurazio-fitxategi hau\n" " -o=? Ezarri konfigurazio-aukera arbitrario bat" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Ez dago bat datorren hautapenik" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Fitxategi batzuk falta dira `%s' pakete-fitxategien taldean" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Datu-basea hondatuta dago; fitxategiari %s.old izena jarri zaio" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Datu-basea zaharra da; %s bertsio-berritzen saiatzen ari da" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." @@ -444,106 +454,106 @@ msgstr "" "DB formatu baliogabe da. Apt bertsio zaharrago batetik eguneratu baduzu, " "mesedez datubasea ezabatu eta birsortu." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Ezin da ireki %s datu-base fitxategia: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "Huts egin du %s(e)tik datuak lortzean" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Artxiboak ez du kontrol-erregistrorik" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Ezin da kurtsorerik eskuratu" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: Ezin da %s direktorioa irakurri\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: Ezin da %s atzitu\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "A: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "E: Erroreak fitxategiari dagozkio " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "Huts egin du %s ebaztean" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "Huts egin dute zuhaitz-urratsek" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "Huts egin du %s irekitzean" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "Huts egin du %s esteka irakurtzean" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "Huts egin du %s desestekatzean" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Ezin izan da %s %s(r)ekin estekatu" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-en mugara (%sB) heldu da.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Artxiboak ez du pakete-eremurik" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s: ez du override sarrerarik\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s mantentzailea %s da, eta ez %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr " %s: ez du jatorri gainidazketa sarrerarik\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s: ez du bitar gainidazketa sarrerarik\n" @@ -557,165 +567,165 @@ msgstr "Barne Errorea, ezin da %s atala kokatu" msgid "realloc - Failed to allocate memory" msgstr "realloc - Huts egin du memoria esleitzean" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Ezin da %s ireki" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Gaizki osatutako override %s, lerroa: %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Gaizki osatutako override %s, lerroa: %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Gaizki osatutako override %s, lerroa: %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Huts egin du %s override fitxategia irakurtzean" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "'%s' Kompresio Algoritmo Ezezaguna" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "%s irteera konprimituak konpresio-tresna bat behar du" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Huts egin du azpiprozesuarentzako IPC kanalizazio bat sortzean" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "Huts egin du FILE* sortzean" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "Huts egin du sardetzean" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "Konprimatu Umeak" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "Barne Errorea, Huts %s sortzerakoan" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "Huts egin du IPC azpiprozesua sortzean" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "Huts egin du konpresorea exekutatzean " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "deskonpresorea" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "Huts egin du azpiprozesu/fitxategiko S/Iak" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "Huts egin du MD5 konputatzean" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "Arazoa %s desestekatzean" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Huts egin du %s izenaren ordez %s ipintzean" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "Adierazpen erregularren konpilazio-errorea - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "baina %s instalatuta dago" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "baina %s instalatzeko dago" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "baina ez da instalagarria" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "baina pakete birtuala da" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "baina ez dago instalatuta" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "baina ez da instalatuko" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " edo" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "Ondorengo pakete BERRIAK instalatuko dira:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "Ondorengo paketeak KENDUKO dira:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "Ondorengo paketeak mantendu egin dira:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "Ondorengo paketeak BERTSIO-BERRITUKO dira:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "Ondorengo pakete atxikiak aldatu egingo dira:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (arrazoia: %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -723,145 +733,145 @@ msgstr "" "KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n" "EZ ezazu horelakorik egin, ez badakizu ondo zertan ari zaren!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu bertsio-berrituta, %lu berriki instalatuta, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu berrinstalatuta, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu aurreko bertsiora itzulita, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ez erabat instalatuta edo kenduta.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Mendekotasunak zuzentzen..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " : huts egin du." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Ezin dira mendekotasunak zuzendu" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Ezin da bertsio-berritzeko multzoa minimizatu" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Eginda" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu zuzentzeko." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Bete gabeko mendekotasunak. Probatu -f erabiliz." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "KONTUZ: Hurrengo paketeak ezin dira egiaztatu!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Egiaztapen abisua gainidazten.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Paketeak egiaztapen gabe instalatu [b/E]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Zenbait pakete ezin dira egiaztatu" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Arazoak daude, eta -y erabili da --force-yes gabe" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Barne errorea, InstallPackages apurturiko paketeez deitu da!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Paketeak ezabatu beharra dute bain Ezabatzea ezgaiturik dago." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Barne errorea, ez da ordenatzeaz amaitu" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "Ezin da deskarga-direktorioa blokeatu" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Ezin izan da iturburu-zerrenda irakurri." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Hau bitxia.. Tamainak ez dira berdina, idatzi apt@packages.debian.org-ra " "berri emanez (ingelesez)" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Artxiboetako %sB/%sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Artxiboetako %sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Deskonprimitu ondoren, %sB gehiago erabiliko dira diskoan.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Deskonprimitu ondoren, %sB libratuko dira diskoan.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "Ezin da %s(e)n duzun leku librea atzeman." -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Ez daukazu nahikoa leku libre %s(e)n." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' zehaztu da, baina hau ez da eragiketa tribial bat." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Bai, egin esandakoa!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -872,28 +882,28 @@ msgstr "" "Jarratzeko, idatzi '%s' esaldia\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "Abortatu." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Aurrera jarraitu nahi al duzu [B/e]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ezin da lortu %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Fitxategi batzuk ezin izan dira deskargatu" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "Deskarga amaituta eta deskarga soileko moduan" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -901,47 +911,47 @@ msgstr "" "Ezin izan dira artxibo batzuk lortu; beharbada apt-get update exekutatu, edo " "--fix-missing aukerarekin saiatu?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing eta euskarri-aldaketa ez dira onartzen oraingoz" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Falta diren paketeak ezin dira zuzendu." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Abortatu instalazioa." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Oharra, %s hautatzen %s(r)en ordez\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s pakete birtual bat da, honek hornitua:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Instalatuta]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Zehazki bat hautatu behar duzu instalatzeko." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -952,49 +962,49 @@ msgstr "" "egiten dio. Beharbada paketea faltako da, edo zaharkituta egongo da, edo \n" "beste iturburu batean bakarrik egongo da erabilgarri\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Baina ondorengo paketeek ordezten dute:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "%s paketeak ez du instalatzeko hautagairik" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s berriro instalatzea ez da posible; ezin da deskargatu.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s bertsiorik berriena da jada.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%2$s'(r)en '%1$s' banaketa ez da aurkitu" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Hautatutako bertsioa: %s (%s) -- %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Eguneratzeko komandoak ez du argumenturik hartzen" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Ezin da zerrenda-direktorioa blokeatu" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1002,25 +1012,65 @@ msgstr "" "Indize-fitxategi batzuk ezin izan dira deskargatu; ez ikusi egin zaie, edo " "zaharrak erabili dira haien ordez." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Ondorengo pakete BERRIAK instalatuko dira:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "Informazio honek arazoa konpontzen lagun dezake:" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Ezin izan da %s paketea aurkitu" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "Ezin izan da %s paketea aurkitu" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "baina %s instalatzeko dago" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1028,7 +1078,7 @@ msgstr "" "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo " "zehaztu konponbide bat)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1040,7 +1090,7 @@ msgstr "" "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n" "Sarrerakoetan (Incoming) egoten jarraituko dute." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1049,121 +1099,132 @@ msgstr "" "Eragiketa soil bat eskatu duzunez, seguru asko paketea ez da instalagarria\n" "izango, eta pakete horren errorearen berri ematea komeni da." -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Informazio honek arazoa konpontzen lagun dezake:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "Hautsitako paketeak" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "Ondorengo pakete gehigarriak instalatuko dira:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "Iradokitako paketeak:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "Gomendatutako paketeak:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "Berriketak kalkulatzen... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Huts egin du" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "Eginda" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "Ezin da iturburu-paketerik aurkitu %s(r)entzat" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "Ez daukazu nahikoa leku libre %s(e)n." -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Iturburu-artxiboetako %sB/%sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Iturburu-artxiboetako %sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "Eskuratu %s iturubura\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "Huts egin du zenbat artxibo lortzean." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Egiaztattu 'dpkg-dev' paketea instalaturik dagoen.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "Eraikitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "Prozesu umeak huts egin du" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "" "Gutxienez pakete bat zehaztu behar duzu eraikitze-mendekotasunak egiaztatzeko" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ezin izan da %s(r)en eraikitze-mendekotasunen informazioa eskuratu" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "%s: ez du eraikitze-mendekotasunik.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1171,7 +1232,7 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1180,32 +1241,33 @@ msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak " "betetzen dituen %3$s paketearen bertsio erabilgarririk" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s " "paketea berriegia da" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s(r)en eraikitze-mendekotasunak ezin izan dira bete." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "Huts egin du eraikitze-mendekotasunak prozesatzean" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "Onartutako Moduluak:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1220,6 +1282,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1382,188 +1445,188 @@ msgstr "" msgid "Merging available information" msgstr "Eskuragarrien datuak biltzen" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Huts egin du kanalizazioak sortzean" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Huts egin du gzip exekutatzean " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Hondatutako artxiboa" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Tar egiaztapenak huts egin, hondatutakofitxategia" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "%u TAR goiburu-mota ezezaguna, %s kidea" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Artxibo-sinadura baliogabea" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Errorea artxiboko kidearen goiburua irakurtzean" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Artxiboko kidearen goiburua baliogabea da" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Artxiboa laburregia da" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Huts egin artxibo-goiburuak irakurtzean" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode-ri dei egin zaio oraindik estekatutako nodoan" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Huts egin du hash-elementua lokalizatzean!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Huts egin du desbideratzea lokalizatzean" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "AddDiversion-n barne errorea" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Desbideratze bat gainidazten saiatzen: %s -> %s eta %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Desbideratzearen gehitze bikoitza: %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Konfigurazio-fitxategi bikoiztua: %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Ezin izan da %s fitxategian idatzi" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Ezin izan da %s fitxategia itxi" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "%s bide-izena luzeegia da" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "%s behin baino gehiagotan deskonprimitzen" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "%s direktorioa desbideratuta dago" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Paketea desbideratze-helburuan %s/%s idazten saiatzen ari da" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Desbideratzearen bide-izena luzeegia da" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "%s direktorioa ez-direktorio batekin ordezten ari da" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Huts egin du nodoa bere hash-ontzian lokalizatzean" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Bide-izena luzeegia da" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Gainidatzi pakete-konkordantzia %s(r)en bertsiorik gabe" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "%s/%s fitxategiak %s paketekoa gainidazten du" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Ezin da %s irakurri" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Ezin da daturik lortu %s(e)tik" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Huts egin du %s kentzean" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Ezin da %s sortu" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Huts egin du %sinfo-tik datuak lortzean" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "info eta temp direktorioek fitxategi-sistema berean egon behar dute" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "Pakete Zerrenda irakurtzen" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Huts egin du %sinfo administrazio-direktoriora aldatzean" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "Barne errorea pakete Izen bat eskuratzerakoan" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Fitxategi zerrendaketa irakurtzen" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1574,78 +1637,78 @@ msgstr "" "baduzu leheneratu, hustu ezazu, eta berrinstalatu berehala paketearen " "bertsio bera!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Huts egin du %sinfo/%s zerrenda-fitxategia irakurtzean" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Barne errorea nodo bat eskuratzerakoan" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Huts egin du desbideratzeen %sdiversions fitxategia irekitzean" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Desbideratze-fitxategia hondatuta dago" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "Lerro baliogabea desbideratze-fitxategian: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Barne errorea desbideratze bat gehitzean" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Paketearen cachea hasieratu behar da lehendabizi" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Ezin izan da pakete bat aurkitu: Burua, mugitu %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Okerreko ConfFile sekzioa egoera-fitxategian. Desplazamendua %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Errorea MD5 analizatzean. Desplazamendua %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Ez da baliozko DEB artxiboa; '%s' kidea falta da" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "" "Hau ez da balioz DEB fitxategi bat, ez du ez '%s' ez '%s' atalik falta du" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "Ezin izan da %s(e)ra aldatu" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "Barne Errorea, ezin da atala kokatu" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "Ezin izan da baliozko kontrol-fitxategi bat lokalizatu" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "Kontrol fitxategi ezin analizagarria" @@ -1681,11 +1744,12 @@ msgid "File not found" msgstr "Ez da fitxategia aurkitu" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Huts egin du atzitzean" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Huts egin du aldaketa-ordua ezartzean" @@ -1749,7 +1813,7 @@ msgstr "Konexioaren denbora-muga" msgid "Server closed the connection" msgstr "Zerbitzariak konexioa itxi du" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "Irakurketa-errorea" @@ -1761,7 +1825,7 @@ msgstr "Erantzun batek bufferrari gainez eragin dio." msgid "Protocol corruption" msgstr "Protokolo-hondatzea" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "Idazketa-errorea" @@ -1816,7 +1880,7 @@ msgstr "Datu-socket konexioak denbora-muga gainditu du" msgid "Unable to accept connection" msgstr "Ezin da konexioa onartu" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Arazoa fitxategiaren hash egitean" @@ -1843,40 +1907,40 @@ msgstr "Kontsulta" msgid "Unable to invoke " msgstr "Ezin da deitu " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Konektatzen -> %s.(%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Ezin izan da socket-ik sortu honentzat: %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Ezin izan da konexioa hasi -> %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" "Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora-muga gainditu du" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Ezin izan da konektatu -> %s:%s (%s)" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Konektatzen -> %s..." @@ -1951,431 +2015,451 @@ msgstr "Ezin izan da %s(r)en kanalizazioa ireki" msgid "Read error from %s process" msgstr "Irakurri errorea %s prozesutik" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Goiburuen zain" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Goiburu-lerro bakarra eskuratu da %u karaktereen gainean" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Okerreko goiburu-lerroa" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "http zerbitzariak erantzun-buru baliogabe bat bidali du." -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "http zerbitzariak Content-Length buru baliogabe bat bidali du" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "http zerbitzariak Content-Range buru baliogabe bat bidali du" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "http zerbitzariak barruti onarpena apurturik du" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Datu-formatu ezezaguna" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Hautapenak huts egin du" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Konexioaren denbora-muga gainditu da" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Errorea irteerako fitxategian idaztean" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Errorea zerbitzaritik irakurtzean" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Goiburu data gaizki dago" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Konexioak huts egin du" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Barne-errorea" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "Ezin da fitxategi huts baten mmap egin" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Ezin izan da %lu byteren mmap egin" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "%s hautapena ez da aurkitu" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Mota ezezaguneko laburtzapena: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "%s konfigurazio-fitxategia irekitzen" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "%d lerroa luzeegia da (gehienez %d)" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Sintaxi-errorea, %s:%u: Blokearen hasieran ez dago izenik." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Sintasi errorea %s:%u: Gaizki eratutako" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Sintaxi-errorea, %s:%u: Zabor gehigarria balioaren ondoren" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Sintaxi-errorea, %s:%u: Direktibak goi-mailan bakarrik egin daitezke" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Sintaxi-errorea, %s:%u: habiaratutako elementu gehiegi" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Sintaxi-errorea, %s:%u: hemendik barne hartuta" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Sintaxi-errorea, %s:%u: onartu gabeko '%s' direktiba" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Sintaxi-errorea, %s:%u: Zabor gehigarria fitxategi-amaieran" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Errorea!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... Eginda" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Ez da ezagutzen komando-lerroko '%c' aukera [%s]." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "Ez da ulertzen komando-lerroko %s aukera" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Komando-lerroko %s aukera ez da boolearra." -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "%s aukerak argumentu bat behar du." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" "%s aukera: konfigurazio-elementuaren zehaztapenak = eduki behar du." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "%s aukerak osoko argumentu bat behar du, eta ez '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "'%s' aukera luzeegia da" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "%s zentzua ez da ulertzen; probatu egiazkoa edo faltsua." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Eragiketa baliogabea: %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Ezin da atzitu %s muntatze-puntua" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Ezin da %s(e)ra aldatu" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "Huts egin du CDROMa atzitzean" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Ez da blokeorik erabiltzen ari irakurtzeko soilik den %s blokeo-" "fitxategiarentzat" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "Ezin izan da %s blokeo-fitxategia ireki" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo-fitxategiarentzat" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "Ezin izan da %s blokeoa hartu" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s espero zen baina ez zegoen han" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "%s azpiprozesuak segmentazio-hutsegitea jaso du." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "%s azpiprozesuak errore-kode bat itzuli du (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "%s azpiprozesua ustekabean amaitu da" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "%s fitxategia ezin izan da ireki" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "irakurrita; oraindik %lu irakurtzeke, baina ez da ezer geratzen" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "idatzita; oraindik %lu idazteke, baina ezin da" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "Arazoa fitxategia ixtean" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "Arazoa fitxategia desestekatzean" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "Arazoa fitxategia sinkronizatzean" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Paketeen cachea hutsik" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Paketeen cache-fitxategia hondatuta dago" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Paketeen cache-fitxategiaren bertsioa ez da bateragarria" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "APT honek ez du '%s' bertsio sistema onartzen" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Paketeen cachea beste arkitektura batentzat sortuta dago" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Mendekotasuna:" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Aurremendekotasuna:" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Iradokizuna:" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Gomendioa:" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Gatazka:" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Ordeztea:" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Zaharkitzea:" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "garrantzitsua" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "beharrezkoa" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "estandarra" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "aukerakoa" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "estra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "Dependentzia zuhaitza eraikitzen" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "Hautagaien bertsioak" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "Dependentzi Sormena" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "Eskuragarrien datuak biltzen" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Huts egin du %s irekitzean" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Ezin izan da %s fitxategian idatzi" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Ezin da %s pakete-fitxategia analizatu (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ezin da %s pakete-fitxategia analizatu (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (URI analisia)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Gaizkieratutako %lu lerroa %s iturburu zerrendan (banaketa orokorra)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (dist analisia)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s irekitzen" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "%2$s iturburu-zerrendako %1$u lerroa luzeegia da." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Gaizki osatutako %u lerroa %s iturburu-zerrendan (type)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "'%s' mota ez da ezagutzen %u lerroan %s iturburu-zerrendan" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Gaizki osatutako %u lerroa %s iturburu-zerrendan (hornitzaile id-a)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2387,19 +2471,19 @@ msgstr "" "izaten da, baina hala ere egin nahi baduzu, aktibatu APT::Force-LoopBreak " "aukera." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "'%s' motako indize-fitxategirik ez da onartzen" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu." -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2407,179 +2491,195 @@ msgstr "" "Errorea: pkgProblemResolver::Resolve. Etenak sortu ditu, beharbada " "atxikitako paketeek eraginda." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "%spartial zerrenda-direktorioa falta da." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "%spartial artxibo-direktorioa falta da." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "%li fitxategi deskargatzen %li -tik (%s falta da)" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "%li fitxategia jasotzen %li-tik" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Ezin izan da %s metodo-kontrolatzailea aurkitu." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "%s metodoa ez da behar bezala abiarazi" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Mesedez sa ''%s' izeneko diska '%s' gailuan eta enter sakatu" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "'%s' pakete-sistema ez da onartzen" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "Ezin da pakete-sistemaren mota egokirik zehaztu" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Ezin da %s atzitu." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "'Iturburu' URI batzuk jarri behar dituzu sources.list-en" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "Pakete-zerrendak edo egoera-fitxategia ezin dira analizatu edo ireki." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "Beharbada 'apt-get update' exekutatu nahiko duzu arazoak konpontzeko" -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Erregistro baliogabea hobespenen fitxategian, pakete-goibururik ez" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Ez da ulertu %s orratz-mota (pin)" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Ez da lehentasunik zehaztu orratzarentzat (pin) (edo zero da)" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Cachearen bertsio-sistema ez da bateragarria" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Errorea gertatu da %s prozesatzean (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Errorea gertatu da %s prozesatzean (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Errorea gertatu da %s prozesatzean (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Errorea gertatu da %s prozesatzean (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Errorea gertatu da %s prozesatzean (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Errorea gertatu da %s prozesatzean (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Errorea gertatu da %s prozesatzean (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Errorea gertatu da %s prozesatzean (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Errorea gertatu da %s prozesatzean (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "APT honek maneia dezakeen pakete-izenen kopurua gainditu duzu." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "APT honek maneia dezakeen bertsio-kopurua gainditu duzu." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "APT honek maneia dezakeen bertsio-kopurua gainditu duzu." + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "APT honek maneia dezakeen mendekotasun-kopurua gainditu duzu." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Errorea gertatu da %s prozesatzean (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Errorea gertatu da %s prozesatzean (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "%s %s paketea ez da aurkitu fitxategi-mendekotasunak prozesatzean" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "Ezin da atzitu %s iturburu-paketeen zerrenda" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "Fitxategi-erreferentziak biltzen" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "S/I errorea iturburu-cachea gordetzean" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "huts egin du izen-aldaketak, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "MD5Sum ez dator bat" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "Ez dago gako publiko erabilgarririk hurrengo gako ID hauentzat:\n" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2588,7 +2688,7 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea. (arkitektura falta delako)" -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2597,7 +2697,7 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea." -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2605,7 +2705,7 @@ msgstr "" "Paketearen indize-fitxategiak hondatuta daude. 'Filename:' eremurik ez %s " "paketearentzat." -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Tamaina ez dator bat" @@ -2614,7 +2714,7 @@ msgstr "Tamaina ez dator bat" msgid "Vendor block %s contains no fingerprint" msgstr "%s saltzaile blokeak ez du egiaztapen markarik" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2623,52 +2723,54 @@ msgstr "" "%s CD-ROM muntatze puntua erabiltzen\n" "CD-ROM-a muntatzen\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "Egiaztatzen... " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "Gordetako Etiketa: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "%s CD-ROM muntatze puntua erabiltzen\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM-a desmuntatzen\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "Diska itxaroten...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM-a muntatzen...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "Indize fitxategien bila diska arakatzen...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "%i pakete indize, %i jatorri indize eta %i sinadura aurkitu dira\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, c-format msgid "Found label '%s'\n" msgstr "Aurkitutako Etiketa: '%s' \n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "Hau ez baliozko izen bat, froga berriro.\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2677,96 +2779,97 @@ msgstr "" "Diskaren izen:\n" "'%s'\n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Pakete zerrendak kopiatzen..." -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "jatorri zerrenda berria idazten\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Diskarentzako jaotrri sarrerak:\n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 msgid "Unmounting CD-ROM...\n" msgstr "CD-ROM Desmuntatzen...\n" -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "%i erregistro grabaturik.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i erregistro eta %i galdutako fitxategi grabaturik.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i erregistro eta %i okerreko fitxategi grabaturik.\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik.\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "%s prestatzen" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "%s irekitzen" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "%s konfiguratzeko prestatzen" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "%s konfiguratzen" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "%s Instalatuta" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "%s kentzeko prestatzen" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "%s kentzen" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "%s kendurik" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "%s guztiz ezabatzeko prestatzen" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "%s guztiz ezabatu da" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "Ezin izan zaio fixtategiari adabakia ezarri" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Konexioa behar baino lehenago itxi da" - -#~ msgid "Could not patch file" -#~ msgstr "Ezin izan zaio fixtategiari adabakia ezarri" diff --git a/po/fi.po b/po/fi.po index ae778b8d5..901dbf96d 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2006-09-29 16:06+0300\n" "Last-Translator: Tapio Lehtonen \n" "Language-Team: Finnish \n" @@ -17,145 +17,155 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Paketin %s versiossa %s on tyydyttämätön riippuvuus:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Pakettia %s ei löydy" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "Pakettien kokonaismäärä : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Tavallisia paketteja: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Aitoja näennäispaketteja: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Yksinkertaisia näennäispaketteja: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Sekanäennäispaketteja: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Puuttuu: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Eri versioita yhteensä: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Eri versioita yhteensä: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Riippuvuuksia yhteensä: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Versio/tdsto suhteita yht: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Versio/tdsto suhteita yht: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Tarjoamiskuvauksia yhteensä: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Erilaisia merkkijonoja yhteensä: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Versioriippuvuustila yhteensä: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Löysää tilaa yhteensä: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Käytetty tila yhteensä: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Pakettitiedosto %s ei ole ajan tasalla." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "On annettava täsmälleen yksi lauseke" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Yhtään pakettia ei löytynyt" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Pakettitiedostot:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Varasto ei ole ajan tasalla, pakettitiedostoa ei löydy kansiosta" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Paketit joissa tunniste:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(ei löydy)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Asennettu: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(ei mitään)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Ehdokas: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Paketin tunnistenumero: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Versiotaulukko:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s laitealustalle %s %s käännöksen päiväys %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -301,7 +311,7 @@ msgstr "" " -c=? Lue tämä asetustiedosto\n" " -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "Tiedostoon %s kirjoittaminen ei onnistu" @@ -310,32 +320,32 @@ msgstr "Tiedostoon %s kirjoittaminen ei onnistu" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ohjelman debconf versiota ei saa selvitettyä. Onko debconf asennettu?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Paketin laajennuslista on liian pitkä" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "Tapahtui virhe käsiteltäessa kansiota %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Lähteiden laajennuslista on liian pitkä" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "" "Tapahtui virhe kirjoitettaessa otsikkotietoa sisällysluettelotiedostoon" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Tapahtui virhe käsiteltäessä sisällysluetteloa %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -417,26 +427,26 @@ msgstr "" " -c=? Lue tämä asetustiedosto\n" " -o=? Aseta mikä asetusvalitsin tahansa" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Mitkään valinnat eivät täsmänneet" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Pakettitiedostojen ryhmästä \"%s\" puuttuu joitain tiedostoja" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Tietokanta on turmeltunut, tiedosto nimetty %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Tietokanta on vanha, yritetään päivittää %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." @@ -444,106 +454,106 @@ msgstr "" "Tietokannan muoto ei kelpaa. Jos tehtiin päivitys vanhasta apt:n versiosta, " "on tietokanta poistettava ja luotava uudelleen." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Tietokantatiedostoa %s ei saatu avattua: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "Tiedostolle %s ei toimi stat" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Arkistolla ei ole ohjaustietuetta" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Kohdistinta ei saada" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Kansiota %s ei voi lukea\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Tdstolle %s ei toimi stat\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "E: Tiedostossa virheitä " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "Osoitteen %s selvitys ei onnistunut" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "Puun läpikäynti ei onnistunut" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "Tiedoston %s avaaminen ei onnistunut" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "readlink %s ei onnistunut" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "unlink %s ei onnistunut" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Linkin %s -> %s luonti ei onnistunut" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLinkin yläraja %st saavutettu.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Arkistossa ei ollut pakettikenttää" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s:llä ei ole poikkeustietuetta\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s ylläpitäjä on %s eikä %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr " %s:llä ei ole poikkeustietuetta\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s:llä ei ole binääristäkään poikkeustietuetta\n" @@ -557,165 +567,165 @@ msgstr "Tapahtui sisäinen virhe, tiedostoa %s ei löydy" msgid "realloc - Failed to allocate memory" msgstr "realloc - Muistin varaaminen ei onnistunut" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Tiedoston %s avaaminen ei onnistunut" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Poikkeustiedoston %s lukeminen ei onnistunut" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Tuntematon pakkausalgoritmi \"%s\"" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Pakattu tulostus %s tarvitsee pakkausjoukon" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "IPC-putken luominen aliprosessiin ei onnistunut" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "FILE* luominen ei onnistunut" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "fork ei onnistunut" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "Compress-lapsiprosessi" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "Sisäinen virhe, prosessin %s luominen ei onnistunut" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "Prosessien välistä kommunikaatiota aliprosessiin ei saatu luotua" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "Pakkaajan käynnistäminen ei onnistunut" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "purkaja" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "Syöttö/tulostus aliprosessiin/tiedostoon ei onnistunut" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "Lukeminen ei onnistunut laskettaessa MD5:ttä" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "Ilmeni pulmia poistettaessa tiedosto %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Nimen muuttaminen %s -> %s ei onnistunut" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "K" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "Käännösvirhe lausekkeessa - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "mutta %s on asennettu" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "mutta %s on merkitty asennettavaksi" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "mutta ei ole asennuskelpoinen" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "mutta on näennäispaketti" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "mutta ei ole asennettu" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "mutta ei ole merkitty asennettavaksi" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " tai" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "Seuraavat UUDET paketit asennetaan:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "Seuraavat paketit POISTETAAN:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "Nämä paketit on jätetty odottamaan:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "Nämä paketit päivitetään:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "Nämä paketit VARHENNETAAN:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "Seuraavat pysytetyt paketit muutetaan:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (syynä %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -723,145 +733,145 @@ msgstr "" "VAROITUS: Seuraavat välttämättömät paketit poistetaan.\n" "Näin EI PITÄISI tehdä jos ei aivan tarkkaan tiedä mitä tekee!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu päivitetty, %lu uutta asennusta, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu uudelleen asennettua, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu varhennettua, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ei asennettu kokonaan tai poistettiin.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Korjataan riippuvuuksia..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " ei onnistunut." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Riippuvuuksien korjaus ei onnistu" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Päivitysjoukon minimointi ei onnistu" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Valmis" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Halunnet suorittaa \"apt-get -f install\" korjaamaan nämä." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "VAROITUS: Seuraavian pakettien alkuperää ei voi varmistaa!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Varoitus varmistamisesta on ohitettu.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Asennetaanko nämä paketit ilman todennusta [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Joidenkin pakettien alkuperästä ei voitu varmistua" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Sisäinen virhe, InstallPackages kutsuttiin rikkinäisille paketeille!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Tapahtui sisäinen virhe, järjestäminen keskeytyi" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "Noutokansiota ei saatu lukittua" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Lähteiden luetteloa ei pystynyt lukemaan." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "No jo on... Koot eivät täsmää, sähköpostita email apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Noudettavaa arkistoa %st/%st.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Noudettavaa arkistoa %st.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Purkamisen jälkeen käytetään %st lisää levytilaa.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Purkamisen jälkeen vapautuu %st levytilaa.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kansion %s vapaan tilan määrä ei selvinnyt" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "On määritetty Trivial Only mutta tämä ei ole itsestäänselvä toimenpide." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Kyllä, tee kuten käsketään!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -872,28 +882,28 @@ msgstr "" "Jatka kirjoittamalla \"%s\"\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "Keskeytä." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Haluatko jatkaa [K/e]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Tiedoston %s nouto ei onnistunut %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Joidenkin tiedostojen nouto ei onnistunut" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "Nouto on valmis ja määrätty vain nouto" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -901,47 +911,47 @@ msgstr "" "Joidenkin arkistojen nouto ei onnistunut, ehkä \"apt-get update\" auttaa tai " "kokeile --fix-missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing ja taltion vaihto ei ole nyt tuettu" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Puuttuvia paketteja ei voi korjata." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Asennus keskeytetään." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Huomautus, valitaan %s eikä %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paketti %s on näennäispaketti, jonka kattaa:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Asennettu]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Yksi pitää valita asennettavaksi." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -952,49 +962,49 @@ msgstr "" "Tämä voi tarkoittaa paketin puuttuvan, olevan vanhentunut tai\n" "saatavilla vain jostain muusta lähteestä\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Seuraavat paketit kuitenkin korvaavat sen:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Paketilla %s ei ole asennettavaa valintaa" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Paketin %s uudelleenasennus ei ole mahdollista, sitä ei voi noutaa.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s on jo uusin versio.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Valittiin versio %s (%s) paketille %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Komento update ei käytä parametreja" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Luettelokansiota ei voitu lukita" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1002,25 +1012,65 @@ msgstr "" "Joidenkin hakemistotiedostojen nouto ei onnistunut, ne on ohitettu tai " "käytetty vanhoja. " -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Seuraavat UUDET paketit asennetaan:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Sisäinen virhe, resolver rikkoi jotain" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Pakettia %s ei löytynyt" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "Pakettia %s ei löytynyt" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "mutta %s on merkitty asennettavaksi" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1028,7 +1078,7 @@ msgstr "" "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" " "ilmanpaketteja (tai ratkaise itse)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1039,7 +1089,7 @@ msgstr "" "jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n" "vielä luotu tai siirretty Incoming-kansiosta." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1049,120 +1099,131 @@ msgstr "" "paketti ei lainkaan ole asennettavissa ja olisi tehtävä vikailmoitus\n" "tuosta paketista." -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "Rikkinäiset paketit" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "Ehdotetut paketit:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "Suositellut paketit:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "Käsitellään päivitystä ... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Ei onnistunut" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "Valmis" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "Sisäinen virhe, resolver rikkoi jotain" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "Paketin %s lähdekoodipakettia ei löytynyt" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "On noudettava %st lähdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "Nouda lähdekoodi %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "Joidenkin arkistojen noutaminen ei onnistunut." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Purkukomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "Paketointikomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "Lapsiprosessi kaatui" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "" "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Paketille %s ei ole saatavilla riippuvuustietoja" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1170,7 +1231,7 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1179,32 +1240,33 @@ msgstr "" "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio " "ei vastaa versioriippuvuuksia" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Riippuvutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian " "uusi" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "Paketointiriippuvuuksien käsittely ei onnistunut" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "Tuetut moduulit:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1219,6 +1281,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1381,188 +1444,188 @@ msgstr "" msgid "Merging available information" msgstr "Yhdistetään saatavuustiedot" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Putkien luonti ei onnistunut" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "exec gzip ei onnistunut" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Arkisto on turmeltunut" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-ohjelman laskema tarkistussumma ei täsmää, arkisto on turmeltunut" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tuntematon TAR-otsikon tyyppi %u, tiedosto %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Arkiston tarkistussumma on virheellinen" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Tapahtui virhe luettaessa arkiston tiedoston otsikkoa" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Arkiston tiedoston otsikko on virheellinen" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Arkisto on pienempi kuin pitäisi" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Arkiston otsikoiden luku ei onnistunut" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "Kutsuttiin DropNode mutta tiedostoon on vielä linkki" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Hajautusalkiota ei löytynyt!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Korvautuksen varaus ei onnistunut" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "AddDiversion: sisäinen virhe" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Yritetään kirjoittaa korvautuksen päälle, %s -> %s ja %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Korvautuksen kaksoislisäys %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Asetustiedoston kaksoiskappale %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Tiedoston %s kirjoittaminen ei onnistunut" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Tiedoston %s sulkeminen ei onnistunut" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Polku %s on liian pitkä" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Purettiin %s useammin kuin kerran" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Kansio %s on korvautunut" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Paketti yrittää kirjoittaa korvautuksen kohteeseen %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Korvautuspolku on liian pitkä" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Kansiota %s ollaan korvaamassa muulla kuin kansiolla" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Solmua ei löytynyt sen hajautuslokerosta" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Polku on liian pitkä" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Päälle kirjoitettava paketti täsmää mutta paketille %s ei ole versiota" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Tiedosto %s/%s kirjoitetaan paketista %s tulleen päälle" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Tiedostoa %s ei voi lukea" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Tiedostolle %s ei toimi stat" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Tiedoston %s poistaminen ei onnistunut" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Tiedostoa %s ei voi luoda" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "stat ei toimi: %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "Kansioiden info ja temp pitää olla samassa tiedostojärjestelmässä" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "Luetaan pakettiluetteloita" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Ylläpitokansioon %sinfo vaihtaminen ei onnistunut" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "Tapahtui sisäinen virhe haettaessa paketin nimeä" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Luetaan tiedostoluetteloa" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1573,77 +1636,77 @@ msgstr "" "ei voi palauttaa, tyhjennä tiedosto ja asenna välittömästi paketin sama " "versio uudelleen!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Tapahtui virhe luettelotiedostoa %sinfo/%s luettaessa" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Tapahtui sisäinen virhe varattaessa tiedostosolmua" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Tapahtui virhe avattaessa korvautustiedostoa %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Korvautustiedosto on turmeltunut" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "Virheellinen rivi korvautustiedostossa: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Tapahtui sisäinen virhe lisättäessä korvautusta" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Pakettivarasto on ensin alustettava" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Paketin otsikkoa ei löydy, kohta %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Virheellinen ConfFile-lohko tilatiedostossa. Kohta %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Tapahtui virhe jäsennettäessä MD5:ttä. Kohta %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Tämä ei ole kelvollinen DEB-arkisto, puuttuu tiedosto \"%s\"" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "Tämä ei ole kelvollinen DEB-arkisto, puuttuu osat \"%s\" ja \"%s\"." -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "Kansioon %s vaihto ei onnistunut" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "Tapahtui sisäinen virhe, tiedostoa ei löydy" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "Kelvollista ohjaustiedostoa ei löydy" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "Ohjaustiedosto ei jäsenny" @@ -1678,11 +1741,12 @@ msgid "File not found" msgstr "Tiedostoa ei löydy" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Komento stat ei toiminut" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua" @@ -1744,7 +1808,7 @@ msgstr "Yhteys aikakatkaistiin" msgid "Server closed the connection" msgstr "Palvelin sulki yhteyden" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "Lukuvirhe" @@ -1756,7 +1820,7 @@ msgstr "Vastaus aiheutti puskurin ylivuodon." msgid "Protocol corruption" msgstr "Yhteyskäytäntö on turmeltunut" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "Virhe kirjoitettaessa" @@ -1810,7 +1874,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin" msgid "Unable to accept connection" msgstr "Yhteyttä ei voitu hyväksyä" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Pulmia tiedoston hajautuksessa" @@ -1837,39 +1901,39 @@ msgstr "Kysely" msgid "Unable to invoke " msgstr "Käynnistys ei onnistu" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Avataan yhteys %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Pistokeen luonti ei onnistu %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Yhteyden %s avaus ei onnistu: %s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s), yhteys aikakatkaistiin" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s)" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Avataan yhteys %s" @@ -1946,427 +2010,447 @@ msgstr "Putkea %s ei voitu avata" msgid "Read error from %s process" msgstr "Prosessi %s ilmoitti lukuvirheestä" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Odotetaan otsikoita" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Vastaanotettiin yksi otsikkorivi pituudeltaan yli %u merkkiä" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Virheellinen otsikkorivi" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP-palvelin lähetti virheellisen vastausotsikon" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP-palvelin lähetti virheellisen Content-Length-otsikon" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP-palvelin lähetti virheellisen Content-Range-otsikon" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "HTTP-palvelimen arvoaluetuki on rikki" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Tuntematon päiväysmuoto" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Select ei toiminut" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Yhteys aikakatkaistiin" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Tapahtui virhe luettaessa palvelimelta" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Virheellinen otsikkotieto" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Yhteys ei toiminut" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Sisäinen virhe" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "Tyhjälle tiedostolle ei voi tehdä mmap:ia" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Ei voitu tehdä %lu tavun mmap:ia" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "Valintaa %s ei löydy" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Tuntematon tyypin lyhenne: \"%c\"" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "Avataan asetustiedosto %s" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "Rivi %d on liian pitkä (enintään %d)" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaksivirhe %s: %u: Lohko alkaa ilman nimeä." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaksivirhe %s: %u: väärän muotoinen nimikenttä" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaksivirhe %s: %u: Arvon jälkeen ylimääräistä roskaa" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntaksivirhe %s: %u: Direktiivejä voi olla vain ylimmällä tasolla" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaksivirhe %s: %u: Liian monta sisäkkäistä includea" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaksivirhe %s: %u: Sisällytetty tästä" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaksivirhe %s: %u: Tätä direktiiviä ei tueta \"%s\"" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksivirhe %s: %u: Ylimääräistä roskaa tiedoston lopussa" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Virhe!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... Valmis" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Komentorivin valitsin \"%c\" [%s] on tuntematon." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "Komentorivin valitsin %s on tuntematon" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Komentorivin valitsin %s ei ole totuusarvoinen" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Valitsin %s tarvitsee parametrin" -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Valitsin %s: Asetusarvon määrityksessä on oltava =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Valitsin %s tarvitsee kokonaislukuparametrin, ei \"%s\"" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Valitsin \"%s\" on liian pitkä" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Arvo %s on tuntematon, yritä tosi tai epätosi." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Virheellinen toiminto %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Komento stat ei toiminut liitoskohdalle %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Kansioon %s vaihto ei onnistu" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "Komento stat ei toiminut rompulle" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Lukkoa ei käytetä kirjoitussuojatulle tiedostolle %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "Lukkotiedostoa %s ei voitu avata" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Lukitusta ei käytetä NFS-liitetylle tiedostolle %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "Lukkoa %s ei saada" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Odotettiin %s, mutta sitä ei ollut" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Aliprosessi %s aiheutti suojausvirheen." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Aliprosessi %s palautti virhekoodin (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Aliprosessi %s lopetti odottamatta" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "Tiedostoa %s ei voitu avata" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "read, vielä %lu lukematta mutta tiedosto loppui" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "write, vielä %lu kirjoittamatta mutta epäonnistui" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "Pulmia tiedoston sulkemisessa" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "Pulmia tehtäessä tiedostolle unlink" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "Pulmia tehtäessä tiedostolle sync" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Pakettivarasto on tyhjä" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Pakettivarasto on turmeltunut" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Pakettivaraston versio on yhteensopimaton" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Tämä APT ei tue versionhallintajärjestelmää \"%s\"" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Pakettivarasto on tehty muulle arkkitehtuurille" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Riippuvuudet" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Esiriippuvuudet" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Ehdotukset" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Suosittelut" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Ristiriidat" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Korvaavuudet" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Täydet korvaavuudet" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "tärkeä" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "välttämätön" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "perus" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "valinnainen" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "ylimääräinen" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "Muodostetaan riippuvuussuhteiden puu" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "Mahdolliset versiot" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "Luodaan riippuvuudet" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "Yhdistetään saatavuustiedot" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Tiedoston %s avaaminen ei onnistunut" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Tiedoston %s kirjoittaminen ei onnistunut" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Pakettitiedostoa %s (1) ei voi jäsentää" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Pakettitiedostoa %s (2) ei voi jäsentää" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (Absoluuttinen dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Avataan %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Rivi %u on liian pitkä lähdeluettelossa %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Rivi %u on väärän muotoinen lähdeluettelossa%s (toimittajan tunniste)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2377,18 +2461,18 @@ msgstr "" "s Conflicts/Pre-Depends -kehämäärittelyn takia. Tämä on usein pahasta, mutta " "jos varmasti haluat tehdä niin, käytä APT::Force-LoopBreak -valitsinta." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Paketti %s olisi asennettava uudelleen, mutta sen arkistoa ei löydy." -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2396,181 +2480,197 @@ msgstr "" "Virhe, pkgProblemResolver::Resolve tuotti katkoja, syynä voi olla pysytetyt " "paketit." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Luettelokansio %spartial puuttuu." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Arkistokansio %spartial puuttuu." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Noudetaan tiedosto %li / %li (jäljellä %s)" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "Noudetaan tiedosto %li / %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Menetelmän ajuria %s ei löytynyt" -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Menetelmä %s ei käynnistynyt oikein" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Pistä levy nimeltään: \"%s\" asemaan \"%s\" ja paina Enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketointijärjestelmä \"%s\" ei ole tuettu" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "Sopivaa paketointijärjestelmän tyyppiä ei saa selvitettyä" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "stat %s ei onnistu." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Tiedostossa sources.list on oltava rivejä joissa \"lähde\"-URI" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Pakettiluettelonn tai tilatiedoston avaaminen tai jäsennys epäonnistui." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "Voit haluta suorittaa apt-get update näiden pulmien korjaamiseksi" -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Asetustiedostossa on virheellinen tietue, Package-otsikko puuttuu" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Tunnistetyyppi %s on tuntematon" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Tärkeysjärjestystä ei määritetty tunnisteelle (tai se on nolla)" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Pakettivaraston versionhallintajärjestelmä ei ole yhteensopiva" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Tapahtui virhe käsiteltäessä %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Tapahtui virhe käsiteltäessä %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Tapahtui virhe käsiteltäessä %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Tapahtui virhe käsiteltäessä %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Tapahtui virhe käsiteltäessä %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Tapahtui virhe käsiteltäessä %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Jummijammi, annoit enemmän pakettien nimiä kuin tämä APT osaa käsitellä." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Jummijammi, annoit enemmän versioita kuin tämä APT osaa käsitellä." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Jummijammi, annoit enemmän versioita kuin tämä APT osaa käsitellä." + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Jummijammi, annoit enemmän riippuvuuksia kuin tämä APT osaa käsitellä." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Tapahtui virhe käsiteltäessä %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Pakettia %s %s ei löytynyt käsiteltäessä tiedostojen riippuvuuksia." -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "stat ei toiminut lähdepakettiluettelolle %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "Kootaan tiedostojen tarjoamistietoja" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "MD5Sum ei täsmää" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2579,7 +2679,7 @@ msgstr "" "En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan " "tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)" -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2588,7 +2688,7 @@ msgstr "" "Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan " "tämän paketin itse." -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2596,7 +2696,7 @@ msgstr "" "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-" "kenttää." -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Koko ei täsmää" @@ -2605,7 +2705,7 @@ msgstr "Koko ei täsmää" msgid "Vendor block %s contains no fingerprint" msgstr "Toimittajan lohkosta %s puuttuu sormenjälki" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2614,54 +2714,56 @@ msgstr "" "Käytetään rompun liitoskohtaa %s\n" "Liitetään romppu\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "Tunnistetaan... " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "Tallennettu nimio: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Käytetään rompun liitoskohtaa %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "Irrotetaan romppu\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "Odotetaan levyä...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "Liitetään romppu...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "Etsitään levyltä hakemistotiedostoja...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "" "Asennuspakettien hakemistoja löytyi %i, lähdekoodipakettien hakemistoja %i " "ja allekirjoituksia %i\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "Tallennettu nimio: %s \n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "Tuo ei kelpaa nimeksi, yritä uudelleen.\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2670,95 +2772,99 @@ msgstr "" "Tämä levy on: \n" "\"%s\"\n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Kopioidaan pakettiluetteloita..." -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Kirjoitetaan uusi lähdeluettelo\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Tämän levyn lähdekoodipakettien luettelon tietueita ovat:\n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "Irrotetaan romppu..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Kirjoitettiin %i tietuetta.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa tiedostoa.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Kirjoitettiin %i tietuetta joissa oli %i paritonta tiedostoa\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa ja %i paritonta " "tiedostoa\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Valmistellaan %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Puretaan %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Valmistaudutaan tekemään asetukset: %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Tehdään asetukset: %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "%s asennettu" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Valmistaudutaan poistamaan %s" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Poistetaan %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "%s poistettu" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Valmistaudutaan poistamaan %s kokonaan" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "%s poistettiin kokonaan" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "Tiedostoa %s ei voitu avata" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Yhteys katkesi ennenaikaisesti" @@ -2766,9 +2872,6 @@ msgstr "Yhteys katkesi ennenaikaisesti" #~ msgid "File date has changed %s" #~ msgstr "Tiedoston uusi päiväys %s" -#~ msgid "Could not patch file" -#~ msgstr "Tiedostoa %s ei voitu avata" - #~ msgid "Reading file list" #~ msgstr "Luetaan tiedostoluetteloa" diff --git a/po/fr.po b/po/fr.po index ef2378fb6..4362dc2c2 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2007-05-08 11:30+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" @@ -18,145 +18,155 @@ msgstr "" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Le paquet %s de version %s contient une dpendance absente:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Impossible de trouver le paquet %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "Nombre total de paquets: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Paquets ordinaires: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Paquets entirement virtuels: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Paquets virtuels simples: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Paquets virtuels mixtes: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Manquants: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Nombre de versions distinctes: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Nombre de versions distinctes: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Nombre de dpendances: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Nombre de relations version/fichier: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Nombre de relations version/fichier: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Nombre de relations Provides: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Nombre de motifs rationnels: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Espace occup par les versions des dpendances: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Espace disque gaspill: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Total de l'espace attribu: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Fichier %s dsynchronis." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Vous devez fournir exactement un motif" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Aucun paquet n'a t trouv" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Fichiers du paquet:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Le cache est dsynchronis, impossible de rfrencer un fichier" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Paquets tiquets:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(non trouv)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Install: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(aucun)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Candidat: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " tiquette de paquet: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Table de version:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pour %s %s est compil le %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -235,11 +245,13 @@ msgstr "" #: cmdline/apt-cdrom.cc:78 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "Veuillez indiquer le nom de ce disque, par exemple Debian 2.1r1 Disk 1" +msgstr "" +"Veuillez indiquer le nom de ce disque, par exemple Debian 2.1r1 Disk 1" #: cmdline/apt-cdrom.cc:93 msgid "Please insert a Disc in the drive and press enter" -msgstr "Veuillez insrer un disque dans le lecteur et appuyez sur la touche Entre" +msgstr "" +"Veuillez insrer un disque dans le lecteur et appuyez sur la touche Entre" #: cmdline/apt-cdrom.cc:117 msgid "Repeat this process for the rest of the CDs in your set." @@ -308,40 +320,41 @@ msgstr "" " -c=? Lit ce fichier de configuration\n" " -o=? Spcifie une option de configuration, p.ex. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "Impossible d'crire sur %s" #: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Impossible d'obtenir la version de debconf. Est-ce que debconf est install?" +msgstr "" +"Impossible d'obtenir la version de debconf. Est-ce que debconf est install?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "La liste d'extension du paquet est trop longue" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "Erreur lors du traitement du rpertoire %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "La liste d'extension des sources est trop grande" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Erreur lors de l'criture de l'en-tte du fichier contenu" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Erreur du traitement du contenu %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -424,26 +437,27 @@ msgstr "" " -c=? Lit ce fichier de configuration\n" " -o=? Place une option de configuration arbitraire" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Aucune slection ne correspond" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" -msgstr "Quelques fichiers sont manquants dans le groupe de fichiers de paquets %s" +msgstr "" +"Quelques fichiers sont manquants dans le groupe de fichiers de paquets %s" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Base de donnes corrompue, fichier renomm en %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Base de donnes ancienne, tentative de mise jour de %s\"" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." @@ -451,106 +465,106 @@ msgstr "" "Le format de la base de donnes n'est pas valable. Si vous mettez APT " "jour, veuillez supprimer puis recrer la base de donnes." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Impossible d'ouvrir le fichier de base de donnes %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "Impossible de statuer %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "L'archive n'a pas d'enregistrement de contrle" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Impossible d'obtenir un curseur" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: Impossible de lire le contenu du rpertoire %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: Impossible de statuer %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "A: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "E: des erreurs sont survenues sur le fichier " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "Impossible de rsoudre %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "chec du parcours de l'arbre" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "Impossible d'ouvrir %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr " Dlier %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "Impossible de lire le lien %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "Impossible de dlier %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Impossible de lier %s %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Seuil de delink de %so atteint.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "L'archive ne possde pas de champ de paquet" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr "%s ne possde pas d'entre override\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " le responsable de %s est %s et non %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr " %s ne possde pas d'entre source override\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s ne possde pas galement pas d'entre binary override\n" @@ -564,165 +578,165 @@ msgstr "Erreur interne, ne peut localiser la partie %s" msgid "realloc - Failed to allocate memory" msgstr "realloc - chec de l'allocation de mmoire" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Impossible d'ouvrir %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Entre override %s mal forme ligne %lu n1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Entre override %s mal forme %lu n2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Entre override %s mal forme %lu n3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Impossible de lire le fichier d'override %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algorithme de compression %s inconnu" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "La sortie compresse %s a besoin d'un ensemble de compression" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Impossible de crer le tube IPC sur le sous-processus" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "Impossible de crer FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "chec du fork" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "Fils compress" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "Erreur interne, impossible de crer %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "Impossible de crer un sous-processus IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "Impossible d'excuter la compression " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "dcompacteur" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "chec d'entre/sortie du sous-processus sur le fichier" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "Impossible de lire lors du calcul de la somme MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "Problme en dliant %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Impossible de changer le nom %s en %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "O" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "Erreur de compilation de l'expression rationnelle - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "Les paquets suivants contiennent des dpendances non satisfaites:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "mais %s est install" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "mais %s devra tre install" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "mais il n'est pas installable" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "mais c'est un paquet virtuel" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "mais il n'est pas install" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "mais ne sera pas install" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " ou" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "Les NOUVEAUX paquets suivants seront installs:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "Les paquets suivants seront ENLEVS:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "Les paquets suivants ont t conservs:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "Les paquets suivants seront mis jour:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "Les paquets suivants seront mis une VERSION INFRIEURE:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "Les paquets retenus suivants seront changs:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (en raison de %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -731,137 +745,139 @@ msgstr "" "Vous NE devez PAS faire ceci, moins de savoir exactement ce\n" "que vous tes en train de faire." -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu mis jour, %lu nouvellement installs, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu rinstalls, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu remis une version infrieure, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu enlever et %lu non mis jour.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu partiellement installs ou enlevs.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Correction des dpendances..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " a chou." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Impossible de corriger les dpendances" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Impossible de minimiser le nombre des paquets mis jour" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Fait" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Vous pouvez lancer apt-get -f install pour corriger ces problmes." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Dpendances manquantes. Essayez d'utiliser l'option -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ATTENTION: les paquets suivants n'ont pas t authentifis." -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Avertissement d'authentification ignor.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Faut-il installer ces paquets sans vrification (o/N)? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Certains paquets n'ont pas pu tre authentifis" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Il y a des problmes et -y a t employ sans --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Erreur interne, InstallPackages appel avec des paquets casss." -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." -msgstr "Les paquets doivent tre enlevs mais la dsinstallation est dsactive." +msgstr "" +"Les paquets doivent tre enlevs mais la dsinstallation est dsactive." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Erreur interne. Le tri a t interrompu." -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "Impossible de verrouiller le rpertoire de tlchargement" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "La liste des sources ne peut tre lue." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "trangement, les tailles ne correspondent pas. Veuillez le signaler par " "courriel apt@packages.debian.org." -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Il est ncessaire de prendre %so/%so dans les archives.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Il est ncessaire de prendre %so dans les archives.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Aprs dpaquetage, %so d'espace disque supplmentaires seront utiliss.\n" +msgstr "" +"Aprs dpaquetage, %so d'espace disque supplmentaires seront utiliss.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Aprs dpaquetage, %so d'espace disque seront librs.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossible de dterminer l'espace disponible sur %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Pas assez d'espace disponible sur %s" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "L'option --trivial-only a t indique mais il ne s'agit pas d'une opration " @@ -869,11 +885,11 @@ msgstr "" # The space before the exclamation mark must not be a non-breaking space; this # sentence is supposed to be typed by a user who cannot see the difference. -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Oui, faites ce que je vous dis !" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -884,28 +900,28 @@ msgstr "" "Pour continuer, tapez la phrase %s\n" "?]" -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "Annulation." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Souhaitez-vous continuer [O/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossible de rcuprer %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Certains fichiers n'ont pu tre tlchargs." -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "Tlchargement achev et dans le mode tlchargement uniquement" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -913,47 +929,48 @@ msgstr "" "Impossible de rcuprer quelques archives, peut-tre devrez-vous lancer apt-" "get update ou essayer avec --fix-missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" -msgstr "l'option --fix-missing et l'change de support ne sont pas encore reconnus." +msgstr "" +"l'option --fix-missing et l'change de support ne sont pas encore reconnus." -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Impossible de corriger le fait que les paquets manquent." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Annulation de l'installation." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Note, slection de %s au lieu de %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Passe %s, il est dj install et la mise jour n'est pas prvue.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Le paquet %s n'est pas install, et ne peut donc tre supprim\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Le paquet %s est un paquet virtuel fourni par:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Install]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Vous devez explicitement slectionner un paquet installer." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -965,49 +982,50 @@ msgstr "" "devenu obsolte\n" "ou qu'il n'est disponible que sur une autre source\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Cependant les paquets suivants le remplacent:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Aucun paquet ne correspond au paquet %s" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "La rinstallation de %s est impossible, il ne peut pas tre tlcharg.\n" +msgstr "" +"La rinstallation de %s est impossible, il ne peut pas tre tlcharg.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s est dj la plus rcente version disponible.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "La version %s de %s est introuvable" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "La version %s de %s n'a pu tre trouve" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Version choisie %s (%s) pour %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "La commande de mise jour ne prend pas d'argument" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Impossible de verrouiller le rpertoire de liste" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1015,25 +1033,68 @@ msgstr "" "Le tlchargement de quelques fichiers d'index a chou, ils ont t " "ignors, ou les anciens ont t utiliss la place." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Les NOUVEAUX paquets suivants seront installs:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "L'information suivante devrait vous aider rsoudre la situation: " + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "" +"Erreur interne, la tentative de rsolution du problme a cass certaines " +"parties" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erreur interne, AllUpgrade a cass le boulot!" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Impossible de trouver le paquet %s" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "Impossible de trouver le paquet %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, slectionne %s pour l'expression rationnelle %s\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "mais %s devra tre install" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "Vous pouvez lancer apt-get -f install pour corriger ces problmes:" +msgstr "" +"Vous pouvez lancer apt-get -f install pour corriger ces problmes:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1041,7 +1102,7 @@ msgstr "" "Dpendances non satisfaites. Essayez apt-get -f install sans paquet\n" "(ou indiquez une solution)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1053,7 +1114,7 @@ msgstr "" "la distribution unstable, que certains paquets n'ont pas encore\n" "t crs ou ne sont pas sortis d'Incoming." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1062,123 +1123,134 @@ msgstr "" "Puisque vous n'avez demand qu'une seule opration, le paquet n'est\n" "probablement pas installable et vous devriez envoyer un rapport de bogue." -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "L'information suivante devrait vous aider rsoudre la situation: " - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "Paquets dfectueux" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "Les paquets supplmentaires suivants seront installs: " -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "Paquets suggrs:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "Paquets recommands:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "Calcul de la mise jour... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "chec" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "Fait" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "" "Erreur interne, la tentative de rsolution du problme a cass certaines " "parties" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "Vous devez spcifier au moins un paquet source" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossible de trouver une source de paquet pour %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saut du tlchargement du fichier %s, dj tlcharg\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "Pas assez d'espace disponible sur %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Ncessit de prendre %so/%so dans les sources.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Ncessit de prendre %so dans les sources.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "Rcupration des sources %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "chec lors de la rcupration de quelques archives." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saut du dcompactage des paquets sources dj dcompacts dans %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "La commande de dcompactage %s a chou.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Veuillez vrifier si le paquet dpkg-dev est install.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "La commande de construction %s a chou.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "chec du processus fils" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "" "Il faut spcifier au moins un paquet pour vrifier les dpendances de " "construction" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossible d'obtenir les dpendances de construction pour %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "%s n'a pas de dpendance de construction.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1187,7 +1259,7 @@ msgstr "" "La dpendance %s vis--vis de %s ne peut tre satisfaite car le paquet %s ne " "peut tre trouv" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1196,32 +1268,34 @@ msgstr "" "La dpendance %s vis--vis de %s ne peut tre satisfaite car aucune version " "du paquet %s ne peut satisfaire la version requise" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Impossible de satisfaire la dpendance %s pour %s: le paquet install %s " "est trop rcent" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Impossible de satisfaire les dpendances %s pour %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "Les dpendances de compilation pour %s ne peuvent pas tre satisfaites." +msgstr "" +"Les dpendances de compilation pour %s ne peuvent pas tre satisfaites." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "Impossible d'activer les dpendances de construction" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "Modules reconnus:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1236,6 +1310,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1394,7 +1469,8 @@ msgstr "" "seules les erreurs" #: dselect/install:103 -msgid "above this message are important. Please fix them and run [I]nstall again" +msgid "" +"above this message are important. Please fix them and run [I]nstall again" msgstr "" "prcdant ce message sont importantes. Veuillez les corriger et\n" "dmarrer l'[I]nstallation une nouvelle fois." @@ -1403,190 +1479,190 @@ msgstr "" msgid "Merging available information" msgstr "Fusion des informations disponibles" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "chec de cration de tubes" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Impossible d'excuter gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Archive corrompue" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "chec dans la somme de contrle de tar, l'archive est corrompue" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Type d'en-tte %u inconnu pour TAR, partie %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Signature d'archive invalide" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Erreur de lecture de l'en-tte du membre d'archive" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "En-tte du membre d'archive non-valide" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "L'archive est trop petite" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "chec de la lecture des en-ttes d'archive" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode appel sur un nud toujours li" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Impossible de situer l'lment hach!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "chec lors de l'allocation de la dviation" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Erreur interne dans AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Essaye d'craser une dviation, %s -> %s et %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Addition double d'une dviation %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Fichier de configuration en double %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Erreur d'criture du fichier %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "chec de clture du fichier %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Le chemin %s est trop long" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Veuillez dcompresser %s plus d'une fois" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Le rpertoire %s est dtourn" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Le paquet est en train d'essayer d'crire sur la cible dtourne %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Le chemin de dviation est trop long" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Le rpertoire %s va tre remplac par un non-rpertoire" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "chec pour localiser le nud dans la table de hachage" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Le chemin est trop long" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "crase la correspondance de paquet sans version pour %s " -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Le fichier %s/%s crase celui inclus dans le paquet %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Impossible de lire %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Impossible de statuer pour %s." -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Impossible de supprimer %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Impossible de crer %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Impossible de statuer pour %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "" "Les rpertoires info et temp doivent se trouver sur le mme systme de " "fichiers" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "Lecture des listes de paquets" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Impossible de changer pour le rpertoire d'administration %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "Erreur interne lors de l'obtention d'un nom de paquet" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Lecture de la liste de fichiers" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1597,77 +1673,78 @@ msgstr "" "pas restaurer ce fichier, veuillez le vider et rinstaller immdiatement " "la mme version du paquet!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "chec de la lecture du fichier de liste %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Erreur interne lors de l'obtention d'un Nud" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Impossible d'ouvrir le fichier des dviations %sdiversions " -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Le fichier des dviations est corrompu" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "Ligne invalide dans le fichier des dviations: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Erreur interne en ajoutant une dviation" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Le cache des paquets doit tre initialis en premier" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Impossible de trouver un en-tte Package:, dcalage %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Mauvaise section ConfFile dans le fichier status. Dcalage %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Erreur lors du traitement de la somme MD5. Dcalage %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Ce n'est pas une archive DEB valide, partie %s manquante" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "Ce n'est pas une archive DEB valide, elle n'a pas de membre %s ou %s" +msgstr "" +"Ce n'est pas une archive DEB valide, elle n'a pas de membre %s ou %s" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "Impossible d'accder %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "Erreur interne, ne peut localiser le membre" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "Impossible de localiser un fichier de contrle valide" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "Fichier de contrle non traitable" @@ -1704,11 +1781,12 @@ msgid "File not found" msgstr "Fichier non trouv" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Impossible de statuer" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Impossible de modifier l'heure " @@ -1755,7 +1833,8 @@ msgstr "" #: methods/ftp.cc:265 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "La commande %s du script de connexion a chou, le serveur a rpondu: %s" +msgstr "" +"La commande %s du script de connexion a chou, le serveur a rpondu: %s" #: methods/ftp.cc:291 #, c-format @@ -1770,7 +1849,7 @@ msgstr "D msgid "Server closed the connection" msgstr "Le serveur a ferm la connexion" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "Erreur de lecture" @@ -1782,7 +1861,7 @@ msgstr "Une r msgid "Protocol corruption" msgstr "Corruption du protocole" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "Erreur d'criture" @@ -1792,7 +1871,8 @@ msgstr "Impossible de cr #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" -msgstr "Impossible de se connecter sur le port de donnes, dlai de connexion dpass" +msgstr "" +"Impossible de se connecter sur le port de donnes, dlai de connexion dpass" #: methods/ftp.cc:704 msgid "Could not connect passive socket." @@ -1836,7 +1916,7 @@ msgstr "D msgid "Unable to accept connection" msgstr "Impossible d'accepter une connexion" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problme de hachage du fichier" @@ -1863,39 +1943,39 @@ msgstr "Requ msgid "Unable to invoke " msgstr "Impossible d'invoquer " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Connexion %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Impossible de crer de connexion pour %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Impossible d'initialiser la connexion %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Connexion %s:%s (%s) impossible, dlai de connexion dpass" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Connexion %s:%s (%s) impossible." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Connexion %s" @@ -1929,10 +2009,12 @@ msgstr "Impossible d'acc #: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "E: liste de paramtres trop longue pour Acquire::gpgv::Options. Abandon." +msgstr "" +"E: liste de paramtres trop longue pour Acquire::gpgv::Options. Abandon." #: methods/gpgv.cc:204 -msgid "Internal error: Good signature, but could not determine key fingerprint?!" +msgid "" +"Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erreur interne: signature correcte, mais il est impossible de dterminer " "l'empreinte de la cl." @@ -1974,429 +2056,453 @@ msgstr "Ne parvient pas msgid "Read error from %s process" msgstr "Erreur de lecture du processus %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Attente des fichiers d'en-tte" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "J'ai une simple ligne d'en-tte au-dessus du caractre %u" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Mauvaise ligne d'en-tte" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Le serveur http a envoy une rponse dont l'en-tte est invalide" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Le serveur http a envoy un en-tte Content-Length invalide" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Le serveur http a envoy un en-tte Content-Range invalide" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Ce serveur http possde un support des limites non-valide" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Format de date inconnu" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Slection dfaillante" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Dlai de connexion dpass" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Erreur d'criture du fichier de sortie" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Erreur d'criture sur un fichier" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Erreur d'criture sur le fichier" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Erreur de lecture depuis le serveur distant et clture de la connexion" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Erreur de lecture du serveur" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Mauvais en-tte de donne" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "chec de la connexion" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Erreur interne" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "Impossible de mapper un fichier vide en mmoire" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Impossible de raliser un mapping de %lu octets en mmoire" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "La slection %s n'a pu tre trouve" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Type d'abrviation non reconnue: %c" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "Ouverture du fichier de configuration %s" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "La ligne %d est trop longue (maxi %d)" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Erreur syntaxique %s:%u: le bloc commence sans aucun nom." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Erreur syntaxique %s:%u: balise mal forme" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Erreur syntaxique %s:%u: valeur suivie de choses illicites" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Erreur syntaxique %s:%u: ces directives ne peuvent tre appliques qu'au " "niveau le plus haut" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Erreur syntaxique %s:%u:trop de niveaux d'imbrication d'includes" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Erreur syntaxique %s:%u: inclus partir d'ici" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Erreur syntaxique %s:%u: directive %s non tolre" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Erreur syntaxique %s:%u: valeur aberrante la fin du fichier" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Erreur!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... Fait" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "L'option %c de la ligne de commande [d'origine %s] est inconnue." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "L'option %s de la ligne de commande n'est pas reconnue" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "L'option %s de la ligne de commande n'est pas une valeur boolenne" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "L'option %s ncessite un argument." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Option %s: l'item configuration doit tre spcifie avec un =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "L'option %s prend un nombre entier en argument, et non %s" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "L'option %s est trop longue" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "La signification %s n'est pas comprise, veuillez essayer vrai ou faux." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "L'opration %s n'est pas valable" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Impossible de localiser le point de montage %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Impossible d'accder %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "Impossible d'accder au cdrom." -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Verrou non utilis pour le fichier %s en lecture seule" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "Impossible d'ouvrir le fichier verrou %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Verrou non utilis pour le fichier %s se situant sur une partition nfs" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "Impossible de verrouiller %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "A attendu %s mais il n'tait pas prsent" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Le sous-processus %s a commis une violation d'accs mmoire" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Le sous-processus %s a renvoy un code d'erreur (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Le sous-processus %s s'est arrt prmaturment" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "Impossible de verrouiller %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "lu(s), %lu restant lire, mais rien n'est disponible" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "crit(s), %lu restant crire, mais l'criture est impossible" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "Problme de fermeture du fichier" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "Problme d'effacement du fichier" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "Problme de synchronisation du fichier" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Cache des paquets vide" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Le fichier de cache des paquets est corrompu" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Le fichier de cache des paquets a une version incompatible" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Cet APT ne supporte pas le systme de version %s" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Le cache des paquets a t construit pour une architecture diffrente" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Dpend" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Pr-Dpend" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Suggre" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Recommande" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Est en conflit avec" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Remplace" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Rend obsolte" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "important" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "ncessaire" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "optionnel" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "supplmentaire" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "Construction de l'arbre des dpendances" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "Versions possibles" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "Gnration des dpendances" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "Fusion des informations disponibles" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Impossible d'ouvrir %s" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Erreur d'criture du fichier %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Impossible de traiter le fichier %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Impossible de traiter le fichier %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Ligne %lu mal forme dans le fichier de source %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Ligne %lu mal forme dans la liste de sources %s (distribution)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Ligne %lu mal forme dans la liste des sources %s (analyse de l'URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "Ligne %lu mal forme dans la liste des sources %s (distribution absolue)" +msgstr "" +"Ligne %lu mal forme dans la liste des sources %s (distribution absolue)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "Ligne %lu mal forme dans la liste des sources %s (analyse de distribution)" +msgstr "" +"Ligne %lu mal forme dans la liste des sources %s (analyse de distribution)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Ouverture de %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "La ligne %u du fichier des listes de sources %s est trop longue." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Ligne %u mal forme dans la liste des sources %s (type)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Le type %s est inconnu sur la ligne %u dans la liste des sources %s" +msgstr "" +"Le type %s est inconnu sur la ligne %u dans la liste des sources %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "Ligne %u mal forme dans la liste des sources %s (identifiant du fournisseur)" +msgstr "" +"Ligne %u mal forme dans la liste des sources %s (identifiant du fournisseur)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2408,19 +2514,20 @@ msgstr "" "Depends. C'est souvent une mauvaise chose, mais si vous souhaitez rellement " "le faire, activez l'option APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Le type de fichier d'index %s n'est pas accept" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format -msgid "The package %s needs to be reinstalled, but I can't find an archive for it." +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Le paquet %s doit tre rinstall, mais je ne parviens pas trouver son " "archive." -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2428,193 +2535,214 @@ msgstr "" "Erreur, pkgProblemResolver::Resolve a gnr des ruptures, ce qui a pu tre " "caus par les paquets devant tre gards en l'tat." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Impossible de corriger les problmes, des paquets dfecteux sont en mode " "garder en l'tat." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Le rpertoire %spartial pour les listes n'existe pas." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Le rpertoire d'archive %spartial n'existe pas." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Tlchargement du fichier %li de %li (%s restant)" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "Tlchargement du fichier %li de %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Le pilote pour la mthode %s n'a pu tre trouv." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "La mthode %s n'a pas dmarr correctement" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Veuillez insrer le disque %s dans le lecteur %s et appuyez sur la " "touche Entre." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Le systme de paquet %s n'est pas support" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "Impossible de dterminer un type du systme de paquets adquat" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Impossible de localiser %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" -msgstr "Vous devez insrer quelques adresses sources dans votre sources.list" +msgstr "" +"Vous devez insrer quelques adresses sources dans votre sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Les listes de paquets ou le fichier status ne peuvent tre analyss ou " "lus." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "Vous pouvez lancer apt-get update pour corriger ces problmes." -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "" "Enregistrement invalide dans votre fichier prfrences, aucune entre " "Package." -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "tiquette %s inconnue" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Aucune priorit (ou zro) n'a t spcifie pour l'tiquette" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Le cache possde un systme de version incompatible" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Erreur apparue lors du traitement de %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Erreur apparue lors du traitement de %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Erreur apparue lors du traitement de %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Erreur apparue lors du traitement de %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Erreur apparue lors du traitement de %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Erreur apparue lors du traitement de %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Erreur apparue lors du traitement de %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Vous avez dpass le nombre de noms de paquets que cet APT est capable de " "traiter." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "Vous avez dpass le nombre de versions que cet APT est capable de traiter." +msgstr "" +"Vous avez dpass le nombre de versions que cet APT est capable de traiter." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"Vous avez dpass le nombre de versions que cet APT est capable de traiter." + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Vous avez dpass le nombre de dpendances que cet APT est capable de " "traiter." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Erreur apparue lors du traitement de %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Erreur apparue lors du traitement de %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Le paquet %s %s n'a pu tre trouv lors du traitement des dpendances des " "fichiers" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "Impossible de localiser la liste des paquets sources %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "Assemblage des fichiers lists dans les champs Provides" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" -msgstr "Erreur d'entre/sortie lors de la sauvegarde du fichier de cache des sources" +msgstr "" +"Erreur d'entre/sortie lors de la sauvegarde du fichier de cache des sources" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "impossible de changer le nom, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Somme de contrle MD5 incohrente" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" -msgstr "Aucune cl publique n'est disponible pour la/les cl(s) suivante(s):\n" +msgstr "" +"Aucune cl publique n'est disponible pour la/les cl(s) suivante(s):\n" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2624,7 +2752,7 @@ msgstr "" "sans doute que vous devrez corriger ce paquet manuellement (absence " "d'architecture)." -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2633,14 +2761,15 @@ msgstr "" "Je ne suis pas parvenu localiser un fichier du paquet %s. Ceci signifie " "que vous devrez corriger manuellement ce paquet." -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format -msgid "The package index files are corrupted. No Filename: field for package %s." +msgid "" +"The package index files are corrupted. No Filename: field for package %s." msgstr "" "Les fichiers d'index des paquets sont corrompus. Aucun champ Filename: " "pour le paquet %s." -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Taille incohrente" @@ -2649,7 +2778,7 @@ msgstr "Taille incoh msgid "Vendor block %s contains no fingerprint" msgstr "Le bloc de fournisseur %s ne comporte pas d'empreinte" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2658,52 +2787,54 @@ msgstr "" "Utilisation du point de montage %s pour le cdrom\n" "Montage du cdrom\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "Identification..." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "tiquette stocke: %s\n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Utilisation du point de montage %s pour le cdrom\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "Dmontage du cdrom\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "Attente du disque...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "Montage du cdrom...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "Examen du disque la recherche de fichiers d'index...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "%i index de paquets trouvs, %i index de sources et %i signatures\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, c-format msgid "Found label '%s'\n" msgstr "tiquette %s trouve\n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "Ce nom n'est pas valable, veuillez recommencer.\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2712,95 +2843,99 @@ msgstr "" "Ce disque s'appelle:\n" "%s\n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Copie des listes de paquets..." -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "criture de la nouvelle liste de sources\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Les entres de listes de sources pour ce disque sont:\n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 msgid "Unmounting CD-ROM...\n" msgstr "Dmontage du cdrom...\n" -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "%i enregistrements crits.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i enregistrements crits avec %i fichiers manquants.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i enregistrements crits avec %i fichiers qui ne correspondent pas\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "%i enregistrements crits avec %i fichiers manquants et %i qui ne " "correspondent pas\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Prparation de %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Dcompression de %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Prparation de la configuration de %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Configuration de %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "%s install" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Prparation de la suppression de %s" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Suppression de %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "%s supprim" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Prparation de la suppression complte de %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "%s compltement supprim" +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Impossible de verrouiller %s" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Connexion ferme prmaturment" - diff --git a/po/gl.po b/po/gl.po index 9331d6c8f..7cde396c2 100644 --- a/po/gl.po +++ b/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2007-02-28 13:14+0100\n" "Last-Translator: Jacobo Tarrío \n" "Language-Team: Galician \n" @@ -14,147 +14,157 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "O paquete %s versión %s ten unha dependencia incumprida:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Non se puido atopar o paquete %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "Número total de nomes de paquetes : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Paquetes normais: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Paquetes virtuais puros: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Paquetes virtuais simples: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Paquetes virtuais mixtos: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Non atopados: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Número total de versións distintas: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Número total de versións distintas: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Número total de dependencias: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Número total de relacións versión/ficheiro: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Número total de relacións versión/ficheiro: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Número total de mapas de Provides: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Número total de cadeas: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Espazo total de versións de dependencias: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Espazo de reserva total: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Espazo total contabilizado: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "O ficheiro de paquete %s está sen sincronizar." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Debe fornecer exactamente un patrón" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Non se atopou ningún paquete" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Ficheiros de paquetes:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "A caché está sen sincronizar, non se pode facer referencia a un ficheiro de " "paquetes" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Paquetes inmobilizados:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(non se atopou)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Instalado: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(ningún)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Candidato: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Inmobilizado: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Táboa de versións:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado en %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -305,7 +315,7 @@ msgstr "" " -o=? Estabrece unha opción de configuración, por exemplo: -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "Non se puido escribir en %s" @@ -314,31 +324,31 @@ msgstr "Non se puido escribir en %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Non se puido obter a versión de debconf. ¿Debconf está instalado?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "A lista de extensións de paquetes é longa de máis" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "Erro ao procesar o directorio %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "A lista de extensións de fontes é longa de máis" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Erro ao gravar a cabeceira no ficheiro de contido" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Erro ao procesar o contido %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -423,27 +433,27 @@ msgstr "" " -c=? Le este ficheiro de configuración\n" " -o=? Estabrece unha opción de configuración" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Ningunha selección encaixou" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Fallan ficheiros no grupo de ficheiros de paquetes \"%s\"" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "" "A base de datos estaba corrompida, cambiouse o nome do ficheiro a %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "A base de datos é antiga, trátase de actualizar %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." @@ -451,106 +461,106 @@ msgstr "" "O formato da base de datos non é válido. Se actualizou desde unha versión " "antiga de apt, elimine e volva crear a base de datos." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Non se puido abrir o ficheiro de base de datos %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "Non se atopou %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "O arquivo non ten un rexistro de control" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Non se puido obter un cursor" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: Non se puido ler o directorio %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: Non se atopou %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "A: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "E: Os erros aplícanse ao ficheiro " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "Non se puido resolver %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "O percorrido da árbore fallou" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "Non se puido abrir %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr " DesLig %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "Non se puido ler a ligazón %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "Non se puido borrar %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Non se puido ligar %s con %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Alcanzouse o límite de desligado de %sB.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "O arquivo non tiña un campo Package" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s non ten unha entrada de \"override\"\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " O mantedor de %s é %s, non %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr " %s non ten unha entrada de \"override\" de código fonte\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s tampouco ten unha entrada de \"override\" de binarios\n" @@ -564,165 +574,165 @@ msgstr "Erro interno, non se puido atopar o membro %s" msgid "realloc - Failed to allocate memory" msgstr "realloc - Non se puido reservar memoria" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Non se puido abrir %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "\"Override\" %s liña %lu mal formado (1)" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "\"Override\" %s liña %lu mal formado (2)" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "\"Override\" %s liña %lu mal formado (3)" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Non se puido ler o ficheiro de \"overrides\" %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritmo de compresión \"%s\" descoñecido" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "A saída comprimida %s precisa dun xogo de compresión" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Non se puido crear a canle IPC ao subproceso" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "Non se puido crear o FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "Non se puido chamar a fork" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "Fillo de compresión" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "Erro interno, non se puido crear %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "Non se puido crear o IPC do subproceso" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "Non se puido executar o compresor " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "descompresor" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "A E/S ao subproceso/ficheiro fallou" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "Non se puido ler ao calcular o MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "Problema ao borrar %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Non se puido cambiar o nome de %s a %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "Erro na compilación da expresión regular - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "Os seguintes paquetes teñen dependencias sen cumprir:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "pero %s está instalado" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "pero hase instalar %s" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "pero non é instalable" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "pero é un paquete virtual" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "pero non está instalado" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "pero non se ha instalar" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " ou" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "Os seguintes paquetes NOVOS hanse instalar:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "Os seguintes paquetes hanse ELIMINAR:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "Os seguintes paquetes consérvanse:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "Os seguintes paquetes hanse actualizar:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "Os seguintes paquetes hanse DESACTUALIZAR:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "Os seguintes paquetes retidos hanse modificar:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (debido a %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -730,144 +740,144 @@ msgstr "" "AVISO: Hanse eliminar os seguintes paquetes esenciais.\n" "¡Isto NON se debe facer a menos que saiba exactamente o que está a facer!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualizados, %lu instalados, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualizados, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu hanse eliminar e %lu sen actualizar.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu non instalados ou eliminados de todo.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "A corrixir as dependencias..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " fallou." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Non se puido corrixir as dependencias." -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Non se puido minimizar o xogo de actualizacións" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Rematado" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Pode querer executar \"apt-get -f install\" para corrixilos." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Dependencias incumpridas. Probe a empregar -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO: ¡Non se poden autenticar os seguintes paquetes!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Ignórase o aviso de autenticación.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "¿Instalar estes paquetes sen verificación [s/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Non se puido autenticar algúns paquetes" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Houbo problemas e empregouse -y sen --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Erro interno, chamouse a InstallPackages con paquetes rotos." -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Hai que eliminar paquetes pero a eliminación está desactivada." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Erro interno, a ordeación non rematou" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "Non se puido bloquear o directorio de descargas" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Non se puido ler a lista de orixes." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Que raro... Os tamaños non coinciden, envíe email a apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Hai que recibir %sB/%sB de arquivos.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Hai que recibir %sB de arquivos.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Despois de desempaquetar hanse ocupar %sB de disco adicionais.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Despois de desempaquetar hanse liberar %sB de disco.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "Non se puido determinar o espazo libre en %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Non hai espazo libre de abondo en %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Especificouse \"Só Triviais\" pero esta non é unha operación trivial." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "¡Si, fai o que digo!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -878,28 +888,28 @@ msgstr "" "Para continuar escriba a frase \"%s\"\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "Abortar." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "¿Quere continuar [S/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Non se puido obter %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Non se puido descargar algúns ficheiros" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "Completouse a descarga no modo de só descargas" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -907,49 +917,49 @@ msgstr "" "Non se puido obter algúns arquivos; probe con apt-get update ou --fix-" "missing." -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "O emprego conxunto de --fix-missing e intercambio de discos non está " "soportado" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Non se puido corrixir os paquetes non dispoñibles." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "A abortar a instalación." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, escóllese %s no canto de %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Omítese %s, xa está instalado e non se especificou a actualización.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "O paquete %s non está instalado, así que non se eliminou\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "O paquete %s é un paquete virtual fornecido por:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Instalado]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Debería escoller un para instalar." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -960,49 +970,49 @@ msgstr "" "Isto pode significar que o paquete falla, está obsoleto ou só está\n" "dispoñible noutra fonte.\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Nembargantes, os seguintes paquetes substitúeno:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "O paquete %s non ten un candidato para a instalación" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "A reinstalación de %s non é posible, non se pode descargar.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s xa é a versión máis recente.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Non se atopou a versión \"%s\" de \"%s\"" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Non se atopou a versión \"%s\" de \"%s\"" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Escolleuse a versión %s (%s) de %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "A orde \"update\" non toma argumentos" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Non se puido bloquear o directorio de listas" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1010,25 +1020,65 @@ msgstr "" "Non se puido descargar algúns ficheiros de índices; ignoráronse ou " "empregáronse uns vellos no seu lugar." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Os seguintes paquetes NOVOS hanse instalar:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "A seguinte información pode axudar a resolver a situación:" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Erro interno, o resolvedor interno rompeu cousas" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro interno, AllUpgrade rompeu cousas" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Non se puido atopar o paquete %s" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "Non se puido atopar o paquete %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, escóllese %s para a expresión regular \"%s\"\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "pero hase instalar %s" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Pode querer executar \"apt-get -f install\" corrixir isto:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1036,7 +1086,7 @@ msgstr "" "Dependencias incumpridas. Probe \"apt-get -f install\" sen paquetes (ou " "especifique unha solución)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1047,7 +1097,7 @@ msgstr "" "unha situación imposible ou, se emprega a distribución inestable, que\n" "algúns paquetes solicitados aínda non se crearon ou moveron de Incoming." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1056,122 +1106,133 @@ msgstr "" "Xa que só solicitou unha soa operación, é bastante probable que o\n" "paquete non sea instalable e que se deba informar dun erro no paquete." -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "A seguinte información pode axudar a resolver a situación:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "Paquetes rotos" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "Hanse instalar os seguintes paquetes extra:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "Paquetes suxiridos:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "Paquetes recomendados:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "A calcular a actualización... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Fallou" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "Rematado" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "Erro interno, o resolvedor interno rompeu cousas" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "" "Ten que especificar alomenos un paquete para lle descargar o código fonte" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "Non se puido atopar un paquete fonte para %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Omítese o ficheiro xa descargado \"%s\"\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "Non hai espazo libre de abondo en %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Hai que recibir %sB/%sB de arquivos de fonte.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Hai que recibir %sB de arquivos de fonte.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "Obter fonte %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "Non se puido recibir algúns arquivos." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omítese o desempaquetamento do código fonte xa desempaquetado en %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fallou a orde de desempaquetamento \"%s\".\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comprobe que o paquete \"dpkg-dev\" estea instalado.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fallou a codificación de %s.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "O proceso fillo fallou" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "" "Ten que especificar alomenos un paquete para lle comprobar as dependencias " "de compilación" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Non se puido obter a información de dependencias de compilación de %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ten dependencias de compilación.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1180,7 +1241,7 @@ msgstr "" "A dependencia \"%s\" de %s non se pode satisfacer porque non se pode atopar " "o paquete %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1189,32 +1250,33 @@ msgstr "" "A dependencia \"%s\" de %s non se pode satisfacer porque ningunha versión " "dispoñible do paquete %s satisfai os requirimentos de versión" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Non se puido satisfacer a dependencia \"%s\" de %s: O paquete instalado %s é " "novo de máis" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Non se puido satisfacer a dependencia \"%s\" de %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Non se puideron satisfacer as dependencias de compilación de %s." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "Non se puido procesar as dependencias de compilación" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "Módulos soportados:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1229,6 +1291,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1393,189 +1456,189 @@ msgstr "" msgid "Merging available information" msgstr "A mesturar a información sobre paquetes dispoñibles" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Non se puido crear as canles" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Non se puido executar gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Arquivo corrompido" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "A suma de comprobación do arquivo tar non coincide, está corrompido" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tipo de cabeceira TAR %u descoñecido, membro %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Sinatura de arquivo non válida" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Erro ao ler a cabeceira do membro do arquivo" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Cabeceira do membro do arquivo non válida" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "O arquivo é curto de máis" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Non se puido ler as cabeceiras dos arquivos" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "Chamouse a DropNode nun nodo aínda ligado" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Non se puido atopar o elemento hash" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Non se puido reservar un desvío" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Erro interno en AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Téntase sobrescribir un desvío, %s -> %s e %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Desvío %s -> %s engadido dúas veces" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Ficheiro de configuración %s/%s duplicado" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Non se puido gravar o ficheiro %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Non se puido pechar o ficheiro %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "A ruta %s é longa de máis" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "A desempaquetar %s máis dunha vez" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "O directorio %s está desviado" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "O paquete tenta gravar no destino do desvío %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "A ruta do desvío é longa de máis" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "O directorio %s estase a substituír por algo que non é un directorio" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Non se puido atopar o nodo no seu caldeiro hash" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "A ruta é longa de máis" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Coincidencia na sobrescritura sen versión para %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "O ficheiro %s/%s sobrescribe o do paquete %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Non se pode ler %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Non se atopou %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Non se puido eliminar %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Non se pode crear %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Non se atopou %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "" "Os directorios info e temp teñen que estar no mesmo sistema de ficheiros" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "A ler as listas de paquetes" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Non se puido cambiar ao directorio de administración %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "Erro interno ao obter un nome de paquete" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "A ler a lista de ficheiros" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1585,77 +1648,77 @@ msgstr "" "Non se puido abrir o ficheiro de listas \"%sinfo/%s\". Se non pode " "recuperalo, baléireo e reinstale a mesma versión do paquete." -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Non se puido ler o ficheiro de listas %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Erro interno ao obter un nodo" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Non se puido abrir o ficheiro de desvíos %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "O ficheiro de desvíos está corrompido" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "Liña non válida no ficheiro de desvíos: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Erro interno ao engadir un desvío" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Ten que se inicializar a caché de paquetes primeiro" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Non se puido atopar unha cabeceira Package:, desprazamento %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Sección ConfFile incorrecta no ficheiro de estado. Desprazamento %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Erro ao analizar o MD5. Desprazamento %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Este non é un arquivo DEB válido, falla o membro \"%s\"" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "Este non é un arquivo DEB válido, non ten un membro \"%s\" ou \"%s\"" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "Non se puido cambiar a %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "Erro interno, non se puido atopar un membro" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "Non se puido atopar un ficheiro de control válido" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "Ficheiro de control non analizable" @@ -1690,11 +1753,12 @@ msgid "File not found" msgstr "Non se atopou o ficheiro" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Non se atopou" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Non se puido estabrecer a hora de modificación" @@ -1756,7 +1820,7 @@ msgstr "Tempo esgotado para a conexión" msgid "Server closed the connection" msgstr "O servidor pechou a conexión" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "Erro de lectura" @@ -1768,7 +1832,7 @@ msgstr "Unha resposta desbordou o buffer." msgid "Protocol corruption" msgstr "Corrupción do protocolo" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "Erro de escritura" @@ -1823,7 +1887,7 @@ msgstr "A conexión do socket de datos esgotou o tempo" msgid "Unable to accept connection" msgstr "Non se pode aceptar a conexión" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema ao calcular o hash do ficheiro" @@ -1850,39 +1914,39 @@ msgstr "Petición" msgid "Unable to invoke " msgstr "Non se puido chamar a " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "A conectar a %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Non se puido crear un socket para %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Non se pode iniciar a conexión a %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Non se puido conectar a %s:%s (%s), a conexión esgotou o tempo" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Non se puido conectar a %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "A conectar a %s" @@ -1961,428 +2025,448 @@ msgstr "Non se puido abrir unha canle para %s" msgid "Read error from %s process" msgstr "Erro de lectura do proceso %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "A agardar polas cabeceiras" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Recibiuse unha soa liña de cabeceira en %u caracteres" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Liña de cabeceira incorrecta" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "O servidor HTTP enviou unha cabeceira de resposta non válida" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "O servidor HTTP enviou unha cabeceira Content-Length non válida" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "O servidor HTTP enviou unha cabeceira Content-Range non válida" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Este servidor HTTP ten un soporte de rangos roto" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Formato de data descoñecido" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Fallou a chamada a select" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "A conexión esgotou o tempo" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Erro ao escribir no ficheiro de saída" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Erro ao escribir nun ficheiro" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Erro ao escribir no ficheiro" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Erro ao ler do servidor. O extremo remoto pechou a conexión" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Erro ao ler do servidor" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Datos da cabeceira incorrectos" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "A conexión fallou" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Erro interno" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "Non se pode facer mmap sobre un ficheiro baleiro" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Non se puido facer mmap de %lu bytes" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "Non se atopou a selección %s" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Abreviatura de tipo \"%c\" descoñecida" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "A abrir o ficheiro de configuración %s" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "Liña %d longa de máis (máximo %d)" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Erro de sintaxe %s:%u: O bloque comeza sen un nome." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Erro de sintaxe %s:%u: Etiqueta mal formada" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Erro de sintaxe %s:%u: Lixo extra despois do valor" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Erro de sintaxe %s:%u: Só se poden facer directivas no nivel superior" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Erro de sintaxe %s:%u: Includes aniñados de máis" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Erro de sintaxe %s:%u: Incluído de aquí" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Erro de sintaxe %s:%u: Non se soporta a directiva \"%s\"" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Erro de sintaxe %s:%u: Lixo extra á fin da liña" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... ¡Erro!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... Rematado" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Non se coñece a opción de liña de ordes \"%c\" [de %s]." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "Non se entende a opción de liña de ordes %s" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "A opción de liña de ordes %s non é booleana" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "A opción %s precisa dun argumento." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" "Opción %s: A especificación de elemento de configuración debe ter un =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "A opción %s precisa dun argumento enteiro, non \"%s\"" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "A opción \"%s\" é longa de máis" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "O senso %s non se entende, probe \"true\" ou \"false\"." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Operación %s non válida" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Non se pode analizar o punto de montaxe %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Non se pode cambiar a %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "Non se puido analizar o CD-ROM" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Non se empregan bloqueos para o ficheiro de bloqueo de só lectura %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "Non se puido abrir o ficheiro de bloqueo %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Non se empregan bloqueos para o ficheiro de bloqueo montado por NFS %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "Non se puido obter o bloqueo %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Agardouse por %s pero non estaba alí" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "O subproceso %s recibiu un fallo de segmento." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "O subproceso %s devolveu un código de erro (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "O subproceso %s saíu de xeito inesperado" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "Non se puido abrir o ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "lectura, aínda hai %lu para ler pero non queda ningún" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "escritura, aínda hai %lu para escribir pero non se puido" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "Problema ao pechar o ficheiro" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "Problema ao borrar o ficheiro" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "Problema ao sincronizar o ficheiro" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Caché de paquetes baleira" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "O ficheiro de caché de paquetes está corrompido" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "O ficheiro de caché de paquetes é unha versión incompatible" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Este APT non soporta o sistema de versionamento \"%s\"" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "A caché de paquetes construiuse para unha arquitectura diferente" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Depende" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "PreDepende" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Suxire" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Recomenda" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Conflicto con" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Substitúe a" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Fai obsoleto a" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "requirido" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "estándar" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opcional" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "A construír a árbore de dependencias" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "Versións candidatas" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "Xeración de dependencias" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "A mesturar a información sobre paquetes dispoñibles" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Non se puido abrir %s" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Non se puido gravar o ficheiro %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Non se pode analizar o ficheiro de paquetes %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Non se pode analizar o ficheiro de paquetes %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Liña %lu mal formada na lista de fontes %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Liña %lu mal formada na lista de fontes %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Liña %lu mal formada na lista de fontes %s (análise de URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Liña %lu mal formada na lista de fontes %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Liña %lu mal formada na lista de fontes %s (análise de dist)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "A abrir %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Liña %u longa de máis na lista de fontes %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Liña %u mal formada na lista de fontes %s (tipo)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "O tipo \"%s\" non se coñece na liña %u da lista de fontes %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Liña %u mal formada na lista de fontes %s (id de provedor)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2393,19 +2477,19 @@ msgstr "" "%s debido a un bucle de Conflictos e Pre-dependencias. Isto adoita ser malo, " "pero se o quere facer, active a opción APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "O tipo de ficheiros de índices \"%s\" non está soportado" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "O paquete %s ten que se reinstalar, pero non se pode atopar o seu arquivo." -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2413,184 +2497,200 @@ msgstr "" "Erro, pkgProblemResolver::Resolve xerou interrupcións, pode estar causado " "por paquetes retidos." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "Non se poden resolver os problemas, ten retidos paquetes rotos." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "O directorio de listas %spartial falla." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "O directorio de arquivos %spartial falla." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "A obter o ficheiro %li de %li (fallan %s)" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "A obter o ficheiro %li de %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Non se puido atopar o controlador de métodos %s." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "O método %s non se iniciou correctamente" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Introduza o disco etiquetado: \"%s\" na unidade \"%s\" e prema Intro." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "O sistema de empaquetamento \"%s\" non está soportado" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "Non se puido determinar un tipo de sistema de empaquetamento axeitado" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Non se pode analizar %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Debe introducir algúns URIs fonte no seu ficheiro sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Non se puido analizar ou abrir as listas de paquetes ou ficheiro de estado." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "Pode querer executar apt-get update para corrixir estes problemas" -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "" "Rexistro non válido no ficheiro de preferencias, non hai unha cabeceira " "Package" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Non se entendeu o tipo de inmobilización %s" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "" "Non se indicou unha prioridade (ou indicouse cero) para a inmobilización" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "A caché ten un sistema de versionamento incompatible" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Ocorreu un erro ao procesar %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Ocorreu un erro ao procesar %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Ocorreu un erro ao procesar %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Ocorreu un erro ao procesar %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Ocorreu un erro ao procesar %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Ocorreu un erro ao procesar %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Ocorreu un erro ao procesar %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Ocorreu un erro ao procesar %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Ocorreu un erro ao procesar %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Guau, superou o número de nomes de paquetes que este APT pode manexar." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Guau, superou o número de versións que este APT pode manexar." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Guau, superou o número de versións que este APT pode manexar." + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Guau, superou o número de dependencias que este APT pode manexar." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Ocorreu un erro ao procesar %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Ocorreu un erro ao procesar %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Non se atopou o paquete %s %s ao procesar as dependencias de ficheiros" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "Non se atopou a lista de paquetes fonte %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "A recoller as provisións de ficheiros" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "Erro de E/S ao gravar a caché de fontes" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "fallou o cambio de nome, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Os MD5Sum non coinciden" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Non hai unha clave pública dispoñible para os seguintes IDs de clave:\n" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2599,7 +2699,7 @@ msgstr "" "Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que " "ten que arranxar este paquete a man. (Falla a arquitectura)" -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2608,7 +2708,7 @@ msgstr "" "Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que " "ten que arranxar este paquete a man." -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2616,7 +2716,7 @@ msgstr "" "Os ficheiros de índices de paquetes están corrompidos. Non hai un campo " "Filename: para o paquete %s." -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Os tamaños non coinciden" @@ -2625,7 +2725,7 @@ msgstr "Os tamaños non coinciden" msgid "Vendor block %s contains no fingerprint" msgstr "O bloque de provedor %s non contén unha pegada dixital" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2634,53 +2734,55 @@ msgstr "" "A empregar o punto de montaxe de CD-ROMs %s\n" "A montar o CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "A identificar.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "Etiqueta armacenada: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "A empregar o punto de montaxe de CD-ROMs %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "A desmontar o CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "A agardar polo disco...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "A montar o CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "A buscar os ficheiros de índices no disco..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "" "Atopáronse %i índices de paquetes, %i índices de fontes e %i sinaturas\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "Etiqueta armacenada: %s \n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "Ese non é un nome válido, volva tentalo.\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2689,102 +2791,103 @@ msgstr "" "Este disco chámase: \n" "\"%s\"\n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "A copiar as listas de paquetes..." -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "A gravar a nova lista de fontes\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "As entradas da lista de fontes deste disco son:\n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "A desmontar o CD-ROM..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Graváronse %i rexistros.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Graváronse %i rexistros con %i ficheiros que fallan.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Graváronse %i rexistros con %i ficheiros que non coinciden\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "Graváronse %i rexistros con %i ficheiros que fallan e %i ficheiros que non " "coinciden\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "A preparar %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "A desempaquetar %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "A se preparar para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "A configurar %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "Instalouse %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "A se preparar para a eliminación de %s" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "A eliminar %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "Eliminouse %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "A se preparar para eliminar %s completamente" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "Eliminouse %s completamente" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "Non se puido parchear o ficheiro" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "A conexión pechouse prematuramente" -#~ msgid "Could not patch file" -#~ msgstr "Non se puido parchear o ficheiro" - #~ msgid "File date has changed %s" #~ msgstr "A data do ficheiro cambiou %s" diff --git a/po/he.po b/po/he.po index 52f686b8f..2275c47ae 100644 --- a/po/he.po +++ b/po/he.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.25\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2004-06-10 19:58+0300\n" "Last-Translator: Lior Kaplan \n" "Language-Team: Hebrew\n" @@ -15,145 +15,153 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "לחבילה %s בגרסה %s יש תלויות שלא נענו:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "לא מצליח לאתר את החבילה %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "" -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr "חבילות נורמליות:" -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr "חבילות וירטואליות לחלוטין:" -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr "חסרות:" -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "" -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total Distinct Descriptions: " +msgstr "" + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "" -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "" -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "" + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "" -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "" -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "קובץ החבילה %s לא מסונכרן." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "אתה חייב לתת בדיוק תבנית אחת" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "לא נמצאו חבילות" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "קבצי חבילה:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "חבילות נעוצות:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(לא נמצא)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr "מותקן:" -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(none)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr "מועמדים:" -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr "נעץ חבילה:" #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s בשביל %s %s קומפל על %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -243,7 +251,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "לא מצליח לכתוב ל-%s" @@ -252,31 +260,31 @@ msgstr "לא מצליח לכתוב ל-%s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "לא מצליח לקבל את גרסת debconf. האם debconf מותקן?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "שגיאה בעיבוד ספריה %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -318,131 +326,131 @@ msgid "" " -o=? Set an arbitrary configuration option" msgstr "" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "אין התאמות" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "חלק מהקבצים חסרים בקבוצת קבצי החבילה `%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "מסד הנתונים אינו תקין, הקובץ הועבר ל-%s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "מסד הנתונים ישן, מנסה לשדרג ל-%s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." msgstr "" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "לא מצליח לפתוח את קובץ מסד הנתונים %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: לא מצליח לקרוא את הספריה %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "E: שגיאות תקפות לקובץ" -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "כשלון בפענוח %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "כשלון בפתיחת %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr "" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** כשלון בקישור %s ל-%s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "המתחזק של %s הוא %s ולא %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -456,165 +464,165 @@ msgstr "" msgid "realloc - Failed to allocate memory" msgstr "realloc - כשלון בהקצאת זיכרון" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "לא מצליח לפתוח את %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "'%s' אלגוריתם דחיה לא ידוע" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "כשלון בביצוע fork" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "שגיאה פנימית, כלשון ביצירת %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "כשלון בשינוי השם %s ל-%s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "לחבילות הבאות יש תלויות שלא נענו:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "אבל %s מותקנת" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "אבל %s הולכת להיות מותקנת" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "אבל היא אינה ניתנת להתקנה" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "אבל היא חבילה וירטואלית" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "אבל היא לא מותקנת" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "אבל היא אינה הולכת להיות מותקנת" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr "או" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "החבילות החדשות הבאות הולכות להיות מותקנות:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "החבילות הבאות יוסרו:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "החבילות הבאות מעובות:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "החבילות הבאות ישודרגו:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "החבילות הבאות ישודרגו מטה:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "החבילות המחוזקות הבאות ישונו:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (בגלל %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -623,144 +631,144 @@ msgstr "" "א ז ה ר ה: החבילות החיוניות הבאות יוסרו\n" "על הפעולה להעשות *רק* אם אתה יודע מה אתה עושה!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu משודרגים, %lu מותקנים חדשים, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu מותקנות מחדש, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu משודרגות מטה, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu יוסרו ו-%lu לא ישודרגו.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu לא מותקנות לחלוטין או הוסרו.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "מתקן תלויות..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr "כשלון." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "לא מצליח לתקן תלויות" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "א ז ה ר ה: החבילות החיוניות הבאות יוסרו" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr "סיום" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "אולי תרצה להריץ 'apt-get -f install' כדי לתקן את אלו." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "תלויות שלא נענו. נסה להשתמש באפשרות -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 #, fuzzy msgid "WARNING: The following packages cannot be authenticated!" msgstr "החבילות הבאות ישודרגו:" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "היו בעיות והאפשרות -y היתה בשימוש ללא האפשרות --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "לא מצליח לנעול את ספרית ההורדה." -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "רשימת המקורות לא ניתנת לקריאה." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "צריך לקבל %sB/%sB מתוך הארכיונים.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "צריך לקבל %sB מתוך הארכיונים.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "אחרי פריסה %sB נוספים יהיו בשימוש.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "אחרי פריסה %sB נוספים ישוחררו.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "אין לך מספיק מקום פנוי ב-%s." -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "אין לך מספיק מקום פנוי ב-%s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "כן, עשה כפי שאני אומר!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -768,75 +776,75 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "בטל." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 #, fuzzy msgid "Do you want to continue [Y/n]? " msgstr "האם אתה רוצה להמשיך? [Y/n]" -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "כשלון בהבאת %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "כשלון בהורדת חלק מהקבצים" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "ההורדה הסתיימה במסגרת מצב הורדה בלבד." -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr "" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -844,79 +852,119 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "החבילות החדשות הבאות הולכות להיות מותקנות:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "שגיאה פנימית, כלשון ביצירת %s" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, c-format +msgid "Couldn't find task %s" +msgstr "" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "אבל %s הולכת להיות מותקנת" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -924,164 +972,175 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "שגיאה פנימית, כלשון ביצירת %s" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1096,6 +1155,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1205,188 +1265,188 @@ msgstr "" msgid "Merging available information" msgstr "" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, fuzzy, c-format msgid "Failed to write file %s" msgstr "כשלון בפענוח %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1394,77 +1454,77 @@ msgid "" "package!" msgstr "" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "" @@ -1498,11 +1558,12 @@ msgid "File not found" msgstr "" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "" @@ -1562,7 +1623,7 @@ msgstr "" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "" @@ -1574,7 +1635,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "" @@ -1628,7 +1689,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1655,39 +1716,39 @@ msgstr "" msgid "Unable to invoke " msgstr "" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "" -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "" @@ -1760,427 +1821,446 @@ msgstr "" msgid "Read error from %s process" msgstr "" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "" -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "" -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "" -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +msgid "Reading state information" +msgstr "" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "כשלון בפתיחת %s" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "כשלון בפענוח %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2188,216 +2268,231 @@ msgid "" "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "" -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "" -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "" -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "" -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "" -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "" @@ -2406,151 +2501,157 @@ msgstr "" msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:671 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, c-format msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "" -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 msgid "Unmounting CD-ROM...\n" msgstr "" -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, fuzzy, c-format msgid "Installed %s" msgstr "מותקן:" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "" diff --git a/po/hu.po b/po/hu.po index a22ff301b..05b3d6fbf 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2006-10-21 11:04+0100\n" "Last-Translator: SZERVÁC Attila \n" "Language-Team: Hungarian \n" @@ -19,146 +19,154 @@ msgstr "" "X-Poedit-Language: Hungarian\n" "X-Poedit-Country: HUNGARY\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "%s csomag %s verziójának teljesítetlen függősége van:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Az alábbi csomag nem található: %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "Csomagnevek összesen : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Normális csomagok: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Teljesen virtuális csomagok: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Egyedi virtuális csomagok: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Vegyes virtuális csomagok: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Hiányzik: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Különböző verziók összesen: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total Distinct Descriptions: " +msgstr "Összes külső leírás: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Függőségek összesen: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Verzió/Fájl kapcsolatok összesen: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "Összes Leírás/Fájl kapcsolat: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "\"Előkészít\" kapcsolatok összesen: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Minták összesen: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Függőségi-verzió terület összesen: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Slack terület összesen: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Terület összesen: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "%s csomag fájl szinkronon kívül." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Pontosan egy mintát kell megadnod" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Nem találtam csomagokat" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Csomagfájlok:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "A gyorsítótár nincs szinkronban, nem lehet kereszthivatkozni a csomag fájlra" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Rögzített csomagok:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(nem találtam)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Telepítve: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(nincs)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Jelölt: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Csomag Tű: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Verziótáblázat:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s ehhez: %s %s fordítás ideje: %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -305,7 +313,7 @@ msgstr "" " -c=? Ezt a konfigurációs fájlt olvassa be\n" " -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "Nem lehet írni ebbe: %s" @@ -314,31 +322,31 @@ msgstr "Nem lehet írni ebbe: %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nem lehet megállapítani a debconf verziót. A debconf telepítve van?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "A csomagkiterjesztések listája túl hosszú" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "Hiba a(z) %s könyvtár feldolgozásakor" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "A forráskiterjesztések listája túl hosszú" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Hiba a tartalom fájl fejlécének írásakor" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Hiba %s tartalmának feldolgozásakor" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -420,26 +428,26 @@ msgstr "" " -c=? Ezt a konfigurációs fájlt olvassa be\n" " -o=? Beállít egy tetszőleges konfigurációs opciót" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Nincs illeszkedő kiválasztás" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Néhány fájl hiányzik a(z) '%s' csomagfájl-csoportból" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB megsérült, a fájl átnevezve %s.old-ra" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB régi, megkísérlem frissíteni erre: %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." @@ -447,106 +455,106 @@ msgstr "" "DB formátum érvénytelen. Ha az apt régebbi változatáról frissítettél, töröld " "és hozd újra létre az adatbázist." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "A(z) %s DB fájlt nem lehet megnyitni: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "%s elérése sikertelen" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Az archívumnak nincs vezérlő rekordja" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Nem sikerült egy mutatóhoz jutni" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "F: nem lehet a(z) %s könyvtárat olvasni\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "F: %s nem érhető el\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "H: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "F: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "H: Hibás a fájl " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "Nem sikerült feloldani ezt: %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "Fabejárás nem sikerült" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "%s megnyitása sikertelen" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "readlink nem hajtható végre erre: %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "unlink nem hajtható végre erre: %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** %s linkelése ehhez: %s sikertelen" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink elérte %sB korlátját.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Az archívumnak nem volt csomag mezője" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s nem rendelkezik felülbíráló bejegyzéssel\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s karbantartója %s, nem %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr " %s nem rendelkezik forrás felülbíráló bejegyzéssel\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nem rendelkezik bináris felülbíráló bejegyzéssel sem\n" @@ -560,165 +568,165 @@ msgstr "Belső hiba, %s tag nem található" msgid "realloc - Failed to allocate memory" msgstr "realloc - Nem sikerült memóriát lefoglalni" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "%s megnyitása sikertelen" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Deformált felülbírálás %s %lu. sorában #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Deformált felülbírálás %s %lu. sorában #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Deformált felülbírálás %s %lu. sorában #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Nem lehet a(z)%s felülbírálófájlt olvasni" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "'%s' tömörítési algoritmus ismeretlen" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "%s tömörített kimenetnek egy tömörítő készletre van szüksége" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Nem sikerült IPC csövet létrehozni az alfolyamathoz" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "Nem sikerült FILE*-ot létrehozni" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "Nem sikerült forkolni" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "Gyermekfolyamat tömörítése" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "Belső hiba, %s létrehozása sikertelen" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "Nem sikerült az alfolyamat IPC-t létrehozni" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "Nem sikerült elindítani a tömörítőt " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "kicsomagoló" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "IO az alfolyamathoz/fájlhoz nem sikerült" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "Olvasási hiba az MD5 kiszámításakor" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "Hiba %s elláncolásakor" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Nem sikerült átnevezni %s-t erre: %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "I" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "Regex fordítási hiba - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "de %s van telepítve" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "de csak %s telepíthető" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "de az nem telepíthető" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "de az egy virtuális csomag" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "de az nincs telepítve" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "de az nincs telepítésre megjelölve" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " vagy" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "Az alábbi ÚJ csomagok lesznek telepítve:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "Az alábbi csomagok el lesznek TÁVOLÍTVA:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "Az alábbi csomagok vissza lesznek tartva:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "Az alábbi csomagok frissítve lesznek:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "Az alábbi csomagok ÖREGBÍTÉSRE kerülnek:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "Az alábbi visszafogott csomagokat cserélem:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (%s miatt) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -726,143 +734,143 @@ msgstr "" "FIGYELEM: Az alábbi alapvető csomagok lesznek eltávolítva\n" "NE tedd ezt, míg nem tudod pontosan, mit csinálsz!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu frissített, %lu újonnan telepített, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu újratelepítendő, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu kerül öregbítésre, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu eltávolítandó és %lu nem frissített.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nincs teljesen telepítve/eltávolítva.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Függőségek javítása..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " sikertelen." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Nem lehet javítani a függőségeket" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Nem lehet minimalizálni a frissítendő csomagok mennyiségét" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Kész" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Ezek kijavításához próbáld futtatni az 'apt-get -f install'-t ." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Teljesítetlen függőségek. Próbáld a -f használatával." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "FIGYELEM: Az alábbi csomagok nem hitelesíthetők!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "A hitelesítési figyelmeztetést átléptem.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Valóban telepíted e csomagokat ellenőrzés nélkül (i/N)? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Néhány csomag nem hitelesíthető" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Problémák vannak és a -y -t használtad --force-yes nélkül" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Belső hiba, az InstallPackages törött csomagokkal lett meghívva!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Csomagokat kellene eltávolítani, de az Eltávolítás nem engedélyezett." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Belső hiba, a rendezés nem zárult" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "Nem tudom zárolni a letöltési könyvtárat" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "A források listája olvashatatlan." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "Ez durva... A méretek nem egyeznek, írj ide:apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Letöltendő az archívumokból: %sB/%sB\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Letöltés az archívumokból: %sB\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Kicsomagolás után %sB lemezterületet használok fel\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Kicsomagolás után %sB lemezterület szabadul fel.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nem határozható meg a szabad hely itt: %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Nincs elég szabad hely itt: %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "A 'Trivial Only' meg van adva, de ez nem egy triviális művelet." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Igen, tedd amit mondok!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -873,28 +881,28 @@ msgstr "" "A folytatáshoz írd be ezt: '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "Megszakítva." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Folytatni akarod [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Sikertelen letöltés: %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Néhány fájlt nem sikerült letölteni" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "A letöltés befejeződött a 'csak letöltés' módban" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -902,47 +910,47 @@ msgstr "" "Nem lehet letölteni néhány archívumot.\n" " Próbáld ki az apt-get update -et vagy a --fix-missing -et." -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing és média csere jelenleg nem támogatott" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Nem lehet javítani a hiányzó csomagokat." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Telepítés megszakítása." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Megjegyzés: %s kiválasztása %s helyett\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s kihagyása, ez már telepítve van és a frissítés nincs beállítva.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "A megadott %s csomag nincs telepítve, így hát nem is töröltem\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s egy virtuális csomag, melyet az alábbi csomagok adnak:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Telepítve]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Egyet név szerint ki kell jelölnöd a telepítésre." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -952,49 +960,49 @@ msgstr "" "%s csomag nem elérhető, de egy másik hivatkozik rá\n" ".A kért csomag tehát: hiányzik, elavult vagy csak más forrásból érhető el\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "De az alábbi csomagok felváltják:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "%s csomagnak nincs e telepítéshez kijelölhető változata" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s újratelepítése nem lehetséges, mert nem lehet letölteni.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s már a legújabb verzió.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%s' kiadás ehhez: '%s' nem található" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%s' verzió ehhez: '%s' nem található" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "%s (%s) a kiválasztott verzió ehhez: %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Az update parancsnak nincsenek argumentumai" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Nem tudom a listakönyvtárat zárolni" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1002,25 +1010,65 @@ msgstr "" "Néhány index fájl letöltése meghiúsult, ezeket mellőzöm vagy régi " "változatukat használom." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Az alábbi ÚJ csomagok lesznek telepítve:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "Az alábbi információ segíthet megoldani a helyzetet:" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Belső hiba, hibafeloldó gond" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Belső hiba, AllUpgrade megsértett valamit" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Az alábbi csomag nem található: %s" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "Az alábbi csomag nem található: %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Megjegyzés: %s kiválasztása %s reguláris kifejezéshez\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "de csak %s telepíthető" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Próbáld futtatni az 'apt-get -f install'-t az alábbiak javításához:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1028,7 +1076,7 @@ msgstr "" "Teljesítetlen függőségek. Próbáld az 'apt-get -f install'-t csomagok nélkül " "(vagy telepítsd a függőségeket is!)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1040,7 +1088,7 @@ msgstr "" "használod, akkor néhány igényelt csomag még nem készült el vagy ki\n" "lett mozdítva az Incoming-ból." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1050,122 +1098,133 @@ msgstr "" "hogy a csomag egyszerűen nem telepíthető és egy hibajelentést kellene\n" "kitölteni a csomaghoz." -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Az alábbi információ segíthet megoldani a helyzetet:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "Törött csomagok" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "Az alábbi extra csomagok kerülnek telepítésre:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "Javasolt csomagok:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "Ajánlott csomagok:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "Frissítés kiszámítása... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Sikertelen" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "Kész" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "Belső hiba, hibafeloldó gond" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "" "Legalább egy csomagot meg kell adnod, aminek a forrását le kell tölteni" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "Nem található forráscsomag ehhez: %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "A már letöltött '%s' fájl kihagyása\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "Nincs elég szabad hely itt: %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB forrás-archívumot kell letölteni.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB forrás-archívumot kell letölteni.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "Forrás letöltése: %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "Nem sikerült néhány archívumot letölteni." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s' kibontási parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Ellenőrizd, hogy a 'dpkg-dev' csomag telepítve van-e.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "'%s' elkészítési parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "Hiba a gyermekfolyamatnál" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "" "Legalább egy csomagot adj meg, aminek a fordítási függőségeit ellenőrizni " "kell" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nem lehet %s fordítási-függőség információját beszerezni" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "Nincs fordítási függősége a következőnek: %s.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1174,7 +1233,7 @@ msgstr "" "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomag nem " "található" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1183,32 +1242,33 @@ msgstr "" "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomagnak nincs a " "verzió-követelményt kielégítő elérhető verziója." -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%s függőséget %s csomaghoz nem lehet kielégíteni: %s telepített csomag túl " "friss." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s függőséget %s csomaghoz nem lehet kielégíteni: %s " -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s építési függőségei nem elégíthetőek ki." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "Nem sikerült az építési függőségeket feldolgozni" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "Támogatott modulok:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1223,6 +1283,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1382,188 +1443,188 @@ msgstr "előtti hibák fontosak. Javítsd azokat és futtasd az [I]nstallt újra msgid "Merging available information" msgstr "Elérhető információk egyesítése" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Nem sikerült csöveket létrehozni" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Nem sikerült a gzipet futtatni " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Hibás archívum" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Tar ellenőrzőösszeg nem egyezik, az archívum megsérült" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Ismeretlen a(z) %u TAR fejléc típus, %s tag" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Érvénytelen archívum-aláírás" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Hiba az archívum tag fejléc olvasásakor" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Érvénytelen archívum tag fejléc" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Az archívum túl rövid" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Nem sikerült olvasni az archívum fejléceket" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode hívása egy még mindig láncolt node-ra történt" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "A hash elem nem található!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Nem lehet eltérítést lefoglalni" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Belső hiba az AddDiversion-ban" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Megpróbálom felülírni %s -> %s és %s/%s eltérítést" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "A(z) %s -> %s eltérítés hozzáadásának duplázása" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Dupla %s/%s konfigurációs fájl" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "%s fájl írása sikertelen" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Nem sikerült a(z) %s fájlt bezárni" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "A(z) %s útvonal túl hosszú" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "%s egynél többszöri kicsomagolása" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "A(z) %s könyvtár eltérítve" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "A csomag megpróbál írni a(z) %s/%s eltérített célpontba" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Az eltérített útvonal túl hosszú" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "A(z) %s könyvtár nem egy könyvtárral lesz helyettesítve" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Nem sikerült a node helyét megtalálni a hash-ében" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Az útvonal túl hosszú" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Csomagtalálat felülírása %s verziója nélkül" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "A(z) %s/%s fájl felülírja a(z) %s csomagban levőt" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "%s nem olvasható" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "%s nem érhető el" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "%s eltávolítása sikertelen" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "%s létrehozása sikertelen" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "%sinfo nem érhető el" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "Az info és temp könyvtáraknak egy fájlrendszeren kell lenniük" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "Csomaglisták olvasása" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Nem sikerült a(z) %sinfo admin könyvtárba váltani" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "Belső hiba a csomagnév elhozásakor" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Fájllista olvasása" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1574,77 +1635,77 @@ msgstr "" "ezt a fájlt, akkor ürítsd ki, és azonnal telepítsd újra a csomag ugyanezen " "verzióját!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Nem sikerült a(z) %sinfo/%s lista fájlt olvasni" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Belső hiba a Node kinyerésekor" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Nem sikerült a(z) %sdiversions eltérítő fájlt megnyitni" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Az eltérítő fájl hibás" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "Érvénytelen sor az eltérítő fájlban: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Belső hiba egy eltérítés hozzáadásakor" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "A csomag gyorstárnak előbb kell inicializálva lennie" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Nem találom a csomag-fejlécet, offszet %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Hibás ConfFile szakasz a státusz fájlban. Offszet %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "MD5 értelmezési hiba. Offszet %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Ez nem egy érvényes DEB archív, hiányzik a '%s' tag" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "Ez nem egy érvényes DEB archív, nincs \"%s\" vagy \"%s\" tagja" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "Nem lehet váltani ebbe: %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "Belső hiba, a tag nem található" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "Nem található érvényes vezérlő fájl" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "Értelmezhetetlen vezérlő fájl" @@ -1679,11 +1740,12 @@ msgid "File not found" msgstr "Nem találom a fájlt" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Nem érhető el" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "A módosítási időt beállítása sikertelen" @@ -1745,7 +1807,7 @@ msgstr "Időtúllépés a kapcsolatban" msgid "Server closed the connection" msgstr "A kiszolgáló lezárta a kapcsolatot" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "Olvasási hiba" @@ -1757,7 +1819,7 @@ msgstr "A válasz túlcsordította a puffert." msgid "Protocol corruption" msgstr "Protokoll hiba" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "Írási hiba" @@ -1811,7 +1873,7 @@ msgstr "Az adat sockethez kapcsolódás túllépte az időt" msgid "Unable to accept connection" msgstr "Nem lehet elfogadni a kapcsolatot" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Probléma a fájl hash értékének meghatározásakor" @@ -1838,39 +1900,39 @@ msgstr "Lekérdezés" msgid "Unable to invoke " msgstr "Nem lehet meghívni " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Csatlakozás: %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "socket létrehozása sikertelen ehhez: %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Kapcsolat létrehozása sikertelen ehhez: %s: %s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Időtúllépés miatt nem lehet kapcsolódni a következőhöz: %s: %s (%s)" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Nem tudtam kapcsolódni ehhez: %s: %s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Kapcsolódás: %s" @@ -1943,429 +2005,449 @@ msgstr "Nem lehet csövet nyitni ehhez: %s" msgid "Read error from %s process" msgstr "Olvasási hiba %s folyamattól" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Várakozás a fejlécekre" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Egyetlen fejléc sort kaptam, ami több mint %u karakteres" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Rossz fejléc sor" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "A http kiszolgáló egy érvénytelen válaszfejlécet küldött" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "A http kiszolgáló egy érvénytelen Content-Length fejlécet küldött" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "A http kiszolgáló egy érvénytelen Content-Range fejlécet küldött" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Ez a http szerver támogatja a sérült tartományokat " -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Ismeretlen dátum formátum" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Sikertelen kiválasztás" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Időtúllépés a kapcsolatban" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Hiba a kimeneti fájl írásakor" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Hiba fájl írásakor" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Hiba a fájl írásakor" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Hiba a kiszolgálóról olvasáskor" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Rossz fejlécadat" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Sikertelen kapcsolódás" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Belső hiba" # FIXME -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "Nem lehet mmap-olni egy üres fájlt" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Nem sikerült %lu bájtot mmap-olni" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "%s kiválasztás nem található" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ismeretlen típusrövidítés: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "%s konfigurációs fájl megnyitása" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "A(z) %d. sor túl hosszú (maximum %d)" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Szintaktikai hiba %s: %u: A blokk név nélkül kezdődik" -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Szintaktikai hiba %s: %u: hibás formátumú címke" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Szintaktikai hiba %s: %u: fölösleges szemét az érték után" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Szintaktikai hiba %s: %u: Csak legfelső szinten használhatók előírások" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Szintaktikai hiba %s: %u: Túl sok beágyazott include" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Szintaktikai hiba %s: %u: ugyaninnen include-olva" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Szintaktikai hiba %s: %u: '%s' nem támogatott előírás" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Szintaktikai hiba %s: %u: fölösleges szemét a fájl végén" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Hiba!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... Kész" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "A(z) '%c' parancssori opció [a következőből: %s] ismeretlen." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "%s parancssori opció értelmezhetetlen" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "%s parancssori opció nem logikai" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "%s opcióhoz szükséges egy argumentum" -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" "%s opció: a konfigurációs elem specifikációhoz szükséges egy =<érték> rész." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "%s opció egész és nem %s típusú argumentumot követel meg" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Túl hosszú %s opció" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "%s jelentés nem értelmezhető, próbáld a true vagy false értékeket" -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "%s érvénytelen művelet" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "%s csatolási pont nem érhető el" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Nem sikerült ide váltani: %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "Nem sikerült elérni a CD-ROM-ot." -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Nem zárolom '%s' csak olvasható zárolási fájlt" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "%s zárolási fájl nem nyitható meg" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nem zárolom '%s' NFS-csatlakoztatású zárolási fájlt" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "Nem sikerült zárolni: %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s nem volt itt, ahogy vártam" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "%s alfolyamat szegmentálási hibát okozott." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "%s alfolyamat hibakóddal tért vissza (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "%s alfolyamat váratlanul kilépett" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "Nem lehet megnyitni %s fájlt" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "olvasás, még kellene %lu, de már az összes elfogyott" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "írás, még kiírandó %lu de ez nem lehetséges" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "Hiba a fájl bezárásakor" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "Hiba a fájl leválasztásával" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "Hiba a fájl szinkronizálásakor" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Üres csomag-gyorstár" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "A csomag-gyorstár fájl megsérült" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "A csomag-gyorstár fájl inkompatibilis verziójú" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Ez az APT nem támogatja a(z) '%s' verziórendszert" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "A csomag-gyorstár egy másik architektúrához készült" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Függ ettől" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Függ ettől (előfüggés)" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Javasolja" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Ajánlja" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Ütközik" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Kicseréli" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Elavulttá teszi" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "fontos" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "szükséges" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "szabványos" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opcionális" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "Függőségi fa építése" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "Lehetséges verziók" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "Függőség-generálás" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "Elérhető információk egyesítése" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "%s megnyitása sikertelen" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "%s fájl írása sikertelen" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "A(z) %lu. sor hibás %s forráslistában (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "A(z) %lu. sor hibás %s forráslistában (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "A(z) %lu. sor hibás %s forráslistában (URI feldolgozó)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "A(z) %lu. sor hibás %s forráslistában (Abszolút dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "A(z) %lu. sor hibás %s forráslistában (dist feldolgozó)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s megnyitása" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "A(z) %u. sor túl hosszú %s forráslistában." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "A(z) %u. sor hibás %s forráslistában (típus)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "'%s' típus nem ismert a(z) %u. sorban a(z) %s forráslistában" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "A(z) %u. sor hibás %s forráslistában (terjesztő id)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2376,19 +2458,19 @@ msgstr "" "alapvető csomagot ami Ütközési/Elő-függőségi hurkot okoz. Ez gyakran rossz, " "de ha tényleg ezt akarod tenni, aktiváld az APT::Force-LoopBreak opciót." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "A(z) '%s' indexfájltípus nem támogatott" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "A(z) %s csomagot újra kell telepíteni, de nem találok archívumot hozzá." -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2396,186 +2478,202 @@ msgstr "" "Hiba, a pkgProblemResolver::Resolve töréseket generált, ezt visszafogott " "csomagok okozhatják." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "" "A problémák nem javíthatók, sérült visszafogott csomagok vannak a rendszeren." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "%spartial listakönyvtár hiányzik." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "%spartial archívumkönyvtár hiányzik." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "%li/%li fájl letöltése (%s marad)" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "%li/%li fájl letöltése" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "A(z) %s metódus vezérlő nem található." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "A(z) %s metódus nem indult el helyesen" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Tedd be a(z) %s címkéjű lemezt a(z) %s meghajtóba és üss entert" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "A(z) '%s' csomagrendszer nem támogatott" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "A megfelelő csomagrendszer típus nem határozható meg" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "%s nem érhető el." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Néhány 'source' URI-t be kell tenned a sources.list fájlba" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "" "A csomaglista vagy az állapot fájl nem dolgozható fel vagy nem olvasható." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "Próbáld futtatni az apt-get update -et, hogy javítsd e hibákat" -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Hibás rekord a tulajdonság fájlban, nincs csomagfejléc" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "A(z) %s tűtípus nem értelmezhető" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Nincs prioritás (vagy nulla) megadva a tűhöz" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "A gyorsítótárnak inkompatibilis verziórendszere van" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Hiba történt %s feldolgozásakor (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Hiba történt %s feldolgozásakor (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Hiba történt %s feldolgozásakor (NewFileDesc1)" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Hiba történt %s feldolgozásakor (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Hiba történt %s feldolgozásakor (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Hiba történt %s feldolgozásakor (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Hiba történt %s feldolgozásakor (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Hiba történt %s feldolgozásakor (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Hiba történt %s feldolgozásakor (NewFileDesc2)" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Ez nem semmi, túllépted a csomagnevek számát, amit ez az APT kezelni tud!" -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Ez nem semmi, túllépted a csomagverziók számát, amit ez az APT kezelni tud!" -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"Ez nem semmi, túllépted a csomagleírások számát, amit ez az APT kezelni tud!" + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Ez nem semmi, túllépted a függőségek számát, amit ez az APT kezelni tud." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Hiba történt %s feldolgozásakor (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Hiba történt %s feldolgozásakor (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "%s %s csomag nem volt megtalálható a fájl függőségeinek feldolgozása közben" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni" # FIXME -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "\"Előkészít\" kapcsolatok összegyűjtése" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "IO hiba a forrás-gyorsítótár mentésekor" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "sikertelen átnevezés, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Az MD5Sum nem megfelelő" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "Nincs elérhető nyilvános kulcs az alábbi kulcs azonosítókhoz:\n" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2584,7 +2682,7 @@ msgstr "" "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel " "kell kijavítani a csomagot. (hiányzó arch. miatt)" -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2593,14 +2691,14 @@ msgstr "" "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel " "kell kijavítani a csomagot." -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "A csomagindex-fájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz." -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "A méret nem megfelelő" @@ -2609,7 +2707,7 @@ msgstr "A méret nem megfelelő" msgid "Vendor block %s contains no fingerprint" msgstr "A(z) %s terjesztő blokk nem tartalmaz ujjlenyomatot" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2618,52 +2716,54 @@ msgstr "" "%s CD-ROM csatolási pont használata\n" "CD-ROM csatolása\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "Azonosítás.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "Tárolt címke: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "%s CD-ROM csatolási pont használata\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM leválasztása\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "Várakozás a lemezre...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM felcsatolása...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "Indexfájlok keresése a lemezen...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "%i csomagindexet, %i forrásindexet és %i aláírást találtam\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "Tárolt címke: %s \n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "E név érvénytelen, próbáld újra.\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2672,93 +2772,97 @@ msgstr "" "E lemez neve: \n" "%s\n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Csomaglisták másolása..." -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Új forráslista írása\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "E lemezhez tartozó forráslista-bejegyzések a következők:\n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "CD-ROM leválasztása..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "%i rekord kiírva.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i rekord kiírva, %i hiányzó fájllal.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i rekord kiírva %i hibásan párosított fájllal\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "%i rekord kiírva %i hiányzó és %i hibásan párosított fájllal\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "%s előkészítése" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "%s kicsomagolása" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "%s konfigurálásának előkészítése" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "%s konfigurálása" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "Telepített %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "%s eltávolításának előkészítése" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "%s eltávolítása" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "Eltávolított %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "%s teljes eltávolítása előkészítése" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "%s teljesen eltávolítva" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "%s fájl foltozása sikertelen" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "A kapcsolat idő előtt lezárult" @@ -2766,34 +2870,14 @@ msgstr "A kapcsolat idő előtt lezárult" #~ msgid "File date has changed %s" #~ msgstr "A fájl dátuma megváltozott %s" -#~ msgid "Total Distinct Descriptions: " -#~ msgstr "Összes külső leírás: " - -#~ msgid "Total Desc/File relations: " -#~ msgstr "Összes Leírás/Fájl kapcsolat: " - #~ msgid "Reading file list" #~ msgstr "Fájllista olvasása" #~ msgid "Could not execute " #~ msgstr "Nem futtatható" -#~ msgid "Error occured while processing %s (NewFileDesc1)" -#~ msgstr "Hiba történt %s feldolgozásakor (NewFileDesc1)" - -#~ msgid "Error occured while processing %s (NewFileDesc2)" -#~ msgstr "Hiba történt %s feldolgozásakor (NewFileDesc2)" - -#~ msgid "Wow, you exceeded the number of descriptions this APT is capable of." -#~ msgstr "" -#~ "Ez nem semmi, túllépted a csomagleírások számát, amit ez az APT kezelni " -#~ "tud!" - #~ msgid "Preparing for remove with config %s" #~ msgstr "Előkészítés eltávolításhoz %s konfigurálásával" #~ msgid "Removed with config %s" #~ msgstr "%s konfigurálásával eltávolítva" - -#~ msgid "Could not patch file" -#~ msgstr "%s fájl foltozása sikertelen" diff --git a/po/it.po b/po/it.po index ea4837445..b05a97d82 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2006-10-12 09:27+0200\n" "Last-Translator: Samuele Giovanni Tonon \n" "Language-Team: Italian \n" @@ -13,146 +13,156 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-15\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Il pacchetto %s, versione %s, ha una dipendenza non soddisfatta:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Impossibile trovare il pacchetto %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "Totale nomi dei pacchetti : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Pacchetti normali: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Pacchetti virtuali puri: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Pacchetti virtuali singoli: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Pacchetti virtuali misti: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Mancante: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Totale versioni distinte: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Totale versioni distinte: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Totale dipendenze: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Totale relazioni ver/file: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Totale relazioni ver/file: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Totale corrispondenze fornite: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Totale stringhe globalizzate: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Totale spazio di dipendenza di versione: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Totale spazio \"slack\": " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Totale spazio occupato: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Il file dei pacchetti %s non sincronizzato." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Bisogna specificare un singolo pattern" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Nessun pacchetto trovato" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "File dei pacchetti:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "La cache non sincronizzata, impossibile referenziare un file di pacchetti" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Pacchetti con pin:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(non trovato)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Installato: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(nessuno)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Candidato: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Pin del pacchetto: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Tabella versione:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s per %s %s compilato il %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -302,7 +312,7 @@ msgstr "" " -c=? Legge come configurazione il file specificato\n" " -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "Impossibile scrivere in %s" @@ -311,31 +321,31 @@ msgstr "Impossibile scrivere in %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Impossibile trovare una versione di debconf. Debconf installato?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "L'estensione del pacchetto troppo lunga" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "Errore durante l'analisi della directory %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "L'estensione del sorgente troppo lunga" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Errore nella scrittura dell'header nel file contents" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Errore nell'analisi dei contents %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -417,26 +427,26 @@ msgstr "" " -c=? Legge come configurazione il file specificato\n" " -o=? Imposta un'opzione arbitraria di configurazione" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Nessuna selezione corrisponde" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Mancano alcuni file nel file group di pacchetti `%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB era corrotto, il file stato rinominato in %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Il DB vecchio, tentativo di aggiornamento %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." @@ -444,106 +454,106 @@ msgstr "" "Il formato DB non valido. Se avete aggiornato da una vecchia versione di " "apt,rimuovete e ricreate il database." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Impossibile aprire il file DB %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "Impossibile analizzare %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "L'archivio non ha un campo control" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Impossibile ottenere un cursore" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Impossibile leggere la directory %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Impossibile analizzare %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "E: Errori applicati al file " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "Impossibile risolvere %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "Visita dell'albero fallita" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "Impossibile aprire %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "Impossibile eseguire readlink su %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "Impossibile eseguire unlink su %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Impossibile eseguire link tra %s e %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink limite di %sB raggiunto.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "L'archivio non ha un campo package" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s non ha un campo override\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s maintainer %s non %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr " %s non ha un campo source override\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s non ha neppure un campo binary override\n" @@ -557,165 +567,165 @@ msgstr "Errore interno, impossibile trovare il campo %s" msgid "realloc - Failed to allocate memory" msgstr "realloc - Impossibile allocare memoria" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Impossibile aprire %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Override malformato %s linea %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Override malformato %s linea %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Override malformato %s linea %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Impossibile leggere il file override %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritmo di compressione '%s' sconosciuto" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "L'output compresso %s necessita di un insieme di compressione" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Impossibile creare un pipe IPC verso il sottoprocesso" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "Impossibile creare FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "Impossibile eseguire fork" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "Sottoprocesso compresso" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "Errore interno, impossibile creare %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "Impossibile creare un sottoprocesso IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "Impossibile eseguire compressor" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "decompressore" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "I/O al sottoprocesso/file fallito" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "Impossibile leggere durante l'elaborazione MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "Problema nell'unlink di %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Impossibile rinominare %s in %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "Errore di compilazione della regex - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "ma %s installato" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "ma %s sta per essere installato" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "ma non installabile" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "ma un pacchetto virtuale" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "ma non installato" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "ma non sta per essere installato" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " oppure" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "I seguenti pacchetti NUOVI (NEW) saranno installati:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "I seguenti pacchetti saranno RIMOSSI:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "I seguenti pacchetti saranno aggiornati:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "I seguenti pacchetti saranno RETROCESSI (DOWNGRADED):" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "I seguenti pacchetti bloccati saranno cambiati:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (a causa di %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -724,149 +734,149 @@ msgstr "" "Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa " "si sta facendo!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aggiornati, %lu installati, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstallati, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu retrocessi (downgraded), " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu da rimuovere e %lu non aggiornati.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu non completamente installati o rimossi.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Correzione delle dipendenze in corso..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " fallita." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Impossibile correggere le dipendenze" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Impossibile minimizzare l'insieme da aggiornare" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Fatto" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" " consigliabile eseguire `apt-get -f install' per correggere questi problemi." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Dipendenze non trovate. Riprovare usando -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Avviso di autenticazione disabilitato \n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Installare questi pacchetti senza la verifica [s/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Non stato possibile autenticare alcuni pacchetti" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Sussistono dei problemi e -y stata usata senza --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "Errore interno, InstallPackages stato chiamato con un pacchetto rotto!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "I pacchetti devono essere rimossi ma il remove disabilitato." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Errore interno, l'ordinamento non terminato" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "Impossibile creare un lock sulla directory di download" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "La lista dei sorgenti non pu essere letta." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Che strano... le dimensioni non corrispondono, inviare un'email a " "apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr " necessario prendere %sB/%sB di archivi. \n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr " necessario prendere %sB di archivi. \n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Dopo l'estrazione, verranno occupati %sB di spazio su disco.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Dopo l'estrazione, verranno liberati %sB di spazio su disco.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossibile determinare lo spazio libero su %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Lo spazio libero in %s non sufficiente." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" " stata specificata la modalit Trivial Only ma questa non un'operazione " "triviale" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "SI, esegui come richiesto!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -877,28 +887,28 @@ msgstr "" "Per continuare scrivere la frase '%s' \n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "Interrotto." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Continuare [S/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossibile ottenere %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Il download di alcuni file fallito" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "Download completato e in modalit download-only" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -906,49 +916,49 @@ msgstr "" "Impossibile prendere alcuni archivi, forse meglio eseguire apt-get update " "o provare l'opzione --fix-missing" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing su media estraibili non ancora supportato" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Impossibile correggere i pacchetti mancanti" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Interruzione dell'installazione in corso." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, si sta selezionando %s al posto di %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "%s stato saltato, perch gi installato e l'aggiornamento non stato " "impostato.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Il pacchetto %s non installato, quindi non stato rimosso\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Il pacchetto %s un pacchetto virtuale fornito da:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Installato]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Bisogna esplicitamente sceglierne uno da installare." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -959,49 +969,49 @@ msgstr "" "pacchetto. Questo significa che il pacchetto manca, diventato obsoleto\n" "o disponibile solo all'interno di un'altra sorgente\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Comunque il seguente pacchetto lo sostituisce:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Il pacchetto %s non ha candidati da installare" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "La reinstallazione di %s non possibile, non pu essere scaricato.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s gi alla versione pi recente.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Non stata trovata la release '%s' per '%s'" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Non stata trovata la versione '%s' per '%s'" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versione selezionata %s (%s) per %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Il comando update non accetta argomenti" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Impossibile creare un lock sulla directory di list" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1009,26 +1019,66 @@ msgstr "" "Impossibile scaricare alcune file di indice, essi verranno ignorati, oppure " "si useranno quelli precedenti." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "I seguenti pacchetti NUOVI (NEW) saranno installati:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: " + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Errore interno, problem resolver ha rotto qualcosa" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Errore interno, AllUpgrade ha rotto qualcosa" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Impossibile trovare %s" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "Impossibile trovare %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, si sta selezionando %s per la regex '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "ma %s sta per essere installato" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" " consigliabile eseguire 'apt-get -f install' per correggere questi problemi:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1036,7 +1086,7 @@ msgstr "" "Dipendenze non soddisfatte. Provare 'apt-get -f install' senza pacchetti (o " "specificare una soluzione)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1048,7 +1098,7 @@ msgstr "" "si sta usando la distribuzione \"unstable\", che alcuni pacchetti\n" "richiesti non sono ancora stati creati o rimossi da incoming." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1058,121 +1108,132 @@ msgstr "" "il pacchetto semplicemente non sia installabile, si consiglia\n" "di inviare un \"bug report\" per tale pacchetto." -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: " - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "Pacchetto non integro" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "I seguenti pacchetti verranno inoltre installati:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "Pacchetti suggeriti:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "Pacchetti raccomandati:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "Calcolo dell'aggiornamento in corso... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Fallito" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "Fatto" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "Errore interno, problem resolver ha rotto qualcosa" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "Bisogna specificare almeno un pacchetto di cui scaricare il sorgente" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossibile trovare un pacchetto sorgente per %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Si saltato il file gi scaricato '%s'\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "Lo spazio libero in %s non sufficiente" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr " necessario prendere %sB/%sB di sorgenti.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr " necessario prendere %sB di sorgenti\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "Prelievo del sorgente %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "Non stato possibile scaricare alcuni archivi." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Si saltata l'estrazione del sorgente gi estratto in %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando di estrazione '%s' fallito.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verificare se il pacchetto 'dpkg-dev' installato.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando di costruzione '%s' fallito.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "Processo figlio fallito" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "" "Bisogna specificare almeno un pacchetto di cui controllare la generazione di " "dipendenze" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossibile ottenere informazioni di dipendenza di costruzione per %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ha dipendenze di costruzione.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1181,7 +1242,7 @@ msgstr "" "%s dipendenze per %s non possono essere soddisfatte perch non si trova il " "pacchetto %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1190,32 +1251,33 @@ msgstr "" "%s dipendenze per %s non possono essere soddisfatte perch nessuna versione " "del pacchetto %s pu soddisfare le richieste di versione" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "La dipendenza %s per %s non stata soddisfatta: il pacchetto installato %s " " troppo nuovo" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "La dipendenza %s per %s: %s fallita" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Non stato possibile soddisfare le dipendenze di costruzione per %s." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "Il calcolo delle dipendenze per la costruzione fallito" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "Moduli supportati:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1230,6 +1292,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1399,190 +1462,190 @@ msgstr "" msgid "Merging available information" msgstr "Aggiornamento delle informazioni disponibili" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Impossibile creare delle pipe" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Impossibile eseguire gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Archivio corrotto" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Checksum di tar fallito, archivio corrotto" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tipo %u nell'header del tar sconosciuto, member %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Firma dell'archivio non valida" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Errore nella lettura del member header dell'archivio" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Member header dell'archivio non valido" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "L'archivio troppo corto" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Impossibile leggere gli header dell'archivio" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "Dropnode invocata su un nodo ancora collegato" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Impossibile localizzare l'elemento hash!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Impossibile allocare la deviazione" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Errore interno in AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "" "Tentativo di sovrascrittura di una deviazione in corso, %s -> %s e %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Doppia aggiunta di deviazione %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "File di configurazione duplice %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Impossibile scrivere il file %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Chiusura del file %s fallita" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Il path %s troppo lungo" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Estrazione di %s eseguita pi di una volta" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "La directory %s deviata" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "" "Il pacchetto sta cercando di scrivere nella deviazione di destinazione %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Il path della deviazione troppo lungo" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "La directory %s sta per essere sostituita da una non-directory" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Impossibile localizzare il nodo nel suo hash bucket" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Il path troppo lungo" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Il pacchetto sovrascritto corrisponde senza versione per %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Il file %s/%s sovrascrive quello nel pacchetto %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Impossibile leggere %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Impossibile analizzare %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Impossibile rimuovere %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Impossibile creare %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Impossibile analizzare %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "Le directory temp e info devono essere sullo stesso filesystem" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "Lettura della lista dei pacchetti in corso" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Impossibile raggiungere la directory admin %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "Errore interno nel prendere un nome di un pacchetto" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Lettura della lista dei file in corso" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1593,77 +1656,77 @@ msgstr "" "questo file allora crearne uno vuoto e reinstallare immediatamente la stessa " "versione del pacchetto!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Errore nella lettura del file di lista %sinfo%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Errore interno nel prendere un nodo" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Impossibile aprire il file di diversion %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Il file di diversion corrotto" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "Linea non valida nel file di diversion: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Errore interno nell'aggiunta di una diversion" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "La cache dei pacchetti deve prima essere inizializzata" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Impossibile trovare un Pacchetto: header, offset %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Sezione ConfFile nel file status non corretta. Offset %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Errore nel parsing MD5. Offset %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Questo non un archivio DEB valido, member '%s' mancante" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "Questo non un archivio DEB valido, campi '%s' o '%s' mancanti" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "Impossibile cambiare su %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "Errore interno, impossibile localizzare il campo" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "Impossibile localizzare un file control valido" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "File control non corretto" @@ -1698,11 +1761,12 @@ msgid "File not found" msgstr "File non trovato" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Impossibile analizzare" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Impossibile impostare la data di modifica (modification time)" @@ -1764,7 +1828,7 @@ msgstr "Timeout della connessione" msgid "Server closed the connection" msgstr "Il server ha chiuso la connessione" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "Errore di lettura" @@ -1776,7 +1840,7 @@ msgstr "Una risposta ha superato le dimensioni del buffer." msgid "Protocol corruption" msgstr "Corruzione nel protocollo" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "Errore di scrittura" @@ -1831,7 +1895,7 @@ msgstr "Tempo limite di connessione esaurito per il socket dati" msgid "Unable to accept connection" msgstr "Impossibile accettare connessioni" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problemi nella creazione dell'hash del file" @@ -1858,40 +1922,40 @@ msgstr "Query" msgid "Unable to invoke " msgstr "Impossibile invocare " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Connessione a %s (%s) in corso" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Impossibile creare un socket per %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Impossibile iniziare la connessione a %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" "Impossibile connettersi a %s:%s (%s), tempo limite di connessione esaurito" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Impossibile connettersi a %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Connessione a %s in corso" @@ -1969,433 +2033,453 @@ msgstr "Impossibile aprire una pipe per %s" msgid "Read error from %s process" msgstr "Errore di lettura dal processo %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "In attesa degli header" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Si ottenuto una singola linea di header su %u caratteri" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Linea nell'header non corretta" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Il server HTTP ha inviato un header di risposta non valido" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Il server HTTP ha inviato un Content-Length non valido" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Il server HTTP ha inviato un Content-Range non valido" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Questo server HTTP ha il supporto del range bacato" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Formato della data sconosciuto" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Select fallito" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Tempo limite per la connessione esaurito" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Errore nella scrittura del file di output" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Errore nella scrittura nel file" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Errore nella scrittura nel file" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "" "Errore nella lettura dal server. Il lato remoto ha chiuso la connessione" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Errore nella lettura dal server" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Header dei dati malformato" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Connessione fallita" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Errore interno" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "Impossibile eseguire mmap su un file vuoto" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Impossibile eseguire mmap di %lu byte" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "Selezione %s non trovata" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Tipo di abbreviazione non riconosciuto: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "Apertura del file di configurazione %s in corso" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "Linea %d troppo lunga (max %d)" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Errore di sintassi %s:%u: Il blocco inizia senza nome" -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Errore di sintassi %s:%u: Tag malformato" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Errore di sintassi %s:%u: Carattere extra dopo il valore" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Errore di sintassi %s:%u: Le direttive possono essere fatte solo al livello " "pi alto" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Errore di sintassi %s:%u: Troppi include annidati" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Errore di sintassi %s:%u: Incluso da qui" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Errore di sintassi %s:%u: Direttiva non supportata '%s'" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Errore di sintassi %s:%u: caratteri extra alla fine del file" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Errore!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... Fatto" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "L'opzione da linea di comando '%c' [da %s] sconosciuta." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "L'opzione da linea di comando %s non chiara" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "L'opzione da linea di comando %s, non booleana" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "L'opzione %s richiede un argomento." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" "Opzione %s: la specifica di configurazione del parametro deve avere un " "=." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "L'opzione %s richiede un argomento intero, non '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "L'opzione '%s' troppo lunga" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Il valore %s non chiaro, provare true o false." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Operazione non valida %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Impossibile accedere al mount point %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Impossibile raggiungere %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "Impossibile accedere al cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Locking disabilitato per il file di lock in sola lettura %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "Impossibile aprire il file di lock %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Lock disabilitato per il file di lock %s nfs montato" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "Impossibile ottenere il lock %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "In attesa per %s ma non presente" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Il sottoprocesso %s ha ricevuto un segmentation fault." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Il sottoprocesso %s ha ritornato un codice d'errore (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Il sottoprocesso %s uscito inaspettatamente" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "Impossibile aprire il file %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "letto, c'erano ancora %lu da leggere ma non e' stato lasciato nulla" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "scrittura, c'erano ancora %lu da scrivere ma non era possibile" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "Si verificato un problema chiudendo il file" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "Si verificato un problema rimuovendo il file" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "Si verificato un problema sincronizzando il file" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Cache dei pacchetti vuota" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Il file cache dei pacchetti corrotto" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Il file cache dei pacchetti in una versione incompatibile" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Questo APT non supporta il sistema di versioning '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "" "Il file cache dei pacchetti stato generato per un'architettura differente" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Dipende" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Predipende" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Consiglia" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Raccomanda" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Va in conflitto" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Sostituisce" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Rende obsoleto" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "richiesto" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opzionale" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "Generazione dell'albero delle dipendenze in corso" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "Versioni candidate" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "Generazione delle dipendenze" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "Aggiornamento delle informazioni disponibili" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Impossibile aprire %s" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Impossibile scrivere il file %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Impossibile analizzare il file dei pacchetti %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Impossibile analizzare il file dei pacchetti %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "La linea %lu in %s (URI) non corretta" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "La linea %lu in %s (dist) non corretta" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "La linea %lu in %s (URI parse) non corretta" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "La linea %lu nella lista delle fonti %s (Absolute dist) non corretta" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "La linea %lu in %s (dist parse) non corretta" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Apertura di %s in corso" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Linea %u troppo lunga nel source list %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "La linea %u in %s (type) non corretta" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Il tipo '%s' non riconosciuto alla linea %u nella lista sorgenti %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "La linea %u in %s (vendor id) non corretta" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2406,12 +2490,12 @@ msgstr "" "essenziale %s a causa di un loop Conflitto/Pre-Dipendenza. Questo non " "bene, ma se si vuole farlo, si attivi l'opzione APT::Force-LoopBreak " -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Il file indice di tipo '%s' non supportato" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2419,7 +2503,7 @@ msgstr "" "Il pacchetto %s deve essere reinstallato, ma non si riesce a trovare un " "archivio per esso." -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2427,190 +2511,208 @@ msgstr "" "Errore, pkgProblemResolver::Resolve ha generato uno stop, questo pu essere " "causato da pacchetti bloccati " -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "Impossibile correggere i problemi, ci sono pacchetti rotti bloccati" -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Manca la directory di liste %spartial." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Manca la directory di archivio %spartial." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Scaricamento file %li di %li (%s rimanente)" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "Scaricamento file %li di %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Non stato possibile trovare un driver per il metodo %s." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Il metodo %s non partito correttamente" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Per favore inserire il disco chiamato '%s' nel dispositivo '%s' e premere " "invio." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Il sistema di archiviazione (packaging) '%s' non supportato" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Impossibile analizzare %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Bisogna inserire alcuni URI di tipo 'source' in sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "" "La lista dei pacchetti o il file di status non possono essere letti o aperti." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr " consigliabile eseguire apt-get update per correggere questi problemi" -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Campo non valido nel file delle preferenze, Manca \"Package header\"" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Impossibile capire il tipo di pin %s" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Nessuna (o zero) priorit specificata per il pin" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "La cache ha un sistema incompatibile di gestione delle versioni" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Errore nell'analisi di %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Errore nell'analisi di %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Errore nell'analisi di %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Errore nell'analisi di %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Errore nell'analisi di %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Errore nell'analisi di %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Errore nell'analisi di %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Errore nell'analisi di %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Errore nell'analisi di %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "WOW, si ecceduto il numero massimo di nomi di pacchetti che questo APT " "capace di gestire" -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "WOW, si ecceduto il numero massimo di versioni che questo APT capace di " "gestire" -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"WOW, si ecceduto il numero massimo di versioni che questo APT capace di " +"gestire" + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "WOW, si ecceduto il numero massimo di dipendenze che questo APT capace " "di gestire" -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Errore nell'analisi di %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Errore nell'analisi di %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" " stato impossibile trovare %s %s mentre si processava le dipendenze dei file" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "Impossibile controllare la lista dei pacchetti sorgente %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "Il File Collezionato Fornisce" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "Errore di I/O nel salvataggio del cache sorgente" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "rename() fallita: %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Somma MD5 non corrispondente" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Non esiste una chiave pubblica disponibile per i seguenti ID di chiave:\n" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2620,7 +2722,7 @@ msgstr "" "che bisogna correggere manualmente l'errore. (a causa di un'architettura " "mancante)" -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2629,7 +2731,7 @@ msgstr "" "Non stato possibile trovare file per il pacchetto %s. Questo significa che " "bisogna correggere manualmente l'errore." -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2637,7 +2739,7 @@ msgstr "" "I file indice dei pacchetti sono corrotti. Non c' un campo Filename: per il " "pacchetto %s." -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Le Dimensioni non corrispondono" @@ -2646,7 +2748,7 @@ msgstr "Le Dimensioni non corrispondono" msgid "Vendor block %s contains no fingerprint" msgstr "Il blocco vendor %s non contiene dati" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2655,52 +2757,54 @@ msgstr "" "Si user il punto di montaggio del CD-ROM %s\n" "Montaggio CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "Identificazione in corso.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "Etichette salvate: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Si user il mount point del CD-ROM %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "Smontaggio CD-ROM in corso\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "In attesa del disco...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "Montaggio CD-ROM in corso \n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "Scansione del disco alla ricerca di file indice, in corso..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "Trovati %i indici di pacchetto, %i indici di sorgenti e %i firme\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "Etichette salvate: %s \n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "Questo non un nome valido, riprovare.\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2709,93 +2813,97 @@ msgstr "" "Questo disco chiamato: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Copia della lista dei pacchetti in corso..." -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Scrittura di una nuova lista sorgenti in corso\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Le voci lista sorgenti per questo Disco sono:\n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "Smontaggio CD-ROM in corso..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Scritti %i record.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Scritti %i record con %i file mancanti.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Scritti %i record con %i file senza match\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Scritti %i record con %i file mancanti e %i file senza match\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Preparazione di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Scompattamento di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Preparazione alla configurazione di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Configurazione di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "%s Installato" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Preparazione per la rimozione di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Rimozione di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "%s rimosso" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparazione alla rimozione totale di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "Rimozione totale completata %s" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "Impossibile aprire il file %s" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Connessione chiusa prematuramente" @@ -2803,9 +2911,6 @@ msgstr "Connessione chiusa prematuramente" #~ msgid "File date has changed %s" #~ msgstr "La data del file è cambiata %s" -#~ msgid "Could not patch file" -#~ msgstr "Impossibile aprire il file %s" - #~ msgid "Reading file list" #~ msgstr "Lettura della lista dei file in corso" diff --git a/po/ja.po b/po/ja.po index 5aa09a7ba..8b6d30218 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2006-09-08 19:57+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian Japanese List \n" @@ -16,145 +16,155 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8 bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "パッケージ %s のバージョン %s には解決不可能な依存関係があります:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "パッケージ %s が見つかりません" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "パッケージ名総数: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " 通常パッケージ: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " 純粋仮想パッケージ: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " 単一仮想パッケージ: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " 複合仮想パッケージ: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " 欠落: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "個別バージョン総数: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "個別バージョン総数: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "依存関係総数: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "バージョン/ファイル関係総数: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "バージョン/ファイル関係総数: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "提供マッピング総数: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Glob 文字列の総数: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "総依存関係・バージョン容量: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "総空き容量: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "総占有容量: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Package ファイル %s が同期していません。" -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "パターンはちょうど 1 つだけ指定してください" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "パッケージが見つかりません" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "パッケージファイル:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "キャッシュが同期しておらず、パッケージファイルを相互参照できません" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Pin パッケージ:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(見つかりません)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " インストールされているバージョン: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(なし)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " 候補: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " パッケージ Pin: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " バージョンテーブル:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s コンパイル日時: %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -302,7 +312,7 @@ msgstr "" " -c=? 指定した設定ファイルを読み込む\n" " -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "%s に書き込めません" @@ -312,31 +322,31 @@ msgid "Cannot get debconf version. Is debconf installed?" msgstr "" "debconf のバージョンを取得できません。debconf はインストールされていますか?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "パッケージ拡張子リストが長すぎます" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "ディレクトリ %s の処理中にエラーが発生しました" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "ソース拡張子リストが長すぎます" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Contents ファイルへのヘッダの書き込み中にエラーが発生しました" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Contents %s の処理中にエラーが発生しました" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -417,26 +427,26 @@ msgstr "" " -c=? 指定の設定ファイルを読む\n" " -o=? 任意の設定オプションを設定する" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "選択にマッチするものがありません" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "パッケージファイルグループ `%s' に見当たらないファイルがあります" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB が壊れていたため、ファイル名を %s.old に変更しました" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB が古いため、%s のアップグレードを試みます" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." @@ -444,106 +454,106 @@ msgstr "" "DB フォーマットが無効です。apt の古いバージョンから更新したのであれば、データ" "ベースを削除・再作成してください。" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "DB ファイル %s を開くことができません: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "%s の状態を取得するのに失敗しました" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "アーカイブにコントロールレコードがありません" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "カーソルを取得できません" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "警告: ディレクトリ %s が読めません\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "警告: %s の状態を取得できません\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "エラー: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "警告: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "エラー: エラーが適用されるファイルは " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "%s の解決に失敗しました" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "ツリー内での移動に失敗しました" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "%s のオープンに失敗しました" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr " リンク %s [%s] を外します\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "%s のリンク読み取りに失敗しました" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "%s のリンク解除に失敗しました" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** %s を %s にリンクするのに失敗しました" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " リンクを外す制限の %sB に到達しました。\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "アーカイブにパッケージフィールドがありませんでした" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s に override エントリがありません\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %1$s メンテナは %3$s ではなく %2$s です\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr " %s にソース override エントリがありません\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s にバイナリ override エントリがありません\n" @@ -557,165 +567,165 @@ msgstr "内部エラー、メンバー %s を特定できません" msgid "realloc - Failed to allocate memory" msgstr "realloc - メモリの割り当てに失敗しました" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "'%s' をオープンできません" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "不正な override %s %lu 行目 #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "不正な override %s %lu 行目 #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "不正な override %s %lu 行目 #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "override ファイル %s を読み込むのに失敗しました" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "'%s' は未知の圧縮アルゴリズムです" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "圧縮出力 %s には圧縮セットが必要です" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "子プロセスへの IPC パイプの作成に失敗しました" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "FILE* の作成に失敗しました" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "fork に失敗しました" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "圧縮子プロセス" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "内部エラー、%s の作成に失敗しました" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "子プロセス IPC の生成に失敗しました" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "以下の圧縮ツールの実行に失敗しました: " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "展開ツール" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "子プロセス/ファイルへの IO が失敗しました" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "MD5 の計算中に読み込みに失敗しました" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "%s のリンク解除で問題が発生しました" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "%s を %s に名前変更できませんでした" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "正規表現の展開エラー - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "以下のパッケージには満たせない依存関係があります:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "しかし、%s はインストールされています" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "しかし、%s はインストールされようとしています" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "しかし、インストールすることができません" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "しかし、これは仮想パッケージです" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "しかし、インストールされていません" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "しかし、インストールされようとしていません" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " または" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "以下のパッケージが新たにインストールされます:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "以下のパッケージは「削除」されます:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "以下のパッケージは保留されます:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "以下のパッケージはアップグレードされます:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "以下のパッケージは「ダウングレード」されます:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "以下の変更禁止パッケージは変更されます:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (%s のため) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -723,146 +733,146 @@ msgstr "" "警告: 以下の不可欠パッケージが削除されます。\n" "何をしようとしているか本当にわかっていない場合は、実行してはいけません!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "アップグレード: %lu 個、新規インストール: %lu 個、" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "再インストール: %lu 個、" -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "ダウングレード: %lu 個、" -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "削除: %lu 個、保留: %lu 個。\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "依存関係を解決しています ..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " 失敗しました。" -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "依存関係を訂正できません" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "アップグレードセットを最小化できません" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " 完了" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "これらを直すためには 'apt-get -f install' を実行する必要があるかもしれませ" "ん。" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "未解決の依存関係があります。-f オプションを試してください。" -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "警告: 以下のパッケージは認証されていません!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "認証の警告は上書きされました。\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "検証なしにこれらのパッケージをインストールしますか [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "いくつかのパッケージを認証できませんでした" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "問題が発生し、-y オプションが --force-yes なしで使用されました" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "内部エラー、InstallPackages が壊れたパッケージで呼び出されました!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "パッケージを削除しなければなりませんが、削除が無効になっています。" -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "内部エラー、調整が終わっていません" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "ダウンロードディレクトリをロックできません" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "ソースのリストを読むことができません。" -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "おっと、サイズがマッチしません。apt@packages.debian.org にメールしてください" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%2$sB 中 %1$sB のアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "%sB のアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "展開後に追加で %sB のディスク容量が消費されます。\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "展開後に %sB のディスク容量が解放されます。\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s の空き領域を測定できません" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "%s に充分な空きスペースがありません。" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only が指定されましたが、これは簡単な操作ではありません。" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -873,28 +883,28 @@ msgstr "" "続行するには、'%s' というフレーズをタイプしてください。\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "中断しました。" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "続行しますか [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s の取得に失敗しました %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "いくつかのファイルの取得に失敗しました" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -902,49 +912,49 @@ msgstr "" "いくつかのアーカイブが取得できません。apt-get update を実行するか --fix-" "missing オプションを付けて試してみてください。" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing とメディア交換は現在同時にはサポートされていません" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "足りないパッケージを直すことができません。" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "インストールを中断します。" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "注意、%2$s の代わりに %1$s を選択します\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "すでにインストールされておりアップグレードも設定されていないため、%s をスキッ" "プします。\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "パッケージ %s はインストールされていないため、削除はできません\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s は以下のパッケージで提供されている仮想パッケージです:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [インストール済み]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "インストールするパッケージを明示的に選択する必要があります。" -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -955,49 +965,49 @@ msgstr "" "おそらく、そのパッケージが見つからないか、もう古くなっているか、\n" "あるいは別のソースからのみしか利用できないという状況が考えられます\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "しかし、以下のパッケージで置き換えられています:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "パッケージ %s にはインストール候補がありません" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "ダウンロードできないため、%s の再インストールは不可能です。\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s はすでに最新バージョンです。\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%2$s' のリリース '%1$s' が見つかりませんでした" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "%3$s にはバージョン %1$s (%2$s) を選択しました\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "update コマンドは引数をとりません" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "list ディレクトリをロックできません" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1005,27 +1015,67 @@ msgstr "" "いくつかのインデックスファイルのダウンロードに失敗しました。これらは無視され" "るか、古いものが代わりに使われます。" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "以下のパッケージが新たにインストールされます:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "以下の情報がこの問題を解決するために役立つかもしれません:" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "内部エラー、問題リゾルバが何かを破壊しました" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "内部エラー、AllUpgrade が何かを破壊しました" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "パッケージ %s が見つかりません" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "パッケージ %s が見つかりません" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意: 正規表現 '%2$s' に対して %1$s を選択しました\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "しかし、%s はインストールされようとしています" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ" "ません:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1033,7 +1083,7 @@ msgstr "" "未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法" "を明示してください)。" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1045,7 +1095,7 @@ msgstr "" "であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n" "動されていないことが考えられます。" -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1055,122 +1105,133 @@ msgstr "" "可能性が高いです。そのため、このパッケージへのバグレポートを送ってくだ\n" "さい。" -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "以下の情報がこの問題を解決するために役立つかもしれません:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "壊れたパッケージ" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "以下の特別パッケージがインストールされます:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "提案パッケージ:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "推奨パッケージ:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "アップグレードパッケージを検出しています ... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "失敗" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "完了" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "内部エラー、問題リゾルバが何かを破壊しました" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "" "ソースを取得するには少なくともひとつのパッケージ名を指定する必要があります" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "%s のソースパッケージが見つかりません" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "すでにダウンロードされたファイル '%s' をスキップします\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "%s に充分な空きスペースがありません" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB のソースアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "ソース %s を取得\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "いくつかのアーカイブの取得に失敗しました。" -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "展開コマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" "'dpkg-dev' パッケージがインストールされていることを確認してください。\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "ビルドコマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "子プロセスが失敗しました" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "" "ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s のビルド依存情報を取得できません" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "%s にはビルド依存情報が指定されていません。\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1179,7 +1240,7 @@ msgstr "" "パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと" "ができません" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1188,32 +1249,33 @@ msgstr "" "入手可能な %3$s はいずれもバージョンについての要求を満たせないため、%2$s に対" "する %1$s の依存関係を満たすことができません" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%2$s の依存関係 %1$s を満たすことができません: インストールされた %3$s パッ" "ケージは新しすぎます" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s のビルド依存関係を満たすことができませんでした。" -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "ビルド依存関係の処理に失敗しました" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "サポートされているモジュール:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1228,6 +1290,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1391,189 +1454,189 @@ msgstr "が重要です。これを修正して「導入」を再度実行して msgid "Merging available information" msgstr "入手可能情報をマージしています" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "パイプの生成に失敗しました" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "gzip の実行に失敗しました" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "壊れたアーカイブ" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "tar チェックサムが失敗しました。アーカイブが壊れています" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "未知の TAR ヘッダタイプ %u、メンバー %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "不正なアーカイブ署名" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "アーカイブメンバーヘッダの読み込みに失敗しました" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "不正なアーカイブメンバーヘッダ" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "アーカイブが不足しています" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "アーカイブヘッダの読み込みに失敗しました" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "リンクされているノードで DropNode が呼ばれました" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "ハッシュ要素を特定することができません!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "diversion の割り当てに失敗しました" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "AddDiversion での内部エラー" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "%s -> %s と %s/%s の diversion を上書きしようとしています" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "%s -> %s の diversion が二重に追加されています" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "設定ファイル %s/%s が重複しています" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "ファイル %s の書き込みに失敗しました" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "%s のクローズに失敗しました" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "パス %s は長すぎます" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "%s を複数回展開しています" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "ディレクトリ %s は divert されています" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "" "このパッケージは diversion のターゲットの %s/%s に書き込もうとしています" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "diversion パスが長すぎます" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "ディレクトリ %s が非ディレクトリに置換されようとしています" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "ハッシュバケツ内でノードを特定するのに失敗しました" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "パスが長すぎます" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "%s に対するバージョンのないパッケージマッチを上書きします" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "ファイル %s/%s がパッケージ %s のものを上書きします" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "%s を読み込むことができません" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "%s の状態を取得できません" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "%s の削除に失敗しました" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "%s を作成できません" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "%sinfo の状態の取得に失敗しました" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "info と temp ディレクトリは同じファイルシステム上になければなりません" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "パッケージリストを読み込んでいます" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "管理ディレクトリ %sinfo への移動に失敗しました" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "パッケージ名取得中の内部エラー" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "ファイルリストを読み込んでいます" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1584,79 +1647,79 @@ msgstr "" "とができないなら、その内容を空にして即座に同じバージョンのパッケージを再イン" "ストールしてください!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "リストファイル %sinfo/%s の読み込みに失敗しました" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "内部エラー、ノードの取得" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "diversions ファイル %sdiversions のオープンに失敗しました" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "diversion ファイルが壊れています" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "diversion ファイルに不正な行があります: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "内部エラー、diversion の追加" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "最初にパッケージキャッシュを初期化しなければなりません" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Package: ヘッダを見つけるのに失敗しました。オフセット %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "status ファイルに不正な ConfFile セクションがあります。オフセット %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "MD5 の解析エラー。オフセット %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "'%s' メンバーがないため、正しい DEB アーカイブではありません" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "" "'%s' または '%s' メンバーがないため、これは正しい DEB アーカイブではありませ" "ん" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "%s に変更できませんでした" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "内部エラー、メンバーを特定できません" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "正しいコントロールファイルを特定できませんでした" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "解析できないコントロールファイル" @@ -1691,11 +1754,12 @@ msgid "File not found" msgstr "ファイルが見つかりません" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "状態の取得に失敗しました" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "変更時刻の設定に失敗しました" @@ -1757,7 +1821,7 @@ msgstr "接続タイムアウト" msgid "Server closed the connection" msgstr "サーバが接続を切断しました" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "読み込みエラー" @@ -1769,7 +1833,7 @@ msgstr "レスポンスがバッファをオーバフローさせました。" msgid "Protocol corruption" msgstr "プロトコルが壊れています" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "書き込みエラー" @@ -1823,7 +1887,7 @@ msgstr "データソケット接続タイムアウト" msgid "Unable to accept connection" msgstr "接続を accept できません" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "ファイルのハッシュでの問題" @@ -1850,39 +1914,39 @@ msgstr "問い合わせ" msgid "Unable to invoke " msgstr "呼び出せません" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "%s (%s) へ接続しています" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "%s (f=%u t=%u p=%u) に対するソケットを作成できません" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "%s:%s (%s) への接続を開始できません。" -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "%s:%s (%s) へ接続できませんでした。接続がタイムアウトしました" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "%s:%s (%s) へ接続できませんでした。" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "%s へ接続しています" @@ -1956,427 +2020,447 @@ msgstr "%s に対してパイプを開けませんでした" msgid "Read error from %s process" msgstr "%s プロセスからの読み込みエラー" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "ヘッダの待機中です" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "%u 文字を超える 1 行のヘッダを取得しました" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "不正なヘッダ行です" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "http サーバが不正なリプライヘッダを送信してきました" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "http サーバが不正な Content-Length ヘッダを送信してきました" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "http サーバが不正な Content-Range ヘッダを送信してきました" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "http サーバのレンジサポートが壊れています" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "不明な日付フォーマットです" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "select に失敗しました" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "接続タイムアウト" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "出力ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "サーバからの読み込みに失敗しました" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "不正なヘッダです" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "接続失敗" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "内部エラー" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "空のファイルを mmap できません" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "%lu バイトの mmap ができませんでした" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "選択された %s が見つかりません" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "理解できない省略形式です: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "設定ファイル %s をオープンできませんでした" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "%d 行目が長すぎます (最大 %d)" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "文法エラー %s:%u: ブロックが名前なしで始まっています。" -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "文法エラー %s:%u: 不正なタグです" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "文法エラー %s:%u: 値の後に余分なゴミが入っています" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "文法エラー %s:%u: 命令はトップレベルでのみ実行できます" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "文法エラー %s:%u: インクルードのネストが多すぎます" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "文法エラー %s:%u: ここからインクルードされています" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "文法エラー %s:%u: 未対応の命令 '%s'" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "文法エラー %s:%u: ファイルの最後に余計なゴミがあります" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... エラー!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... 完了" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "コマンドラインオプション '%c' [%s から] は不明です。" -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "コマンドラインオプション %s を理解できません" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "コマンドラインオプション %s は boolean ではありません" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "オプション %s には引数が必要です。" -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "オプション %s: 設定項目には =<値> を指定する必要があります。" -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "オプション %s には '%s' ではなく整数の引数が必要です" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "オプション '%s' は長すぎます" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "%s を解釈することができません。true か false を試してください。" -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "不正な操作 %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "マウントポイント %s の状態を取得できません" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "%s へ変更することができません" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "cdrom の状態を取得するのに失敗しました" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "読み込み専用のロックファイル %s にロックは使用しません" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "ロックファイル %s をオープンできません" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "nfs マウントされたロックファイル %s にはロックを使用しません" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "ロック %s が取得できませんでした" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s を待ちましたが、そこにはありませんでした" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "子プロセス %s がセグメンテーション違反を受け取りました。" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "子プロセス %s がエラーコード (%u) を返しました" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "子プロセス %s が予期せず終了しました" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "ファイル %s をオープンできませんでした" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "読み込みが %lu 残っているはずですが、何も残っていません" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "あと %lu 書き込む必要がありますが、書き込むことができませんでした" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "ファイルのクローズ中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "ファイルの削除中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "ファイルの同期中に問題が発生しました" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "空のパッケージキャッシュ" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "パッケージキャッシュファイルが壊れています" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "このパッケージキャッシュファイルは互換性がないバージョンです" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "この APT はバージョニングシステム '%s' をサポートしていません" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "パッケージキャッシュが異なるアーキテクチャ用に構築されています" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "依存" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "先行依存" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "提案" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "推奨" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "競合" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "置換" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "廃止" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "重要" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "要求" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "標準" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "任意" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "特別" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "依存関係ツリーを作成しています" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "候補バージョン" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "依存関係の生成" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "入手可能情報をマージしています" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "%s のオープンに失敗しました" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "ファイル %s の書き込みに失敗しました" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "パッケージファイル %s を解釈することができません (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "パッケージファイル %s を解釈することができません (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (absolute dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist parse)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s をオープンしています" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "ソースリスト %2$s の %1$u 行目が長すぎます。" -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "ソースリスト %2$s の %1$u 行目が不正です (vendor id)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2387,12 +2471,12 @@ msgstr "" "ケージ %s を削除します。これは多くの場合に問題が起こる原因となります。本当に" "これを行いたいなら、APT::Force-LoopBreak オプションを有効にしてください。" -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "インデックスファイルのタイプ '%s' はサポートされていません" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2400,7 +2484,7 @@ msgstr "" "パッケージ %s を再インストールする必要がありますが、そのためのアーカイブを見" "つけることができませんでした。" -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2408,187 +2492,203 @@ msgstr "" "エラー、pkgProblemResolver::Resolve は停止しました。おそらく変更禁止パッケー" "ジが原因です。" -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。" -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "リストディレクトリ %spartial が見つかりません。" -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "アーカイブディレクトリ %spartial が見つかりません。" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "ファイルを取得しています %li/%li (残り %s)" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "ファイルを取得しています %li/%li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "メソッドドライバ %s が見つかりません。" -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "メソッド %s が正常に開始しませんでした" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "'%s' とラベルの付いたディスクをドライブ '%s' に入れて enter を押してくださ" "い。" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "パッケージングシステム '%s' はサポートされていません" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "適切なパッケージシステムタイプを特定できません" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "%s の状態を取得できません。" -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "sources.list に 'ソース' URI を指定する必要があります" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "" "パッケージリストまたはステータスファイルを解釈またはオープンすることができま" "せん。" -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "" "これらの問題を解決するためには apt-get update を実行する必要があるかもしれま" "せん" -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "" "不正なレコードが preferences ファイルに存在します。パッケージヘッダがありませ" "ん" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "pin タイプ %s が理解できませんでした" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "pin で優先度 (または 0) が指定されていません" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "キャッシュに非互換なバージョニングシステムがあります" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "%s を処理中にエラーが発生しました (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "%s を処理中にエラーが発生しました (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "%s を処理中にエラーが発生しました (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "%s を処理中にエラーが発生しました (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "%s を処理中にエラーが発生しました (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "%s を処理中にエラーが発生しました (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "%s を処理中にエラーが発生しました (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "%s を処理中にエラーが発生しました (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "%s を処理中にエラーが発生しました (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "この APT が対応している以上の数のパッケージが指定されました。" -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "この APT が対応している以上の数のバージョンが要求されました。" -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "この APT が対応している以上の数のバージョンが要求されました。" + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "この APT が対応している以上の数の依存関係が発生しました。" -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "%s を処理中にエラーが発生しました (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "%s を処理中にエラーが発生しました (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "パッケージ %s %s がファイル依存の処理中に見つかりませんでした" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "ソースパッケージリスト %s の状態を取得できません" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "ファイル提供情報を収集しています" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "ソースキャッシュの保存中に IO エラーが発生しました" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "名前の変更に失敗しました。%s (%s -> %s)" -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "MD5Sum が適合しません" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2597,7 +2697,7 @@ msgstr "" "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります (存在しないアーキテクチャのため)。" -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2606,7 +2706,7 @@ msgstr "" "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります。" -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2614,7 +2714,7 @@ msgstr "" "パッケージインデックスファイルが壊れています。パッケージ %s に Filename: " "フィールドがありません。" -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "サイズが適合しません" @@ -2623,7 +2723,7 @@ msgstr "サイズが適合しません" msgid "Vendor block %s contains no fingerprint" msgstr "ベンダブロック %s はフィンガープリントを含んでいません" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2632,54 +2732,56 @@ msgstr "" "CD-ROM マウントポイント %s を使用します\n" "CD-ROM をマウントしています\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "確認しています.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "格納されたラベル: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "CD-ROM マウントポイント %s を使用します\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM をアンマウントしています\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "ディスクを待っています ...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM をマウントしています ...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "ディスクのインデックスファイルを走査しています ..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "" "%i のパッケージインデックス、%i のソースインデックス、%i の署名を見つけまし" "た\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "格納されたラベル: %s \n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "これは有効な名前ではありません。再試行してください。\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2688,95 +2790,99 @@ msgstr "" "このディスクは以下のように呼ばれます: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "パッケージリストをコピーしています ..." -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "新しいソースリストを書き込んでいます\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "このディスクのソースリストのエントリ:\n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "CD-ROM をアンマウントしています ..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "%i レコードを書き込みました。\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i レコードを書き込みました。%i 個のファイルが存在しません。\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i レコードを書き込みました。%i 個の適合しないファイルがあります。\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "%i レコードを書き込みました。%i 個のファイルが見つからず、%i 個の適合しない" "ファイルがあります。\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "%s を準備しています" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "%s を展開しています" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "%s の設定を準備しています" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "%s を設定しています" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "%s をインストールしました" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "%s の削除を準備しています" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "%s を削除しています" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "%s を削除しました" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "%s を完全に削除する準備をしています" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "%s を完全に削除しました" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "ファイルにパッチできませんでした" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "途中で接続がクローズされました" @@ -2784,9 +2890,6 @@ msgstr "途中で接続がクローズされました" #~ msgid "File date has changed %s" #~ msgstr "ファイル %s の日付が変更されています" -#~ msgid "Could not patch file" -#~ msgstr "ファイルにパッチできませんでした" - #~ msgid "Reading file list" #~ msgstr "ファイルリストを読み込んでいます" diff --git a/po/ko.po b/po/ko.po index 1437d4d11..d22a98e9f 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2006-10-12 21:22-0400\n" "Last-Translator: Sunjae Park \n" "Language-Team: Korean \n" @@ -13,145 +13,155 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "%s 꾸러미의 %s 버전의 의존성이 맞지 않습니다:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "%s 꾸러미를 찾을 수 없습니다" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "전체 꾸러미 이름 : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " 일반 꾸러미: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " 순수 가상 꾸러미: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " 단일 가상 꾸러미: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " 혼합 가상 꾸러미: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " 빠짐: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "전체 구역별 버전: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "전체 구역별 버전: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "전체 의존성: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "전체 버전/파일 관계: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "전체 버전/파일 관계: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "전체 제공 매핑: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "전체 패턴 문자열: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "전체 의존성 버전 용량: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "전체 빈 용량: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "차지하는 전체 용량: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "꾸러미 파일 %s 파일이 동기화되지 않았습니다." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "정확히 한 개의 패턴을 넘겨야 합니다" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "꾸러미가 없습니다" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "꾸러미 파일:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "캐시가 동기화되지 않았습니다. 꾸러미 파일을 상호 참조할 수 없습니다" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "핀 꾸러미:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(없음)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " 설치: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(없음)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " 후보: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " 꾸러미 핀: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " 버전 테이블:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s (%s %s), 컴파일 시각 %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -298,7 +308,7 @@ msgstr "" " -c=? 설정 파일을 읽습니다\n" " -o=? 임의의 옵션을 설정합니다, 예를 들어 -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "%s에 쓸 수 없습니다" @@ -307,31 +317,31 @@ msgstr "%s에 쓸 수 없습니다" msgid "Cannot get debconf version. Is debconf installed?" msgstr "debconf 버전을 알 수 없습니다. debconf가 설치되었습니까?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "꾸러미 확장 목록이 너무 깁니다" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "%s 디렉토리를 처리하는 데 오류가 발생했습니다" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "소스 확장 목록이 너무 깁니다" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "컨텐츠 파일에 헤더를 쓰는 데 오류가 발생했습니다" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "%s 컨텐츠를 처리하는 데 오류가 발생했습니다" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -412,26 +422,26 @@ msgstr "" " -c=? 이 설정 파일을 읽습니다\n" " -o=? 임의의 옵션을 설정합니다" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "맞는 꾸러미가 없습니다" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "`%s' 꾸러미 파일 그룹에 몇몇 파일이 빠졌습니다" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB가 망가졌습니다. 파일 이름을 %s.old로 바꿉니다" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB가 오래되었습니다. %s의 업그레이드를 시도합니다" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." @@ -439,108 +449,108 @@ msgstr "" "DB 형식이 잘못되었습니다. apt 예전 버전에서 업그레이드했다면, 데이터베이스를 " "지우고 다시 만드십시오." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "DB 파일, %s 파일을 열 수 없습니다: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "%s의 정보를 읽는 데 실패했습니다" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "아카이브에 컨트롤 기록이 없습니다" # FIXME: 왠 커서?? -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "커서를 가져올 수 없습니다" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "경고: %s 디렉토리를 읽을 수 없습니다\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "경고: %s의 정보를 읽을 수 없습니다\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "오류: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "경고: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "오류: 다음 파일에 적용하는 데 오류가 발생했습니다: " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "%s의 경로를 알아내는 데 실패했습니다" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "트리에서 이동이 실패했습니다" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "%s 파일을 여는 데 실패했습니다" # FIXME: ?? -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr " 링크 %s [%s] 없애기\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "%s 파일에 readlink하는 데 실패했습니다" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "%s 파일을 지우는 데 실패했습니다" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** %s 파일을 %s(으)로 링크하는 데 실패했습니다" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink 한계값 %s바이트에 도달했습니다.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "아카이브에 꾸러미 필드가 없습니다" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s에는 override 항목이 없습니다\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 관리자가 %s입니다 (%s 아님)\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr " %s에는 source override 항목이 없습니다\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s에는 binary override 항목이 없습니다\n" @@ -554,165 +564,165 @@ msgstr "내부 오류, %s 멤버를 찾을 수 없습니다" msgid "realloc - Failed to allocate memory" msgstr "realloc - 메모리를 할당하는 데 실패했습니다" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "%s을(를) 열 수 없습니다" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "override %s의 %lu번 줄 #1이 잘못되었습니다" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "override %s의 %lu번 줄 #2가 잘못되었습니다" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "override %s의 %lu번 줄 #3이 잘못되었습니다" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "override 파일 %s을(를) 읽는 데 실패했습니다" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "'%s' 압축 알고리즘을 알 수 없습니다" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "압축된 출력물 %s에는 압축 세트가 필요합니다" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "하위 프로세스에 대한 IPC 파이프를 만드는 데 실패했습니다" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "FILE*를 만드는 데 실패했습니다" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "fork하는 데 실패했습니다" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "압축 하위 프로세스" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "내부 오류, %s을(를) 만드는 데 실패했습니다" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "하위 프로세스 IPC를 만드는 데 실패했습니다" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "다음 압축 프로그램을 실행하는 데 실패했습니다: " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "압축 해제 프로그램" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "하위 프로세스/파일에 입출력하는 데 실패했습니다" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "MD5를 계산하는 동안 읽는 데 실패했습니다" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "%s의 링크를 해제하는 데 문제가 있습니다" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "%s 파일의 이름을 %s(으)로 바꾸는 데 실패했습니다" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "정규식 컴파일 오류 - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "다음 꾸러미의 의존성이 맞지 않습니다:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "하지만 %s 꾸러미를 설치했습니다" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "하지만 %s 꾸러미를 설치할 것입니다" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "하지만 설치할 수 없습니다" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "하지만 가상 꾸러미입니다" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "하지만 설치하지 않았습니다" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "하지만 %s 꾸러미를 설치하지 않을 것입니다" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " 혹은" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "다음 새 꾸러미를 설치할 것입니다:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "다음 꾸러미를 지울 것입니다:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "다음 꾸러미를 과거 버전으로 유지합니다:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "다음 꾸러미를 업그레이드할 것입니다:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "다음 꾸러미를 다운그레이드할 것입니다:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "고정되었던 다음 꾸러미를 바꿀 것입니다:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (%s때문에) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -720,149 +730,149 @@ msgstr "" "경고: 꼭 필요한 다음 꾸러미를 지우게 됩니다.\n" "무슨 일을 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu개 업그레이드, %lu개 새로 설치, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu개 다시 설치, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu개 업그레이드, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu개 지우기 및 %lu개 업그레이드 안 함.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "의존성을 바로잡는 중입니다..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " 실패." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "의존성을 바로잡을 수 없습니다" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "업그레이드 집합을 최소화할 수 없습니다" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " 완료" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "이 상황을 바로잡으려면 `apt-get -f install'을 실행해야 할 수도 있습니다." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "의존성이 맞지 않습니다. -f 옵션을 사용해 보십시오." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "경고: 다음 꾸러미를 인증할 수 없습니다!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "인증 경고를 무시합니다.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "확인하지 않고 꾸러미를 설치하시겠습니까 [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "인증할 수 없는 꾸러미가 있습니다" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "문제가 발생했고 -y 옵션이 --force-yes 옵션 없이 사용되었습니다" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "내부 오류. 망가진 꾸러미에서 InstallPackages를 호출했습니다!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "꾸러미를 지워야 하지만 지우기가 금지되어 있습니다." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "내부 오류. 순서변경작업이 끝나지 않았습니다" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "내려받기 디렉토리를 잠글 수 없습니다" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "소스 목록을 읽을 수 없습니다." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "이상하게도 크기가 서로 다릅니다. apt@packages.debian.org로 이메일을 보내주십" "시오." -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "%s바이트/%s바이트 아카이브를 받아야 합니다.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "%s바이트 아카이브를 받아야 합니다.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "압축을 풀면 %s바이트의 디스크 공간을 더 사용하게 됩니다.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "압축을 풀면 %s바이트의 디스크 공간이 비워집니다.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "%s 안에 충분한 여유 공간이 없습니다." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "사소한 작업만 가능하도록(Trivial Only) 지정되었지만 이 작업은 사소한 작업이 " "아닙니다." # 입력을 받아야 한다. 한글 입력을 못 할 수 있으므로 원문 그대로 사용. -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -873,28 +883,28 @@ msgstr "" "계속하시려면 다음 문구를 입력하십시오: '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "중단." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "계속 하시겠습니까 [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s 파일을 받는 데 실패했습니다 %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "일부 파일을 받는 데 실패했습니다" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "내려받기를 마쳤고 내려받기 전용 모드입니다" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -902,48 +912,48 @@ msgstr "" "아카이브를 받을 수 없습니다. 아마도 apt-get update를 실행해야 하거나 --fix-" "missing 옵션을 줘서 실행해야 할 것입니다." -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing 옵션과 동시에 미디어 바꾸기는 현재 지원하지 않습니다" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "빠진 꾸러미를 바로잡을 수 없습니다." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "설치를 중단합니다." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "주의, %2$s 대신에 %1$s 꾸러미를 선택합니다\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "%s 꾸러미를 건너 뜁니다. 이미 설치되어 있고 업그레이드를 하지 않습니다.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "%s 꾸러미를 설치하지 않았으므로, 지우지 않습니다\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s 꾸러미는 다음 꾸러미가 제공하는 가상 꾸러미입니다:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [설치함]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "설치하려면 분명하게 하나를 선택해야 합니다." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -954,49 +964,49 @@ msgstr "" "해당 꾸러미가 누락되었거나 지워졌다는 뜻입니다. 아니면 또 다른 곳에서\n" "꾸러미를 받아와야 하는 경우일 수도 있습니다.\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "하지만 다음 꾸러미가 대체합니다:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "%s 꾸러미는 설치할 수 있는 후보가 없습니다" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s 꾸러미를 다시 설치하는 건 불가능합니다. 내려 받을 수 없습니다.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s 꾸러미는 이미 최신 버전입니다.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "%2$s 꾸러미의 '%1$s' 릴리즈를 찾을 수 없습니다" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "%2$s 꾸러미의 '%1$s' 버전을 찾을 수 없습니다" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "%3$s 꾸러미의 %1$s (%2$s) 버전을 선택합니다\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "update 명령은 인수를 받지 않습니다" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "목록 디렉토리를 잠글 수 없습니다" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1004,26 +1014,66 @@ msgstr "" "일부 인덱스 파일을 내려받는 데 실패했습니다. 해당 파일을 무시하거나 과거의 버" "전을 대신 사용합니다." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "다음 새 꾸러미를 설치할 것입니다:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "내부 오류, 문제 해결 프로그램이 사고쳤습니다" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "내부 오류, AllUpgrade때문에 망가졌습니다" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "%s 꾸러미를 찾을 수 없습니다" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "%s 꾸러미를 찾을 수 없습니다" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "주의, 정규식 '%2$s'에 대하여 %1$s을(를) 선택합니다\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "하지만 %s 꾸러미를 설치할 것입니다" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "다음을 바로잡으려면 `apt-get -f install'을 실행해 보십시오:" # FIXME: specify a solution? 무슨 솔루션? -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1031,7 +1081,7 @@ msgstr "" "의존성이 맞지 않습니다. 꾸러미 없이 'apt-get -f install'을 시도해 보십시오 " "(아니면 해결 방법을 지정하십시오)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1042,7 +1092,7 @@ msgstr "" "불안정 배포판을 사용해서 일부 필요한 꾸러미를 아직 만들지 않았거나,\n" "아직 Incoming에서 나오지 않은 경우일 수도 있습니다." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1051,119 +1101,130 @@ msgstr "" "한 가지 작업만을 요청하셨으므로, 아마도 이 꾸러미를 설치할 수\n" "없는 경우일 것이고 이 꾸러미에 버그 보고서를 제출해야 합니다." -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "망가진 꾸러미" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "다음 꾸러미를 더 설치할 것입니다:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "제안하는 꾸러미:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "추천하는 꾸러미:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "업그레이드를 계산하는 중입니다... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "실패" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "완료" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "내부 오류, 문제 해결 프로그램이 사고쳤습니다" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "해당되는 소스 꾸러미를 가져올 꾸러미를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "%s의 소스 꾸러미를 찾을 수 없습니다" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "%s에 충분한 공간이 없습니다" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "%s 소스를 가져옵니다\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "일부 아카이브를 가져오는 데 실패했습니다." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "압축 풀기 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' 꾸러미가 설치되었는지를 확인해주십시오.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "빌드 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "하위 프로세스가 실패했습니다" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "해당되는 빌드 의존성을 검사할 꾸러미를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "%s 꾸러미에 빌드 의존성이 없습니다.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1172,7 +1233,7 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1181,32 +1242,33 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미의 사용 가능한 버" "전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: 설치한 %3$s 꾸러미가 너" "무 최근 버전입니다" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: %3$s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s의 빌드 의존성을 만족시키지 못했습니다." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "빌드 의존성을 처리하는 데 실패했습니다" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "지원하는 모듈:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1221,6 +1283,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1382,188 +1445,188 @@ msgstr "오류만 중요합니다. 이 오류를 고친 다음에 설치(I)를 msgid "Merging available information" msgstr "이용 가능 꾸러미 정보를 합칩니다" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "파이프 만들기가 실패했습니다" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "gzip 실행이 실패했습니다" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "아카이브가 손상되었습니다" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "tar 체크섬 실패, 아카이브가 손상되었습니다" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "알 수 없는 TAR 헤더 타입 %u, 멤버 %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "아카이브 시그너쳐가 틀렸습니다" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "아카이브 멤버 헤더를 읽는 데 오류가 발생했습니다" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "아카이브 멤버 헤더가 잘못되었습니다" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "아카이브 길이가 너무 짧습니다" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "아카이브 헤더를 읽는 데 실패했습니다" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode가 아직 연결되어 있는 노드에 대해 호출되었습니다" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "해시 항목을 찾는 데 실패했습니다" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "diversion을 할당하는 데 실패했습니다" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "AddDiversion에서 내부 오류" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "전환된 파일을 덮어 쓰려고 합니다 (%s -> %s 및 %s/%s)" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "전환된 파일을 두 번 추가합니다 (%s -> %s)" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "%s/%s 설정 파일이 중복되었습니다" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "%s 파일을 쓰는 데 실패했습니다" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "%s 파일을 닫는 데 실패했습니다" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "경로 %s이(가) 너무 깁니다" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "%s을(를) 두 번 이상 풀었습니다" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "%s 디렉토리가 전환되었습니다" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "이 꾸러미에서 전환된 대상에 쓰려고 합니다 (%s/%s)" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "전환하는 경로가 너무 깁니다" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "%s 디렉토리를 디렉토리가 아닌 파일로 덮어쓰려고 합니다" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "해시 버킷에서 노드를 찾는 데 실패했습니다" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "경로가 너무 깁니다" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "덮어 쓰는 꾸러미가 %s 꾸러미의 어떤 버전과도 맞지 않습니다" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "%s/%s 파일은 %s 꾸러미에 있는 파일을 덮어 씁니다" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "%s을(를) 읽을 수 없습니다" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "%s의 정보를 읽을 수 없습니다" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "%s을(를) 지우는 데 실패했습니다" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "%s을(를) 만들 수 없습니다" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "%sinfo의 정보를 읽는 데 실패했습니다" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "정보 디렉토리와 임시 디렉토리는 같은 파일 시스템에 있어야 합니다" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "꾸러미 목록을 읽는 중입니다" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "관리 디렉토리를 %sinfo로 바꾸는 데 실패했습니다" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "꾸러미 이름을 가져오는 데 내부 오류" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "파일 목록을 읽는 중입니다" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1573,77 +1636,77 @@ msgstr "" "목록 파일 '%sinfo/%s' 파일을 여는 데 실패했습니다. 이 파일을 복구할 수 없다" "면 비워 놓고 같은 버전의 꾸러미를 다시 설치하십시오!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "목록 파일 %sinfo/%s 파일을 읽는 데 실패했습니다" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "노드를 얻어 오는 데 내부 오류" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "전환 파일 %sdiversions를 여는 데 실패했습니다" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "전환 파일이 손상되었습니다" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "전환 파일에 잘못된 줄이 있습니다: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "diversion을 추가하는 데 내부 오류" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "꾸러미 캐시를 먼저 초기화해야 합니다" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "꾸러미를 찾는 데 실패했습니다: 헤더, 오프셋 %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "status 파일에서 ConfFile 섹션이 잘못되었습니다. 오프셋 %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "MD5 분석에 오류가 있습니다. 오프셋 %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "올바른 DEB 아카이브가 아닙니다. '%s' 멤버가 없습니다" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "올바른 DEB 아카이브가 아닙니다. '%s' 혹은 '%s' 멤버가 없습니다" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "%s 디렉토리로 이동할 수 없습니다" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "내부 오류, 멤버를 찾을 수 없습니다" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "올바른 control 파일을 찾는 데 실패했습니다" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "control 파일을 파싱할 수 없습니다" @@ -1678,11 +1741,12 @@ msgid "File not found" msgstr "파일이 없습니다" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "파일 정보를 읽는 데 실패했습니다" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "파일 변경 시각을 설정하는 데 실패했습니다" @@ -1744,7 +1808,7 @@ msgstr "연결 시간 초과" msgid "Server closed the connection" msgstr "서버에서 연결을 닫았습니다" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "읽기 오류" @@ -1756,7 +1820,7 @@ msgstr "응답이 버퍼 크기를 넘어갔습니다." msgid "Protocol corruption" msgstr "프로토콜이 틀렸습니다" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "쓰기 오류" @@ -1810,7 +1874,7 @@ msgstr "데이터 소켓 연결 시간 초과" msgid "Unable to accept connection" msgstr "연결을 받을 수 없습니다" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "파일 해싱에 문제가 있습니다" @@ -1837,39 +1901,39 @@ msgstr "질의" msgid "Unable to invoke " msgstr "다음을 실행할 수 없습니다: " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "%s(%s)에 연결하는 중입니다" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "%s에 대한 소켓을 만들 수 없습니다 (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "%s:%s에 연결을 초기화할 수 없습니다 (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "%s:%s에 연결할 수 없습니다 (%s). 연결 제한 시간이 초과했습니다" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "%s:%s에 연결할 수 없습니다 (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "%s에 연결하는 중입니다" @@ -1941,427 +2005,447 @@ msgstr "%s에 대한 파이프를 열 수 없습니다" msgid "Read error from %s process" msgstr "%s 프로세스에서 읽는 데 오류가 발생했습니다" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "헤더를 기다리는 중입니다" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "헤더 한 줄에 %u개가 넘는 문자가 들어 있습니다" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "헤더 줄이 잘못되었습니다" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP 서버에서 잘못된 응답 헤더를 보냈습니다" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP 서버에서 잘못된 Content-Length 헤더를 보냈습니다" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP 서버에서 잘못된 Content-Range 헤더를 보냈습니다" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "데이터 형식을 알 수 없습니다" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "select가 실패했습니다" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "연결 시간이 초과했습니다" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "출력 파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "해당 파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "서버에서 읽고 연결을 닫는 데 오류가 발생했습니다" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "서버에서 읽는 데 오류가 발생했습니다" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "헤더 데이터가 잘못되었습니다" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "연결이 실패했습니다" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "내부 오류" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "빈 파일에 mmap할 수 없습니다" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "%lu바이트를 mmap할 수 없습니다" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "선택한 %s이(가) 없습니다" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "이 타입 줄임말을 알 수 없습니다: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "설정 파일 %s 파일을 여는 중입니다" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "%d번 줄이 너무 깁니다 (최대 %d)" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "문법 오류 %s:%u: 블럭이 이름으로 시작하지 않습니다." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "문법 오류 %s:%u: 태그의 형식이 잘못되었습니다" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "문법 오류 %s:%u: 값 뒤에 쓰레기 데이터가 더 있습니다" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "문법 오류 %s:%u: 지시어는 맨 위 단계에서만 쓸 수 있습니다" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "문법 오류 %s:%u: include가 너무 많이 겹쳐 있습니다" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "문법 오류 %s:%u: 여기서 include됩니다" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "문법 오류 %s:%u: 지원하지 않는 지시어 '%s'" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "문법 오류 %s:%u: 파일의 끝에 쓰레기 데이터가 더 있습니다" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... 오류!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... 완료" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "명령행 옵션 '%c' 옵션을 [%s에서] 알 수 없습니다." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "명령행 옵션 '%s' 옵션을 알 수 없습니다" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "명령행 옵션 '%s' 옵션은 불리언이 아닙니다" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "%s 옵션에는 인수가 필요합니다." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "%s 옵션: 설정 항목 지정은 =<값> 형태여야 합니다." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "%s 옵션에는 정수 인수가 필요합니다, '%s'이(가) 아닙니다" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "'%s' 옵션이 너무 깁니다" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "%s 센스를 이해할 수 없습니다. 참 아니면 거짓으로 해 보십시오." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "잘못된 작업 %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "마운트 위치 %s의 정보를 읽을 수 없습니다" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "%s 디렉토리로 이동할 수 없습니다" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "CD-ROM의 정보를 읽을 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "읽기 전용 잠금 파일 %s에 대해 잠금을 사용하지 않습니다" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "잠금 파일 %s 파일을 열 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "NFS로 마운트된 잠금 파일 %s에 대해 잠금을 사용하지 않습니다" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "%s 잠금 파일을 얻을 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "하위 프로세스 %s 프로세스가 세그멘테이션 오류를 받았습니다." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "하위 프로세스 %s 프로세스가 오류 코드(%u)를 리턴했습니다" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "하위 프로세스 %s 프로세스가 예상치 못하게 끝났습니다" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "%s 파일을 열 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "%lu만큼 더 읽어야 하지만 더 이상 읽을 데이터가 없습니다" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "%lu만큼 더 써야 하지만 더 이상 쓸 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "파일을 닫는 데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "파일을 지우는 데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "파일을 동기화하는 데 문제가 있습니다" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "꾸러미 캐시가 비어 있습니다" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "꾸러미 캐시 파일이 손상되었습니다" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "꾸러미 캐시 파일이 호환되지 않는 버전입니다" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "이 APT는 Version System '%s'을(를) 지원하지 않습니다" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "꾸러미 캐시가 다른 아키텍쳐용입니다." -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "의존" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "선의존" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "제안" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "추천" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "충돌" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "대체" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "없앰" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "중요" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "필수" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "표준" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "옵션" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "별도" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "의존성 트리를 만드는 중입니다" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "후보 버전" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "의존성 만들기" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "이용 가능 꾸러미 정보를 합칩니다" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "%s 파일을 여는 데 실패했습니다" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "%s 파일을 쓰는 데 실패했습니다" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "꾸러미 파일 %s 파일을 파싱할 수 없습니다 (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "꾸러미 파일 %s 파일을 파싱할 수 없습니다 (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (절대 dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist 파싱)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s 파일을 여는 중입니다" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "소스 리스트 %2$s의 %1$u번 줄이 너무 깁니다." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (벤더 ID)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2372,19 +2456,19 @@ msgstr "" "잠깐 지워야 합니다. 이 꾸러미를 지우는 건 좋지 않지만, 정말 지우려면 APT::" "Force-LoopBreak 옵션을 켜십시오." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "인덱스 파일 타입 '%s' 타입은 지원하지 않습니다" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "%s 꾸러미를 다시 설치해야 하지만, 이 꾸러미의 아카이브를 찾을 수 없습니다." -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2392,180 +2476,196 @@ msgstr "" "오류, pkgProblemResolver::Resolve가 망가졌습니다, 고정 꾸러미때문에 발생할 수" "도 있습니다." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "문제를 바로잡을 수 없습니다, 망가진 고정 꾸러미가 있습니다." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "목록 디렉토리 %spartial이 빠졌습니다." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "아카이브 디렉토리 %spartial이 빠졌습니다." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "파일 받아오는 중: %2$li 중 %1$li (%3$s 남았음)" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "파일 받아오는 중: %2$li 중 %1$li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "설치 방법 드라이버 %s을(를) 찾을 수 없습니다." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "'%2$s' 드라이브에 '%1$s'(으)로 표기된 디스크를 삽입하고 엔터를 눌러주십시오." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "꾸러미 시스템 '%s'을(를) 지원하지 않습니다" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "올바른 꾸러미 시스템 타입을 알아낼 수 없습니다" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "%s의 정보를 읽을 수 없습니다." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "sources.list에 '소스' URI를 써 넣어야 합니다" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "꾸러미 목록이나 상태 파일을 파싱할 수 없거나 열 수 없습니다." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "apt-get update를 실행하면 이 문제를 바로잡을 수도 있습니다." -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "기본 설정 파일에 잘못된 데이터가 있습니다. 꾸러미 헤더가 없습니다" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "핀 타입 %s이(가0 무엇인지 이해할 수 없습니다" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "핀에 우선순위(혹은 0)를 지정하지 않았습니다" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "캐시의 버전 시스템이 호환되지 않습니다" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "우와, 이 APT가 처리할 수 있는 꾸러미 이름 개수를 넘어갔습니다." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "우와, 이 APT가 처리할 수 있는 버전 개수를 넘어갔습니다." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "우와, 이 APT가 처리할 수 있는 버전 개수를 넘어갔습니다." + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "우와, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습니다." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "%s 처리중에 오류가 발생했습니다 (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "%s 처리중에 오류가 발생했습니다 (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "파일 의존성을 처리하는 데, %s %s 꾸러미가 없습니다" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "소스 꾸러미 목록 %s의 정보를 읽을 수 없습니다" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "파일에서 제공하는 것을 모으는 중입니다" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "MD5Sum이 맞지 않습니다" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "다음 키 ID의 공개키가 없습니다:\n" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2574,7 +2674,7 @@ msgstr "" "%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습" "니다. (아키텍쳐가 빠졌기 때문입니다)" -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2583,14 +2683,14 @@ msgstr "" "%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습" "니다." -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "꾸러미 인덱스 파일이 손상되었습니다. %s 꾸러미에 Filename: 필드가 없습니다." -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "크기가 맞지 않습니다" @@ -2599,7 +2699,7 @@ msgstr "크기가 맞지 않습니다" msgid "Vendor block %s contains no fingerprint" msgstr "벤더 블럭 %s의 핑거프린트가 없습니다" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2608,52 +2708,54 @@ msgstr "" "CD-ROM 마운트 위치로 %s 사용\n" "CD-ROM을 마운트하는 중입니다\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "알아보는 중입니다.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "저장된 레이블: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "CD-ROM 마운트 위치 %s 사용\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM 마운트 해제하는 중입니다\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "디스크를 기다리는 중입니다...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "CD-ROM 마운트하는 중입니다...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "디스크에서 색인 파일을 찾는 중입니다...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "꾸러미 색인 %i개, 소스 색인 %i개, 시그너처 %i개 발견\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "저장된 레이블: %s \n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "올바른 이름이 아닙니다. 다시 시도하십시오.\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2662,93 +2764,97 @@ msgstr "" "이 디스크는 다음과 같습니다: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "꾸러미 목록을 복사하는 중입니다..." -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "새 소스 리스트를 쓰는 중입니다\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "이 디스크의 소스 리스트 항목은 다음과 같습니다:\n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "CD-ROM을 마운트 해제하는 중입니다..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "레코드 %i개를 썼습니다.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "레코드 %i개를 파일 %i개가 빠진 상태로 썼습니다.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "레코드 %i개를 파일 %i개가 맞지 않은 상태로 썼습니다\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "레코드 %i개를 파일 %i개가 빠지고 %i개가 맞지 않은 상태로 썼습니다\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "%s 준비 중" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "%s을(를) 푸는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "%s을(를) 설정할 준비를 하는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "%s 설정 중" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "%s 설치했음" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "%s을(를) 삭제할 준비 중" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "%s 지우는 중" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "%s 지움" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "%s을(를) 완전히 지울 준비를 하는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "%s을(를) 완전히 지웠습니다" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "%s 파일을 열 수 없습니다" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "연결이 너무 빨리 끊어졌습니다" @@ -2756,9 +2862,6 @@ msgstr "연결이 너무 빨리 끊어졌습니다" #~ msgid "File date has changed %s" #~ msgstr "%s 파일의 마지막 수정 시각이 바뀌엇습니다" -#~ msgid "Could not patch file" -#~ msgstr "%s 파일을 열 수 없습니다" - #~ msgid "Reading file list" #~ msgstr "파일 목록을 읽는 중" diff --git a/po/nb.po b/po/nb.po index 015b92a5f..4ae254629 100644 --- a/po/nb.po +++ b/po/nb.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2006-10-16 00:35+0100\n" "Last-Translator: Hans Fredrik Nordhaug \n" "Language-Team: Norwegian Bokmal \n" @@ -24,146 +24,156 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.9.1\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Pakken %s versjon %s har et uinnfridd avhengighetsforhold:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Klarer ikke finne pakken %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "Plassmengde pakkenavn: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Vanlige pakker: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Rent virtuelle pakker: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Enkle virtuelle pakker: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Sammensatte virtuelle pakker: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Mangler: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Antall unike versjoner: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Antall unike versjoner: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Antall avhengighetsforhold: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Antall forhold versjon/fil: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Antall forhold versjon/fil: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Antall tilbudte tilknyttinger: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Antall utvidede strenger: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Total plass for avhengighetsforhold/versjoner: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Plass brukt av slark: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Samlet mengde redegjort plass: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Pakkefila %s er ikke oppdatert." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Du m oppgi nyaktig ett mnster" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Fant ingen pakker" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Pakkefiler:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Mellomlageret er ikke oppdatert, kan ikke kryssreferere til en pakkefil" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Lste pakker:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(ikke funnet)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Installert: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(ingen)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Kandidat: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Pakke lst til: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Versjonstabell:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s kompilert p %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -312,7 +322,7 @@ msgstr "" " -c=? Les denne innstillingsfila.\n" " -o=? Sett en vilkrlig innstilling, f.eks. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "Kan ikke skrive til %s" @@ -321,31 +331,31 @@ msgstr "Kan ikke skrive til %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kan ikke fastsl debconf-versjonen. Er debconf installert?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Lista over pakkeutvidelser er for lang" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "Feil ved lesing av katalogen %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Lista over kildeutvidelser er for lang" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Feil ved skriving av topptekst til innholdsfila" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Det oppsto en feil ved lesing av %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -427,26 +437,26 @@ msgstr "" " -c=? Les denne oppsettsfila.\n" " -o=? Setter en vilkrlig innstilling" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Ingen utvalg passet" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Enkelte filer mangler i pakkegruppa %s" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Databasen er delagt. Filnavnet er endret til %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Databasen er gammel, forsker oppgradere %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." @@ -454,106 +464,106 @@ msgstr "" "DB-formatet er ugyldig. Hvis du oppgraderte fra en eldre versjon av apt, " "fjern og s gjenopprett databasen." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Klarte ikke pne Databasefila %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "Klarte ikke f statusen p %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Arkivet har ingen kontrollpost" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Klarte ikke finne en peker" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: Klarte ikke lese katalogen %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: Klarte ikke f statusen p %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "F:" -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "A:" -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "F: Det er feil ved fila" -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "Klarte ikke sl opp %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "Klarte ikke finne fram i treet" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "Klarte ikke pne %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "Klarte ikke lese lenken %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "Klarte ikke oppheve lenken %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Klarte ikke lenke %s til %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-grensa p %s B er ndd.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Arkivet har ikke noe pakkefelt" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen overstyringsoppfring\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-vedlikeholderen er %s, ikke %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr " %s har ingen kildeoverstyringsoppfring\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s har ingen binroverstyringsoppfring heller\n" @@ -567,165 +577,165 @@ msgstr "Intern feil, fant ikke medlemmet %s" msgid "realloc - Failed to allocate memory" msgstr "realloc - Klarte ikke tildele minne" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Klarte ikke pne %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Ugyldig overstyring %s linje %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Ugyldig overstyring %s linje %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Ugyldig overstyring %s linje %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Klarte ikke lese overstyringsfila %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Ukjent komprimeringsalgoritme %s" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimert utdata %s trenger et komprimeringssett" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Klarte ikke opprette IPC-rr til underprosessen" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "Klarte ikke opprette FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "Klarte ikke forgreine prosess" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "Komprimer barneprosess" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "Intern feil, klarte ikke opprette %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "Klarte ikke opprette underprosessen IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "Klarte ikke kjre komprimeringen" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "dekomprimering" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "Klarte ikke kommunisere med underprosess/fil" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "Klarte ikke lese under utregning av MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "Problem ved oppheving av lenken til %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Klarte ikke endre navnet p %s til %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "Kompileringsfeil i regulrt uttrykk - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "Flgende pakker har uinnfridde avhengighetsforhold:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "men %s er installert" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "men %s skal installeres" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "men lar seg ikke installere" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "men er en virtuell pakke" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "men er ikke installert" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "men skal ikke installeres" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " eller" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "Flgende NYE pakker vil bli installert:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "Flgende pakker vil bli FJERNET:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "Flgende pakker er holdt tilbake:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "Flgende pakker vil bli oppgradert:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "Flgende pakker vil bli NEDGRADERT:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "Flgende pakker vil bli endret:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (pga. %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -733,146 +743,146 @@ msgstr "" "ADVARSEL: Flgende essensielle pakker vil bli fjernet.\n" "Dette br IKKE gjres, med mindre du vet nyaktig hva du gjr!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu oppgraderte, %lu nylig installerte, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu installert p nytt, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderte, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu fjerne og %lu ikke oppgradert.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pakker ikke fullt installert eller fjernet.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Retter p avhengighetsforhold ..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " mislyktes." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Klarer ikke rette p avhengighetsforholdene" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Klarer ikke minimere oppgraderingsettet" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Utfrt" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Du vil kanskje kjre apt-get -f install for rette p dette." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Uinnfridde avhengighetsforhold - Prv -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ADVARSEL: Flgende pakker ble ikke autentisert!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Autentiseringsadvarsel overstyrt.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Installer disse pakkene uten verifikasjon [j/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Noen pakker ble ikke autentisert" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Det oppsto problemer og -y ble brukt uten --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Intern feil, InstallPackages ble kalt med delagte pakker!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Pakker trenges fjernes, men funksjonen er sltt av." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Intern feil, sortering fullfrte ikke" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "Klarer ikke lse nedlastingsmappa" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Kan ikke lese kildlista." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "S rart ... Strrelsene stemmer ikke overens, send en e-post til " "apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "M hente %sB/%sB med arkiver.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "M hente %sB med arkiver.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Etter utpakking vil %sB ekstra diskplass bli brukt.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Etter utpakking vil %sB diskplass bli ledig.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "Klarte ikke bestemme ledig plass i %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Dessverre, ikke nok ledig plass i %s" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Bare trivielle endringer ble angitt, men dette er ikke en triviell endring." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Ja, gjr som jeg sier!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -883,28 +893,28 @@ msgstr "" "For fortsette skriv inn teksten %s\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "Avbryter." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsette [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikke skaffe %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Noen av filene kunne ikke lastes ned" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "Nedlasting fullfrt med innstillinga bare nedlasting" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -912,48 +922,48 @@ msgstr "" "Klarte ikke hente alle arkivene. Du kan prve med apt-get update eller " "--fix-missing." -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing og bytte av media stttes n ikke" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Klarer ikke rette p manglende pakker." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Avbryter istallasjonen." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Merk, velger %s istedenfor %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Omgr %s - den er allerede installert eller ikke satt til oppgradering.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakken %s er en virtuell pakke, som oppfylt av:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Installert]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Du m velge en pakke som skal installeres." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -964,49 +974,49 @@ msgstr "" "Dette kan bety at pakken mangler, er utgtt, eller bare finnes \n" "tilgjengelig fra en annen kilde.\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Flgende pakker erstatter den imidlertid:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakken %s har ingen installasjonskandidat" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Det er ikke mulig installere %s p nytt - den kan ikke nedlastes.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s er allerede nyeste versjon.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Utgave %s av %s ble ikke funnet" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versjon %s av %s ble ikke funnet" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Utvalgt versjon %s (%s) for %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Oppdaterings-kommandoen tar ingen argumenter" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Kan ikke lse listemappa" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1014,25 +1024,65 @@ msgstr "" "Klarte ikke laste ned alle oversiktfilene. De ble ignorerte, eller gamle " "ble brukt isteden. " -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Flgende NYE pakker vil bli installert:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "Flgende informasjon kan vre til hjelp med lse problemet:" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Intern feil, problemlser dela noe" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil - AllUpgrade dela noe" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Klarte ikke finne pakken %s" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "Klarte ikke finne pakken %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Merk, velger %s istedenfor det regulre uttrykket %s\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "men %s skal installeres" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du vil kanskje utfre apt-get -f install for rette p disse:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1040,7 +1090,7 @@ msgstr "" "Uinnfridde avhengighetsforhold. Prv apt-get -f install uten pakker (eller " "angi en lsning)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1052,7 +1102,7 @@ msgstr "" "at visse kjernepakker enn ikke er laget eller flyttet ut av Incoming for\n" "distribusjonen." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1062,126 +1112,137 @@ msgstr "" "at pakken helt enkelt ikke kan installeres, og du br fylle ut en " "feilmelding." -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Flgende informasjon kan vre til hjelp med lse problemet:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "delagte pakker" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "Flgende ekstra pakker vil bli installert." -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "Foresltte pakker:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "Anbefalte pakker" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "Beregner oppgradering... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Mislyktes" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "Utfrt" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "Intern feil, problemlser dela noe" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "Du m angi minst en pakke du vil ha kildekoden til" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "Klarer ikke finne en kildekodepakke for %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hopper over allerede nedlastet fil %s\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plass i %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Trenger skaffe %sB av %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Trenger skaffe %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "Skaffer kildekode %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "Klarte ikke skaffe alle arkivene." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omgr utpakking av allerede utpakket kilde i %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen %s mislyktes.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Sjekk om pakken dpkg-dev er installert.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggekommandoen %s mislyktes.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "Barneprosessen mislyktes" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "Du m angi minst en pakke du vil sjekke builddeps for" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarer ikke skaffe informasjon om bygge-avhengighetene for %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen avhengigheter.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1190,32 +1251,33 @@ msgstr "" "Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige " "versjoner av pakken %s som oppfyller versjonskravene" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Klarte ikke tilfredsstille %s avhengighet for %s: den installerte pakken %" "s er for ny" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikke tilfredsstille %s avhengighet for %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Klarte ikke tilfredstille bygg-avhengighetene for %s." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "Klarte ikke behandle forutsetningene for bygging" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "Stttede moduler:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1230,6 +1292,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1393,189 +1456,189 @@ msgstr "av betydning. Sett dem i stand dem og kj msgid "Merging available information" msgstr "Fletter tilgjengelig informasjon" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Klarte ikke opprette rr" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Klarte ikke kjre gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "delagt arkiv" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-sjekksummen mislykkes, arkivet er delagt" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Ukjent TAR-hode: type %u, medlem %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Ugyldig arkivsignatur" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Feil ved lesing av arkivmedlemshode" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Ugyldig arkivmedlemshode" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Arkivet er for kort" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Klarte ikke lese arkivhodene" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode ble startet p et knutepunkt som enn er lenket" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Fant ikke nkkelelementet." -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Klarte ikke tildele avledning" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Intern feil i AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Prver skrive over en avledning, %s -> %s og %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Dobbel tillegging av avledning %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Dobbel oppsettsfil %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Klarte ikke skrive fila %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Klarte ikke lukke fila %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Stien %s er for lang" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Pakker ut %s mer enn en gang" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Katalogen %s er avledet" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Pakken prver skrive til avledningsmlet %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Avledningsstien er for lang" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Mappa %s blir byttet ut med noe som ikke er en mappe" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Fant ikke knutepunktet i dens hash-spann" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Stien er for lang" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Skriver over pakketreff uten versjon for %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Fila %s/%s skriver over den tilsvarende fila i pakken %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Klarer ikke lese %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Klarte ikke f statusen p %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Klarte ikke fjerne %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Klarte ikke opprette %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Klarte ikke f statusen p %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "" "Infokatalogen og den midlertidige katalogen m vre p det samme filsystemet" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "Leser pakkelister" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Klarte ikke bytte til adminkatalogen %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "Intern feil ved henting av pakkenavn" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Les filliste" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1586,78 +1649,78 @@ msgstr "" "denne fila, br du opprette den som en tom fil og installere den samme " "versjonen av pakken p nytt." -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Klarte ikke lese listefila %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Intern feil ved henting av node" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Klarte ikke pne avledningsfila %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Avledningsfila er delagt" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "Ugyldig linje i avledningsfila: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Det oppsto en intern feil nr avledningen ble lagt til" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Pakkelageret m klargjres frst" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Fant ikke Package:-linje, offset %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "delagt ConfFile-del i statusfila. Offset %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Feil ved tolking av MD5. Offset %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Dette er ikke et gyldig DEB-arkiv, mangler %s-medlemmet" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "" "Dette er ikke et gyldig DEB-arkiv, det har ikke noe %s- eller %s-medlem" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "Klarte ikke bytte til %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "Intern feil, fant ikke medlem" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "Fant ingen gyldig kontrollfil" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "Kontrollfila kan ikke tolkes" @@ -1694,11 +1757,12 @@ msgid "File not found" msgstr "Fant ikke fila" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Klarte ikke f status" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Klarte ikke sette endringstidspunkt" @@ -1760,7 +1824,7 @@ msgstr "Tidsavbrudd p msgid "Server closed the connection" msgstr "Tjeneren lukket forbindelsen" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "Lesefeil" @@ -1772,7 +1836,7 @@ msgstr "Et svar oversv msgid "Protocol corruption" msgstr "Protokolldeleggelse" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "Skrivefeil" @@ -1826,7 +1890,7 @@ msgstr "Tidsavbrudd p msgid "Unable to accept connection" msgstr "Klarte ikke godta tilkoblingen" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved oppretting av nkkel for fil" @@ -1853,39 +1917,39 @@ msgstr "Sp msgid "Unable to invoke " msgstr "Klarte ikke starte" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Kobler til %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Klarte ikke opprette en sokkel for %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Klarte ikke starte forbindelsen til %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Klarte ikke koble til %s:%s (%s), tidsavbrudd p forbindelsen" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Klarte ikke koble til %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Kobler til %s" @@ -1960,427 +2024,447 @@ msgstr "Klarte ikke msgid "Read error from %s process" msgstr "Lesefeil fra %s-prosessen" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Venter p hoder" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Fikk en enkel hodelinje over %u tegn" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "delagt hodelinje" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP-tjeneren sendte et ugyldig svarhode" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP-tjeneren sendte et ugyldig Content-Length-hode" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP-tjeneren sendte et ugyldig Content-Range-hode" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Denne HTTP-tjeneren har delagt sttte for omrde" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Ukjent datoformat" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Utvalget mislykkes" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Tidsavbrudd p forbindelsen" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Feil ved lesing fra tjeneren" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "delagte hodedata" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Forbindelsen mislykkes" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Intern feil" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "Kan ikke utfre mmap p en tom fil" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Kunne ikke lage mmap av %lu bytes" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "Fant ikke utvalget %s" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ukjent typeforkortelse: %c" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "pner oppsettsfila %s" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "Linje %d er for lang (maks %d)" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaksfeil %s:%u: Blokka starter uten navn." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaksfeil %s:%u: Feil p taggen" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaksfeil %s:%u: Ugyldige angivelser etter verdien" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntaksfeil %s:%u: Direktivene kan bare ligge i det verste nivet" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaksfeil %s:%u: For mange nstede inkluderte filer" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaksfeil %s:%u: Inkludert herfra" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaksfeil %s:%u: Direktivet %s er ikke stttet" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksfeil %s:%u: Ugyldige angivelser p slutten av fila" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s ... Feil" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s ... Ferdig" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Kjenner ikke kommandolinjevalget %c (fra %s)." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "Skjnner ikke kommandolinjevalget %s" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Kommandolinjevalget %s er ikke boolsk" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Valget %s krever et argument." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Valg %s: Angivelsen av oppsettselementet m ha en =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Valget %s m ha et heltallsargument, ikke %s" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Valget %s er for langt" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Skjnner ikke %s. Prv true eller false." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Ugyldig operasjon %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Klarer ikke fastsette monteringspunktet %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Klarer ikke endre %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "Klarer ikke f statusen p CD-spilleren" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Bruker ikke lsing for den skrivebeskyttede lsefila %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "Kunne ikke pne lsefila %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Bruker ikke lsing p den nfs-monterte lsefila %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "Fr ikke lst %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ventet p %s, men den ble ikke funnet" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprosessen %s mottok et minnefeilsignal." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprosessen %s ga en feilkode (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprosessen %s avsluttet uventet" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "Kunne ikke pne fila %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "lese, har fremdeles %lu igjen lese, men ingen igjen" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "skrive, har fremdeles %lu igjen skrive, men klarte ikke " -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "Problem ved lsing av fila" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "Problem ved oppheving av lenke til fila" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "Problem ved oppdatering av fila" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Tomt pakkelager" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Pakkens lagerfil er delagt" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Pakkens lagerfil er av feil versjon (samvirker ikke)" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Denne APT sttter ikke versjonssystemet %s" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Pakkelageret ble bygd for en annen arkitektur" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Avhenger av" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Forutsetter" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Foreslr" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Anbefaler" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Er i konflikt med" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Erstatter" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Nuller" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "viktig" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "pkrevet" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "vanlig" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "valgfri" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "tillegg" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "Skaper oversikt over avhengighetsforhold" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "Versjons-kandidater" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "Oppretter avhengighetsforhold" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "Fletter tilgjengelig informasjon" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Klarte ikke pne %s" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Klarte ikke skrive fila %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Klarer ikke fortolke pakkefila %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Klarer ikke fortolke pakkefila %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Feil p linje %lu i kildelista %s (nettadresse)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Feil p linje %lu i kildelista %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Feil p %lu i kildelista %s (fortolkning av nettadressen)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Feil p %lu i kildelista %s (Absolutt dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Feil p %lu i kildelista %s (dist fortolking)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "pner %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Linje %u i kildelista %s er for lang" -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Feil p %u i kildelista %s (type)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen %s er ukjent i linje %u i kildelista %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Feil p %u i kildelista %s (selgers id)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2391,19 +2475,19 @@ msgstr "" "s pga. en konflikt/forutsettelses-lkke. Dette er ofte stygt, men hvis du " "virkelig vil det, s bruk innstillingen APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Oversiktsfil av typen %s stttes ikke" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Pakka %s trenger installeres p nytt, men jeg finner ikke lageret for den." -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2411,182 +2495,198 @@ msgstr "" "Feil, pkgProblemResolver::Resolve skapte et brudd, det kan skyldes pakker " "som holdes tilbake." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "Klarer ikke rette problemene, noen delagte pakker er holdt tilbake." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Listemappa %spartial mangler." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Arkivmappa %spartial mangler." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Henter fil %li av %li (%s gjenvrende)" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "Henter fil %li av %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Finner ikke metode-driveren %s." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Metoden %s startet ikke korrekt" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Sett inn disken merket %s i lagringsenheten %s og trykk Enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet %s stttes ikke" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "Klarer ikke bestemme en passende pakkesystemtype" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Klarer ikke finne informasjonom %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "" "Beklager, du m legge inn noen kilder (nettadresser) i din sources.list." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "Pakkelista eller tilstandsfila kunne ikke fortolkes eller pnes." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Det kan hende du vil kjre apt-get update for rette p disse problemene" -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Ugyldig oppslag i foretrekksfila, manglende pakkehode" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Forsto ikke spikring av typen %s" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Ingen prioritet (eller null) spesifisert for pin" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Lageret har et uoverensstemmende versjonssystem" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Feil oppsto under behandling av %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Feil oppsto under behandling av %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Feil oppsto under behandling av %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Feil oppsto under behandling av %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Feil oppsto under behandling av %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Feil oppsto under behandling av %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Feil oppsto under behandling av %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Feil oppsto under behandling av %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Feil oppsto under behandling av %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Jss, du har overgtt antallet pakkenavn denne APT klarer." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Jss, du har overgtt antallet versjoner denne APT klarer." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Jss, du har overgtt antallet versjoner denne APT klarer." + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Jss, du har overgtt antallet avhengighetsforhold denne APT klarer." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Feil oppsto under behandling av %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Feil oppsto under behandling av %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Fant ikke pakken %s %s ved behandling av filkrav" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kunne ikke finne informasjon om %s - lista over kildekodepakker" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "Samler inn filtilbud" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "IO-feil ved lagring av kildekode-lager" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "klarte ikke endre navnet, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Feil MD5sum" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Det er ingen offentlig nkkel tilgjengelig for de flgende nkkel-ID-ene:\n" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2595,7 +2695,7 @@ msgstr "" "Klarte ikke finne en fil for pakken %s. Det kan bety at du m ordne pakken " "selv (fordi arkitekturen mangler)." -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2604,13 +2704,13 @@ msgstr "" "Klarte ikke finne en fil for pakken %s. Det kan bety at du m ordne denne " "pakken selv." -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Oversiktsfilene er delagte. Feltet Filename: mangler for pakken %s." -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Feil strrelse" @@ -2619,7 +2719,7 @@ msgstr "Feil st msgid "Vendor block %s contains no fingerprint" msgstr "Utgivers blokk %s inneholder ikke no fingeravtrykk" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2628,52 +2728,54 @@ msgstr "" "Bruker CD-ROM monteringspunkt %s\n" "Monterer CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "Indentifiserer.." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "Lagret merkelapp: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Bruker CD-ROM monteringspunkt %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "Avmonterer CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "Venter p CD-en...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "Monterer CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "Leter gjennom CD for indeksfiler..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "Fant %i pakkeindekser, %i kildeindekser og %i signaturer\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "Lagret merkelapp: %s \n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "Det er ikke et gyldig navn, prv igjen.\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2682,93 +2784,97 @@ msgstr "" "CD-en er kalt: \n" "%s\n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Kopierer pakkelister..." -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Skriver ny kildeliste\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Kildelisteoppfringer for denne CD-en er:\n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "Avmonterer CD-ROM..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Skrev %i poster.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Skrev %i poster med %i manglende filer.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Skrev %i poster med %i feile filer.\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i manglende filer og %i feile filer.\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Forbereder %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Pakker ut %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Forbereder konfigurering %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Konfigurer %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "Installerte %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Forbereder fjerning av %s" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Fjerner %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "Fjernet %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Forbereder fullstendig slette %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "Fjernet %s fullstendig" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "Kunne ikke pne fila %s" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Forbindelsen ble uventet stengt" @@ -2776,9 +2882,6 @@ msgstr "Forbindelsen ble uventet stengt" #~ msgid "File date has changed %s" #~ msgstr "Fildatoen er endret %s" -#~ msgid "Could not patch file" -#~ msgstr "Kunne ikke pne fila %s" - #~ msgid "Reading file list" #~ msgstr "Leser filliste" diff --git a/po/nl.po b/po/nl.po index e46f6b8f8..db40abd2d 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2006-10-17 22:35+0100\n" "Last-Translator: Bart Cornelis \n" "Language-Team: debian-l10n-dutch \n" @@ -15,145 +15,155 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-15\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Pakket %s versie %s heeft een niet-voldane vereiste:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Kan pakket %s niet vinden" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "Totaal aantal pakketnamen: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Normale pakketten: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Zuiver virtuele pakketten: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Losstaande virtuele pakketten: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Gemengde virtuele pakketten: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Ontbrekend: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Totaal aantal verschillende versies: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Totaal aantal verschillende versies: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Totaal aantal vereisten: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Totaal aantal versie/bestand-relaties: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Totaal aantal versie/bestand-relaties: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Totaal aantal 'Voorziet'-toewijzingen " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Totaal aantal geglobde strings: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Totale hoeveelheid vereisten-versieruimte: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Totale onbenutte ruimte: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Totale hoeveelheid verantwoorde ruimte: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Pakketbestand %s is niet meer gesynchroniseerd." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "U dient precies n patroon op te geven" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Geen pakketten gevonden" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Pakketbestanden:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cache loopt niet synchroon, kan pakketbestand niet 'x-ref'-en" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Vastgepinde pakketten:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(niet gevonden)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Genstalleerd: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(geen)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Kandidaat: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Pakketpin: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Versietabel:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s voor %s %s gecompileerd op %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -304,7 +314,7 @@ msgstr "" " -c=? Lees dit configuratiebestand.\n" " -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "Kan niet naar %s schrijven" @@ -313,31 +323,31 @@ msgstr "Kan niet naar %s schrijven" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kan versie van debconf niet bepalen. Is debconf genstalleerd?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Pakket-extensielijst is te lang" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "Fout bij het verwerken van map %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Bron-extensielijst is te lang" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Fout bij wegschrijven van de koptekst naar het 'contents'-bestand" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Fout bij het verwerken van de inhoud van %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -422,26 +432,26 @@ msgstr "" " -c=? Lees dit configuratiebestand in\n" " -o=? Stel een willekeurige configuratie optie in" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Geen van de selecties kwam overeen" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Sommige bestanden zijn niet aanwezig in de pakketbestandsgroep '%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB is beschadigd, bestand hernoemd naar %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB is verouderd, opwaardering van %s wordt geprobeerd" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." @@ -449,106 +459,106 @@ msgstr "" "DB-formaat is ongeldig. Als u opgewaardeerd heeft van een oudere versie, van " "apt, dient u de database te verwijderen en opnieuw aan te maken." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Kan het DB-bestand %s niet openen: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "Status opvragen van %s is mislukt" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Archief heeft geen 'control'-record" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Kan geen cursor verkrijgen" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Kon map %s niet lezen\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Kon de status van %s niet opvragen\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "F: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "F: Er zijn fouten van toepassing op het bestand " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "Oplossen van %s is mislukt" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "Doorlopen boomstructuur is mislukt" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "Openen van %s is mislukt" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr " OntlLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "Uitvoeren van readlink op %s is mislukt" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "Ontlinken van %s is mislukt" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Linken van %s aan %s is mislukt" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Ontlinklimiet van %sB is bereikt.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Archief heeft geen 'package'-veld" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s heeft geen voorrangsingang\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s beheerder is %s, niet %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr " %s heeft geen voorrangsingang voor bronpakketten\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s heeft ook geen voorrangsingang voor binaire pakketten\n" @@ -562,165 +572,165 @@ msgstr "Interne fout, kon onderdeel %s niet vinden" msgid "realloc - Failed to allocate memory" msgstr "realloc - Geheugentoewijzing is mislukt" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Kan %s niet openen" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Misvormde voorrangsingang %s op regel %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Misvormde voorrangsingang %s op regel %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Misvormde voorrangsingang %s op regel %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Voorrangsbestand %s kon niet gelezen worden" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Onbekend compressie-algoritme '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Gecomprimeerde uitvoer %s vereist een compressieset" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Aanmaken van IPC-pijp naar subproces is mislukt" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "Aanmaken FILE* is mislukt" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "Vorken van proces is mislukt" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "Comprimeer kind" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "Interne fout, aanmaken van %s is mislukt" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "Aanmaken subproces-IPC is mislukt" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "Uitvoeren van de compressor is mislukt " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "decompressor" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "IO naar subproces/bestand is mislukt" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "Lezen tijdens het berekenen van de MD5 is mislukt" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "Probleem bij het ontlinken van %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Hernoemen van %s naar %s is mislukt" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-compilatiefout - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "De volgende pakketten hebben niet-voldane vereisten:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "maar %s is genstalleerd" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "maar %s zal genstalleerd worden" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "maar het is niet installeerbaar" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "maar het is een virtueel pakket" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "maar het is niet genstalleerd" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "maar het zal niet genstalleerd worden" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " of" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "De volgende NIEUWE pakketten zullen genstalleerd worden:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "De volgende pakketten zullen VERWIJDERD worden:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "De volgende pakketten zijn achtergehouden:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "De volgende pakketten zullen opgewaardeerd worden:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "De volgende pakketten zullen GEDEGRADEERD worden:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (vanwege %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -728,146 +738,146 @@ msgstr "" "WAARSCHUWING: De volgende essentile pakketten zullen verwijderd worden.\n" "Dit dient NIET gedaan te worden tenzij u precies weet wat u doet!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pakketten opgewaardeerd, %lu pakketten nieuw genstalleerd, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu opnieuw genstalleerd, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu gedegradeerd, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu te verwijderen en %lu niet opgewaardeerd.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pakketten niet volledig genstalleerd of verwijderd.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Vereisten worden gecorrigeerd..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " mislukt." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Kan vereisten niet corrigeren" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Kon de verzameling op te waarderen pakketten niet minimaliseren" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Klaar" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "U kunt 'apt-get -f install' uitvoeren om dit op te lossen." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Er zijn vereisten waaraan niet voldaan is. Probeer -f te gebruiken." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" "WAARSCHUWING: De volgende pakketten kunnen niet geauthenticeerd worden:" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Authenticatiewaarschuwing is genegeerd.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Wilt u deze pakketten installeren zonder verificatie [j/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Sommige pakketten konden niet geauthenticeerd worden" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Interne fout, InstallPackages is aangeroepen met defecte pakketten!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Interne fout, rangschikken is niet voltooid" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "Kon de ophaalmap niet vergrendelen" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "De lijst van bronnen kon niet gelezen worden." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Merkwaardig... De groottes kwamen niet overeen, gelieve apt@packages.debian." "org te mailen" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Er moeten %sB/%sB aan archieven opgehaald worden.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Er moeten %sB aan archieven opgehaald worden.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Na het uitpakken zal er %sB extra schijfruimte gebruikt worden.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Na het uitpakken zal er %sB schijfruimte vrijkomen.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "U heeft onvoldoende vrije schijfruimte op %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' is opgegeven, dit is echter geen triviale bewerking." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Ja, doe wat ik zeg!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -878,28 +888,28 @@ msgstr "" "Als u wilt doorgaan, dient u de zin '%s' in te typen.\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "Afbreken." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Wilt u doorgaan [J/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ophalen van %s %s is mislukt\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Ophalen van sommige bestanden is mislukt" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "Ophalen klaar en alleen-ophalen-modus staat aan" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -907,49 +917,49 @@ msgstr "" "Kon sommige archieven niet ophalen, misschien kunt u 'apt-get update' of --" "fix-missing proberen?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing en medium wisselen wordt op dit moment niet ondersteund" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Geen oplossing voor de missende pakketten gevonden." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Installatie wordt afgebroken." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Let op, %s wordt geselecteerd in plaats van %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "%s wordt overgeslagen, het is al genstalleerd en opwaardering is niet " "gevraagd.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakket %s is niet genstalleerd, en wordt dus niet verwijderd\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakket %s is een virtueel pakket voorzien door:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Genstalleerd]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "U dient er n expliciet te selecteren voor installatie." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -960,50 +970,50 @@ msgstr "" "een ander pakket. Mogelijk betekent dit dat het pakket ontbreekt,\n" "verouderd is, of enkel beschikbaar is van een andere bron\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Echter, de volgende pakketten vervangen dit:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakket %s heeft geen installeerbare kandidaat" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Herinstallatie van %s is niet mogelijk daar het niet opgehaald kan worden.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s is reeds de nieuwste versie.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' voor '%s' is niet gevonden" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versie '%s' voor '%s' is niet gevonden" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versie %s (%s) geselecteerd voor %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "De 'update'-opdracht aanvaard geen argumenten" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Kon de lijst-map niet vergrendelen" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1011,27 +1021,67 @@ msgstr "" "Ophalen van sommige indexbestanden is mislukt, deze zijn of genegeerd, of er " "zijn oudere versies van gebruikt." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "De volgende NIEUWE pakketten zullen genstalleerd worden:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "De volgende informatie helpt u mogelijk verder:" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Kon pakket %s niet vinden" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "Kon pakket %s niet vinden" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Let op, %s wordt geselecteerd omwille van de regex '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "maar %s zal genstalleerd worden" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "U wilt waarschijnlijk 'apt-get -f install' uitvoeren om volgende op te " "lossen:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1039,7 +1089,7 @@ msgstr "" "Er zijn niet-voldane vereisten. U kunt best 'apt-get -f install' uitvoeren " "zonder pakketten op te geven, (of u kunt zelf een oplossing specificeren)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1050,7 +1100,7 @@ msgstr "" "een onmogelijke situatie gevraagd hebt of dat u de 'unstable'-distributie \n" "gebruikt en sommige benodigde pakketten nog vastzitten in 'incoming'." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1060,123 +1110,134 @@ msgstr "" "waarschijnlijk dat het pakket gewoon niet installeerbaar is. U kunt dan\n" "best een foutrapport indienen voor dit pakket." -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "De volgende informatie helpt u mogelijk verder:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "Niet-werkende pakketten:" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "De volgende extra pakketten zullen genstalleerd worden:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "Voorgestelde pakketten:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "Aanbevolen pakketten:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "Opwaardering wordt doorgerekend... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Mislukt" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "Klaar" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "" "U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet " "worden" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "Kan geen bronpakket vinden voor %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "U heeft niet voldoende vrije schijfruimte op %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Moet %sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "Ophalen bron %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "Ophalen van sommige archieven is mislukt." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uitpakopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket genstalleerd is.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "Bouwopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "Dochterproces is mislukt" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "" "U dient tenminste n pakket op te geven om de bouwvereisten van te " "controleren" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kan de informatie over de bouwvereisten voor %s niet ophalen" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "%s heeft geen bouwvereisten.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1185,7 +1246,7 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1194,32 +1255,33 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat er geen " "beschikbare versies zijn van pakket %s die aan de versievereisten voldoen" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Voldoen van Vereiste %s van pakket %s is mislukt: genstalleerde versie %s " "is te nieuw" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Voldoen van de vereiste %s van pakket %s is mislukt: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bouwvereisten voor %s konden niet voldaan worden." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "Verwerken van de bouwvereisten is mislukt" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "Ondersteunde modules:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1234,6 +1296,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1406,189 +1469,189 @@ msgstr "" msgid "Merging available information" msgstr "De beschikbare informatie wordt samengevoegd" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Aanmaken pijp is mislukt" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Uitvoeren van gzip is mislukt " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Beschadigd archief" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Tar controlesom klopt niet, het pakket is beschadigd" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Onbekende TAR-kopteksttype %u, onderdeel %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Ongeldige archiefondertekening" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Fout bij het lezen van de koptekst van het archief-onderdeel" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Ongeldige koptekst in archiefonderdeel" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Archief is te kort" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Lezen van de archiefkopteksten is mislukt" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode werd aangeroepen op een nog gelinkte knoop" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Localiseren van het hash-element is mislukt!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Toewijzen van de omleiding is mislukt" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Interne fout in AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Er wordt gepoogd om de omleiding %s->%s en %s/%s te overschrijven" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Dubbele toevoeging van de omleiding %s->%s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Dubbel configuratiebestand %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Wegschrijven van bestand %s is mislukt" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Sluiten van bestand %s is mislukt" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Het pad %s is te lang" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "%s wordt meer dan eens uitgepakt" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "De map %s is al omgeleid" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Het pakket probeert om het omleidingsdoel %s/%s weg te schrijven" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Het omleidingspad is te lang" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "De map %s wordt vervangen door een niet-map" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Vinden van de knoop in de hash-emmer is mislukt" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Het pad is te lang" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Pakket-overeenkomst wordt overschreven met 'no version' voor %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Het bestand %s/%s overschrijft het bestand van pakket %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Kan %s niet lezen" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Kan de status van %s niet opvragen" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Verwijderen van %s is mislukt" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Kan %s niet aanmaken" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Opvragen van de status van %sinfo is mislukt" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "" "De 'info'- en de 'temp'-mappen dienen op hetzelfde bestandsysteem te staan" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "Pakketlijsten worden ingelezen" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Verspringen naar de beheermap %sinfo is mislukt" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "Interne fout bij het ophalen van de pakketnaam" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Bestandslijst worden ingelezen" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1599,79 +1662,79 @@ msgstr "" "kunt herstellen, dient u het leeg te maken en daarna onmiddelijk dezelfde " "versie van het pakket te installeren!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Lezen van lijstbestand %sinfo/%s is mislukt" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Interne fout bij het verkrijgen van een knoop" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Openen van het omleidingsbestand %sdiversions is mislukt" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Het pakketcachebestand is beschadigd" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "Ongeldige regel in het omleidingsbestand: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Interne fout bij het toevoegen van een omleiding" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "De pakketcache dient eerst genitialiseerd te zijn" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Vinden van een 'Package:'-koptekst is mislukt, regel %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Foute 'ConfFile'-sectie in het statusbestand. Regel %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Fout bij het parsen van de MD5. regel %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Dit is geen geldig DEB archief, het onderdeel '%s' mankeert" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "" "Dit is geen geldig DEB-archief, het bevat noch een '%s' nog een '%s' " "onderdeel" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "Kon niet wijzigen naar %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "Interne fout, kon onderdeel niet vinden" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "Localiseren van een geldig 'control'-bestand is mislukt" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "Niet-ontleedbaar 'control'-bestand" @@ -1707,11 +1770,12 @@ msgid "File not found" msgstr "Bestand niet gevonden" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Status opvragen is mislukt" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Instellen van de aanpassingstijd is mislukt" @@ -1773,7 +1837,7 @@ msgstr "Verbinding is verlopen" msgid "Server closed the connection" msgstr "Verbinding is verbroken door de server" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "Leesfout" @@ -1785,7 +1849,7 @@ msgstr "Een reactie deed de buffer overlopen" msgid "Protocol corruption" msgstr "Protocolcorruptie" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "Schrijffout" @@ -1839,7 +1903,7 @@ msgstr "Datasocket verbinding is verlopen" msgid "Unable to accept connection" msgstr "Kan de verbinding niet aanvaarden" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Probleem bij het hashen van het bestand" @@ -1866,39 +1930,39 @@ msgstr "Zoekopdracht" msgid "Unable to invoke " msgstr "Aanroepen mislukt van " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Er wordt verbinding gemaakt met %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Kon de socket voor %s (f=%u t=%u p=%u) niet aanmaken" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Kan de verbinding met %s:%s (%s) niet aangaan." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Kon niet verbinden met %s:%s (%s), de verbinding verliep" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Kon niet verbinden met %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Er wordt verbinding gemaakt met %s" @@ -1978,437 +2042,457 @@ msgstr "Kon geen pijp openen voor %s" msgid "Read error from %s process" msgstr "Leesfout door proces %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Wachtend op de kopteksten" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Enkele koptekstregel ontvangen met meer dan %u karakters" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Foute koptekstregel" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Er is door de HTTP server een ongeldige 'reply'-koptekst verstuurd" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" "Er is door de HTTP server een ongeldige 'Content-Length'-koptekst verstuurd" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" "Er is door de HTTP server een ongeldige 'Content-Range'-koptekst verstuurd" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Onbekend datumformaat" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Selectie is mislukt" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Verbinding verliep" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Fout bij het schrijven naar het uitvoerbestand" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Fout bij het schrijven naar bestand" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Fout bij het schrijven naar het bestand" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fout bij het lezen van de server, andere kant heeft de verbinding gesloten" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Fout bij het lezen van de server" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Foute koptekstdata" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Verbinding mislukt" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Interne fout" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "Kan een leeg bestand niet mmappen" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Kon van %lu bytes geen mmap maken" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "Selectie %s niet gevonden" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Onbekende typeafkorting '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "Configuratiebestand %s wordt geopend" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "Regel %d is te lang (maxl %d)" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaxfout %s:%u: Blok start zonder naam." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaxfout %s:%u: Verkeerd gevormde markering" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaxfout %s:%u: Extra rommel na waarde" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Syntaxfout %s:%u: Richtlijnen kunnen enkel op het hoogste niveau gegeven " "worden" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaxfout %s:%u: Teveel geneste invoegingen" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaxfout %s:%u: Vanaf hier ingevoegd" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaxfout %s:%u: Niet-ondersteunde richtlijn '%s'" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaxfout %s:%u: Extra rommel aan het einde van het bestand" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Fout!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... Klaar" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Commandoregel-optie '%c' [van %s] is onbekend." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "Commandoregel-optie %s wordt niet begrepen" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Commandoregel-optie %s is niet booleaans" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Optie %s vereist een argument." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" "Optie %s: De specificatie van het configuratie-item dient een = te " "bevatten." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Optie %s vereist een integer getal als argument, niet '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Optie '%s' is te lang" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Waarde %s wordt niet begrepen, probeer 'true' of 'false'." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Ongeldige operatie %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Kan de status van het aanhechtpunt %s niet opvragen" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Kan %s niet veranderen" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "Het opvragen van de CD-status is mislukt" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Er wordt geen vergrendeling gebruikt voor het alleen-lezen-" "vergrendelingsbestand %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "Kon het vergrendelingsbestand '%s' niet openen" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Het via nfs aangekoppelde vergrendelingsbestand %s wordt niet vergrendeld" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "Kon vergrendeling %s niet verkrijgen" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Er is gewacht op %s, maar die kwam niet" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Subproces %s ontving een segmentatiefout." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Subproces %s gaf de foutcode %u terug" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Subproces %s sloot onverwacht af" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "Kon het bestand %s niet openen" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "lees, de laatste te lezen %lu zijn niet beschikbaar" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "schrijf, de laatste %lu konden niet weggeschreven worden" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "Probleem bij het afsluiten van het bestand" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "Probleem bij het ontlinken van het bestand" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "Probleem bij het synchroniseren van het bestand" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Lege pakketcache" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Het pakketcachebestand is beschadigd" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Het pakketcachebestand heeft een niet-compatible versie" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Deze APT ondersteunt het versienummeringssysteem '%s' niet" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "De pakketcache was aangemaakt voor een andere architectuur" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Vereisten" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Voor-Vereisten" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Suggesties" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Aanbevelingen" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Conflicteert met" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Vervangt" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Verouderd" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "belangrijk" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "noodzakelijk" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standaard" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "optioneel" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "Boom van vereisten wordt opgebouwd" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "Kandidaat-versies" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "Generatie vereisten" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "De beschikbare informatie wordt samengevoegd" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Openen van %s is mislukt" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Wegschrijven van bestand %s is mislukt" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Kon pakketbestand %s niet ontleden (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kon pakketbestand %s niet ontleden (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Misvormde regel %lu in bronlijst %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Misvormde regel %lu in bronlijst %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Misvormde regel %lu in bronlijst %s (URI parse)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Misvormde regel %lu in bronlijst %s (absolute dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Misvormde regel %lu in bronlijst %s (dist parse)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s wordt geopend" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Regel %u van de bronlijst %s is te lang." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Misvormde regel %u in bronlijst %s (type)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Type '%s' op regel %u in bronlijst %s is onbekend" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Misvormde regel %u in bronlijst %s (verkopers-ID)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2420,12 +2504,12 @@ msgstr "" "slecht, wilt u dit echt doen dan dient u de APT::Force-LoopBreak optie te " "activeren." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Indexbestandtype '%s' wordt niet ondersteund" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2433,7 +2517,7 @@ msgstr "" "Pakket %s moet opnieuw genstalleerd worden, maar er kan geen archief voor " "gevonden worden." -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2441,188 +2525,204 @@ msgstr "" "Fout, pkgProblemResolver::Resolve maakte scheidingen aan, dit kan " "veroorzaakt worden door vastgehouden pakketten." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Lijstmap %spartial is afwezig." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Archiefmap %spartial is afwezig." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Bestand %li van %li wordt opgehaald (nog %s te gaan)" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "Bestand %li van %li wordt opgehaald" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Het methodestuurprogramma %s kon niet gevonden worden." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Methode %s startte niet op de juiste manier" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Gelieve de schijf met label '%s' in het station '%s' te plaatsen en op " "'enter' te drukken." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "Kan geen geschikt pakketsysteemtype bepalen" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Kan de status van %s niet opvragen." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "" "Uw bronnenlijst (/etc/apt/sources.list) dient minstens 1 bron-URI te bevatten" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "" "De pakketlijsten of het statusbestand konden of niet ontleed, of niet " "geopend worden." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "" "U kunt misschien 'apt-get update' uitvoeren om deze problemen te verhelpen" -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Ongeldige record in het voorkeurenbestand, geen 'Package'-koptekst" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Pintype %s wordt niet begrepen" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Er is geen prioriteit (of nul) opgegeven voor deze pin" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Cache heeft een niet-compatibel versienummeringssysteem" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Fout tijdens verwerken van %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Fout tijdens verwerken van %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Fout tijdens verwerken van %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Fout tijdens verwerken van %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Fout tijdens verwerken van %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Fout tijdens verwerken van %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Fout tijdens verwerken van %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Fout tijdens verwerken van %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Fout tijdens verwerken van %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Wauw, u heeft meer pakketten dan deze APT aankan." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Wauw, u heeft meer versies dan deze APT aankan." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Wauw, u heeft meer versies dan deze APT aankan." + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Wauw, u heeft meer afhankelijkheden dan deze APT aankan." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Fout tijdens verwerken van %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Fout tijdens verwerken van %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Pakket %s %s werd niet gevonden bij het verwerken van de " "bestandsafhankelijkheden" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kon de status van de bronpakketlijst %s niet opvragen" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "Voorziene bestanden worden verzameld" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakketcache" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "hernoeming is mislukt, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "MD5Sum komt niet overeen" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-IDs:\n" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2631,7 +2731,7 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren (wegens missende architectuur)" -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2640,7 +2740,7 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren." -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2648,7 +2748,7 @@ msgstr "" "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor " "pakket %s." -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Grootte komt niet overeen" @@ -2657,7 +2757,7 @@ msgstr "Grootte komt niet overeen" msgid "Vendor block %s contains no fingerprint" msgstr "Verkopersblok %s bevat geen vingerafdruk" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2666,52 +2766,54 @@ msgstr "" "Er wordt gebruik gemaakt van CD-aankoppelpunt %s\n" "CD wordt aangekoppeld\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "Identificatie..." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "Opgeslagen label: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Er wordt gebruik gemaakt van CD-aankoppelpunt %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "CD wordt losgekoppeld\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "Er wordt gewacht op de schijf...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "CD wordt aangekoppeld...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "Er wordt gescant voor indexbestanden...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "%i pakket-indexen gevonden, %i bron-indexen en %i handtekeningen\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "Opgeslagen label: %s \n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "Dat is een ongeldige naam, gelieve opnieuw te proberen.\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2720,95 +2822,100 @@ msgstr "" "De schijf heet:\n" "'%s'\n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Pakketlijsten worden gekopieerd..." -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Nieuwe bronlijst wordt weggeschreven\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Bronlijst-ingangen voor de schijf zijn:\n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "CD wordt afgekoppeld..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "%i records weggeschreven.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i records weggeschreven met %i missende bestanden.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i records weggeschreven met %i niet overeenkomende bestanden\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "%i records weggeschreven met %i missende bestanden en %i niet overeenkomende " "bestanden\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "%s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "%s wordt uitgepakt" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Configuratie van %s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "%s wordt geconfigureerd" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "%s is genstalleerd" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Verwijdering van %s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "%s wordt verwijderd" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "%s is verwijderd" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Volledige verwijdering van %s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "%s is volledig verwijderd" +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Kon het bestand %s niet openen" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Verbinding werd voortijdig afgebroken" diff --git a/po/nn.po b/po/nn.po index cfc588603..e33da4203 100644 --- a/po/nn.po +++ b/po/nn.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_nn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" @@ -18,145 +18,155 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.9.1\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Pakken %s versjon %s har eit krav som ikkje er oppfylt:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Finn ikkje pakken %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "Tal p pakkenamn: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Vanlege pakkar: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Reine virtuelle pakkar: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Enkle virtuelle pakkar: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Samansette virtuelle pakkar: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Manglar: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Tal p einskildversjonar: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Tal p einskildversjonar: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Tal p krav: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Tal p ver./fil-forhold: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Tal p ver./fil-forhold: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Tal p tilbyr-forhold: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Tal p strengar med jokerteikn: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Storleik p kravs- og versjonsrom: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Slingringsmon: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Brukt plass i alt: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Pakkefila %s er ute av takt." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Du m oppgi nyaktig eitt mnster" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Fann ingen pakkar" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Pakkefiler:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Mellomlageret er ute av takt, kan ikkje x-referera ei pakkefil" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Spikra pakkar:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(ikkje funne)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Installert: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(ingen)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Kandidat: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Pakke spikra til: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Versjonstabell:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s kompilert p %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -307,7 +317,7 @@ msgstr "" " -c=? Les denne innstillingsfila.\n" " -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "Klarte ikkje skriva til %s" @@ -316,31 +326,31 @@ msgstr "Klarte ikkje skriva til %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Finn ikkje debconf-versjonen. Er debconf installert?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Lista over pakkeutvidingar er for lang" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "Feil ved lesing av katalogen %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Lista over kjeldeutvidingar er for lang" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Feil ved skriving av topptekst til innhaldsfila" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Feil ved lesing av %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 #, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" @@ -420,131 +430,131 @@ msgstr "" " -c=? Les denne oppsettsfila.\n" " -o=? Set ei vilkrleg innstilling." -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Ingen utval passa" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Enkelte filer manglar i pakkefilgruppa %s" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Databasen er ydelagd. Filnamnet er endra til %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB er for gammal, forskjer oppgradere %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." msgstr "" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Klarte ikkje opna DB-fila %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "Klarte ikkje f status til %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Arkivet har ingen kontrollpost" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Klarte ikkje f peikar" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr ": Klarte ikkje lesa katalogen %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr ": Klarte ikkje f status til %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "F: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr ": " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "F: Det er feil ved fila " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "Klarte ikkje sl opp %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "Treklatring mislukkast" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "Klarte ikkje opna %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "Klarte ikkje lesa lenkja %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "Klarte ikkje oppheva lenkja %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Klarte ikkje lenkja %s til %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-grensa p %sB er ndd.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Arkivet har ikkje noko pakkefelt" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s har inga overstyringsoppfring\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-vedlikehaldaren er %s, ikkje %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " %s har inga overstyringsoppfring\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " %s har inga overstyringsoppfring\n" @@ -558,165 +568,165 @@ msgstr "Intern feil, fann ikkje medlemmen %s" msgid "realloc - Failed to allocate memory" msgstr "realloc - Klarte ikkje tildela minne" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Klarte ikkje opna %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Misforma overstyring %s linje %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Misforma overstyring %s linje %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Misforma overstyring %s linje %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Klarte ikkje lesa overstyringsfila %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Ukjend komprimeringsalgoritme %s" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimert utdata %s treng eit komprimeringssett" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Klarte ikkje oppretta IPC-ryr til underprosessen" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "Klarte ikkje oppretta FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "Klarte ikkje gafla" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "Komprimer barn" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "Intern feil, klarte ikkje oppretta %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "Klarte ikkje oppretta underprosessen IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "Klarte ikkje kyra komprimeringa " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "dekomprimering" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "Klarte ikkje kommunisera med underprosess/fil" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "Klarte ikkje lesa under utrekning av MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "Problem ved oppheving av lenkje til %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Klarte ikkje endra namnet p %s til %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-kompileringsfeil - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "Flgjande pakkar har krav som ikkje er oppfylte:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "men %s er installert" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "men %s skal installerast" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "men lt seg ikkje installera" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "men er ein virtuell pakke" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "men er ikkje installert" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "men skal ikkje installerast" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " eller" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "Dei flgjande NYE pakkane vil verta installerte:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "Dei flgjande pakkane vil verta FJERNA:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "Dei flgjande pakkane er haldne tilbake:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "Dei flgjande pakkane vil verta oppgraderte:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "Dei flgjande pakkane vil verta NEDGRADERTE:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "Dei flgjande pakkane som er haldne tilbake vil verta endra:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (fordi %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -725,146 +735,146 @@ msgstr "" "TVARING: Dei flgjande ndvendige pakkane vil verta fjerna.\n" "Dette br IKKJE gjerast utan at du er fullstendig klar over kva du gjer!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu oppgraderte, %lu nyleg installerte, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu installerte p nytt, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderte, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ikkje fullstendig installerte eller fjerna.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Rettar p krav ..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " mislukkast." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Klarte ikkje retta p krav" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Klarte ikkje minimera oppgraderingsmengda" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Ferdig" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "Du vil kanskje prva retta p desse ved kyra apt-get -f install." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Nokre krav er ikkje oppfylte. Prv med -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "TVARING: Klarer ikkje autentisere desse pakkane." -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Installer desse pakkane utan verifikasjon [j/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Nokre pakkar kunne ikkje bli autentisert" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Det oppstod problem, og -y vart brukt utan --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Nokre pakkar m fjernast, men fjerning er sltt av." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Intern feil ved tilleggjing av avleiing" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "Klarte ikkje lsa nedlastingskatalogen" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Kjeldelista kan ikkje lesast." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "M henta %sB/%sB med arkiv.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "M henta %sB med arkiv.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Du har ikkje nok ledig plass i %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Du har ikkje nok ledig plass i %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Trivial Only var spesifisert, men dette er ikkje noka triviell handling." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Ja, gjer som eg seier!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -875,28 +885,28 @@ msgstr "" "For halda fram, m du skriva nyaktig %s.\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "Avbryt." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Vil du halda fram [J/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikkje henta %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Klarte ikkje henta nokre av filene" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "Nedlastinga er ferdig i nedlastingsmodus" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -904,49 +914,49 @@ msgstr "" "Klarte ikkje henta nokre av arkiva. Du kan prva med apt-get update eller " "--fix-missing." -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing og byte av medium er ikkje sttta for tida" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Klarte ikkje retta opp manglande pakkar." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Avbryt installasjon." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Merk, vel %s i staden for %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Hoppar over %s, for den er installert fr fr og ikkje sett til " "oppgradering.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakken %s er ein virtuell pakke, tilbydd av:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Installert]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Du m velja ein som skal installerast." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -957,49 +967,49 @@ msgstr "" "av ein annan pakke. Dette tyder at pakket manglar, er gjort overfldig\n" "eller er berre tilgjengeleg fr ei anna kjelde\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Dei flgjande pakkane kan brukast i staden:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Det finst ingen installasjonskandidat for pakken %s" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s kan ikkje installerast p nytt, for pakken kan ikkje lastast ned.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "Den nyaste versjonen av %s er installert fr fr.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Fann ikkje utgva %s av %s" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Fann ikkje versjonen %s av %s" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Vald versjon %s (%s) for %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Oppdateringskommandoen tek ingen argument" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Klarte ikkje lsa listekatalogen" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1007,26 +1017,66 @@ msgstr "" "Klarte ikkje lasta ned nokre av indeksfilene. Dei er ignorerte, eller gamle " "filer er brukte i staden." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Dei flgjande NYE pakkane vil verta installerte:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "Flgjande informasjon kan hjelpa med lysa situasjonen:" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Intern feil. AllUpgrade ydelagde noko" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Fann ikkje pakken %s" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "Fann ikkje pakken %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Merk, vel %s i staden for regex %s\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "men %s skal installerast" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Du vil kanskje prva retta p desse ved kyra apt-get -f install." -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1034,7 +1084,7 @@ msgstr "" "Nokre krav er ikkje oppfylte. Du kan prva apt-get -f install (eller velja " "ei lysing)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1046,7 +1096,7 @@ msgstr "" "distribusjonen, kan det g henda at nokre av pakkane som trengst ikkje\n" "er laga enno eller at dei framleis ligg i Incoming." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1056,127 +1106,138 @@ msgstr "" "pakken rett og slett ikkje lt seg installera. I sfall br du senda\n" "feilmelding." -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Flgjande informasjon kan hjelpa med lysa situasjonen:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "ydelagde pakkar" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "Dei flgjande tilleggspakkane vil verta installerte:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "Fresltte pakkar:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "Tilrdde pakkar" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "Reknar ut oppgradering ... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Mislukkast" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "Ferdig" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "Du m velja minst in pakke som kjeldekoden skal hentast for" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "Finn ingen kjeldepakke for %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikkje nok ledig plass i %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "M henta %sB/%sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "M henta %sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "Hent kjeldekode %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "Klarte ikkje henta nokre av arkiva." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggjekommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "Barneprosessen mislukkast" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "Du m velja minst ein pakke som byggjekrava skal sjekkast for" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarte ikkje henta byggjekrav for %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen byggjekrav.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1185,31 +1246,32 @@ msgstr "" "Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon " "tilgjengelege versjonar av pakken %s som oppfyller versjonskrava" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikkje oppfylla kravet %s for %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggjekrav for %s kunne ikkje tilfredstillast." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "Klarte ikkje behandla byggjekrava" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "Sttta modular:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1224,6 +1286,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1385,189 +1448,189 @@ msgstr "er viktige. Rett opp dei feila og [i]nstaller p msgid "Merging available information" msgstr "Flettar informasjon om tilgjengelege pakkar" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Klarte ikkje oppretta ryr" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Klarte ikkje kyra gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "ydelagt arkiv" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-sjekksummen mislukkast, arkivet er ydelagt" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Ukjend TAR-hovud type %u, medlem %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Ugyldig arkivsignatur" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Feil ved lesing av arkivmedlemshovud" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Ugyldig arkivmedlemshovud" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Arkivet er for kort" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Klarte ikkje lesa arkivhovuda" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode vart kalla p ein node som framleis er lenkja" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Fann ikkje nkkelelementet." -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Klarte ikkje tildela avleiing" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Intern feil i AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Prver skriva over ei avleiing, %s -> %s og %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Dobbel tilleggjing av avleiing %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Dobbel oppsettsfil %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, fuzzy, c-format msgid "Failed to write file %s" msgstr "Klarte ikkje skriva fila %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Klarte ikkje lukka fila %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Stigen %s er for lang" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Pakkar ut %s meir enn in gong" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Katalogen %s er avleidd" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Pakken prver skriva til avleiingsmlet %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Avleiingsstigen er for lang" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Katalogen %s vert bytt ut med ein ikkje-katalog" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Fann ikkje noden i nkkelbtta" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Stigen er for lang" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Skriv over pakketreff utan versjon for %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Fila %s/%s skriv over den tilsvarande fila i pakken %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Klarte ikkje lesa %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Klarte ikkje f status til %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Klarte ikkje fjerna %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Klarte ikkje oppretta %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Klarte ikkje f status til %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "" "Infokatalogen og den mellombelse katalogen m vera p det same filsystemet" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "Les pakkelister" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Klarte ikkje byta til adminkatalogen %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "Intern feil ved henting av pakkenamn" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Les filliste" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1578,78 +1641,78 @@ msgstr "" "denne fila, br du oppretta ho som ei tom fil og installera den same " "versjonen av pakken p nytt." -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Klarte ikkje lesa listefila %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Intern feil ved henting av node" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Klarte ikkje opna avleiingsfila %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Avleiingsfila er ydelagd" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "Ugyldig linje i avleiingsfila: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Intern feil ved tilleggjing av avleiing" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Pakkelageret m frst klargjerast" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Fann ikkje Package:-linja, offset %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "ydelagd ConfFile-del i statusfila. Offset %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Feil ved tolking av MD5. Offset %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Dette er ikkje eit gyldig DEB-arkiv, manglar %s-medlemmen" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "" "Dette er ikkje eit gyldig DEB-arkiv, det har ingen %s eller %s-medlem" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "Klarte ikkje byta til %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "Intern feil, fann ikkje medlem" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "Fann ikkje noka gyldig kontrollfil" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "Kontrollfila kan ikkje tolkast" @@ -1686,11 +1749,12 @@ msgid "File not found" msgstr "Fann ikkje fila" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Klarte ikkje f status" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Klarte ikkje setja endringstidspunkt" @@ -1752,7 +1816,7 @@ msgstr "Tidsavbrot p msgid "Server closed the connection" msgstr "Tenaren lukka sambandet" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "Lesefeil" @@ -1764,7 +1828,7 @@ msgstr "Eit svar flaumde over bufferen." msgid "Protocol corruption" msgstr "Protokollydeleggjing" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "Skrivefeil" @@ -1818,7 +1882,7 @@ msgstr "Tidsavbrot p msgid "Unable to accept connection" msgstr "Klarte ikkje godta tilkoplinga" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved oppretting av nkkel for fil" @@ -1845,39 +1909,39 @@ msgstr "Sp msgid "Unable to invoke " msgstr "Klarte ikkje starta " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Koplar til %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Klarte ikkje oppretta sokkel for %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Klarte ikkje initiera sambandet til %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Klarte ikkje kopla til %s:%s (%s), tidsavbrot p sambandet" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Klarte ikkje kopla til %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Koplar til %s" @@ -1950,427 +2014,447 @@ msgstr "Klarte ikkje opna r msgid "Read error from %s process" msgstr "Lesefeil fr %s-prosessen" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Ventar p hovud" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Fekk ei enkel hovudlinje over %u teikn" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "ydelagd hovudlinje" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP-tenaren sende eit ugyldig svarhovud" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP-tenaren sende eit ugyldig Content-Length-hovud" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP-tenaren sende eit ugyldig Content-Range-hovud" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Denne HTTP-tenaren har ydelagd sttte for omrde" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Ukjend datoformat" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Utvalet mislukkast" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Tidsavbrot p sambandet" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fr tenaren. Sambandet vart lukka i andre enden" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Feil ved lesing fr tenaren" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "ydelagde hovuddata" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Sambandet mislukkast" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Intern feil" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "Kan ikkje utfra mmap p ei tom fil" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Klarte ikkje laga mmap av %lu byte" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "Fann ikkje utvalet %s" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ukjend typeforkorting: %c" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "Opnar oppsettsfila %s" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "Linja %d er for lang (maks %d)" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaksfeil %s:%u: Blokka startar utan namn." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaksfeil %s:%u: Misforma tagg" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaksfeil %s:%u: Ekstra rot etter verdien" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntaksfeil %s:%u: Direktiva kan berre liggja i det vste nivet" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaksfeil %s:%u: For mange nsta inkluderte filer" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaksfeil %s:%u: Inkludert herifr" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaksfeil %s:%u: Direktivet %s er ikkje sttta" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksfeil %s:%u: Ekstra rot til slutt i fila" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s ... Feil" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s ... Ferdig" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Kjenner ikkje kommandolinjevalet %c (fr %s)." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "Skjnar ikkje kommandolinjevalet %s" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Kommandolinjevalet %s er ikkje boolsk" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Valet %s krev eit argument." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Val %s: Spesifikasjonen av oppsettselementet m ha ein =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Valet %s m ha eit heiltalsargument, ikkje %s" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Valet %s er for langt" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Skjnar ikkje %s. Prv true eller false." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Ugyldig operasjon %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Klarte ikkje f status til monteringspunktet %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Klarte ikkje byta til %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "Klarte ikkje f status til CD-ROM" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Brukar ikkje lsing for den skrivebeskytta lsefila %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "Klarte ikkje opna lsefila %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Brukar ikkje lsing for den nfs-monterte lsefila %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "Klarte ikkje lsa %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Venta p %s, men den fanst ikkje" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprosessen %s mottok ein segmenteringsfeil." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprosessen %s returnerte ein feilkode (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprosessen %s avslutta uventa" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "Klarte ikkje opna fila %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "lese, har framleis %lu att lesa, men ingen att" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "skrive, har framleis %lu att skrive, men klarte ikkje" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "Problem ved lsing av fila" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "Problem ved oppheving av lenkje til fila" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "Problem ved synkronisering av fila" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Tomt pakkelager" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Pakkelagerfila er ydelagd" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Versjonen til pakkelagerfila er ikkje kompatibel" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "APT stttar ikkje versjonssystemet %s" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Pakkelageret er bygd for ein annan arkitektur" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Krav" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Forkrav" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Forslag" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Tilrdingar" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Konflikt" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Byter ut" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Foreldar" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "viktig" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "pkravd" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "vanleg" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "valfri" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "tillegg" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "Byggjer kravtre" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "Kandidatversjonar" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "Genererer kravforhold" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "Flettar informasjon om tilgjengelege pakkar" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Klarte ikkje opna %s" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Klarte ikkje skriva fila %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Klarte ikkje tolka pakkefila %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Klarte ikkje tolka pakkefila %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Misforma linje %lu i kjeldelista %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Misforma linje %lu i kjeldelista %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Misforma linje %lu i kjeldelista %s (absolutt dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Opnar %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Linja %u i kjeldelista %s er for lang." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Misforma linje %u i kjeldelista %s (type)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen %s er ukjend i linja %u i kjeldelista %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Misforma linje %u i kjeldelista %s (utgjevar-ID)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2382,18 +2466,18 @@ msgstr "" "om du verkeleg vil gjera det, kan du bruka innstillinga APT::Force-" "LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Indeksfiltypen %s er ikkje sttta" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Pakken %s m installerast p nytt, men arkivet finst ikkje." -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2401,44 +2485,44 @@ msgstr "" "Feil, pkgProblemResolver::Resolve har laga brot. Dette kan skuldast pakkar " "som er haldne tilbake." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Klarte ikkje retta opp problema. Nokre ydelagde pakkar er haldne tilbake." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Listekatalogen %spartial manglar." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Arkivkatalogen %spartial manglar." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, fuzzy, c-format msgid "Retrieving file %li of %li" msgstr "Les filliste" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Finn ikkje metodedrivaren %s." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Metoden %s starta ikkje rett" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, fuzzy, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -2446,139 +2530,155 @@ msgstr "" " %s\n" "i stasjonen %s og trykk Enter.\n" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet %s er ikkje sttta" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Klarte ikkje f status p %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Du m leggja nokre kjelde-URI-ar i fila sources.list." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "Klarte ikkje tolka eller opna pakkelista eller tilstandsfila." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Du vil kanskje prva retta p desse problema ved kyra apt-get update." -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Ugyldig oppslag i innstillingsfila, manglar pakkehovud" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Skjnar ikkje spikringstypen %s" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Ingen prioritet (eller null) oppgitt for spiker" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Feil ved behandling av %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Feil ved behandling av %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Feil ved behandling av %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Feil ved behandling av %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Feil ved behandling av %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Feil ved behandling av %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Feil ved behandling av %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Feil ved behandling av %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Feil ved behandling av %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Jss, du har overgtt talet p pakkenamn som APT kan handtera." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Jss, du har overgtt talet p versjonar som APT kan handtera." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Jss, du har overgtt talet p versjonar som APT kan handtera." + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Jss, du har overgtt talet p krav som APT kan handtera." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Feil ved behandling av %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Feil ved behandling av %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Fann ikkje pakken %s %s ved behandling av filkrav" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "Klarte ikkje f status p kjeldepakkelista %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "Samlar inn filtilbod" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "IU-feil ved lagring av kjeldelager" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "endring av namn mislukkast, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Feil MD5-sum" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2587,7 +2687,7 @@ msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv " "(fordi arkitekturen manglar)." -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2595,14 +2695,14 @@ msgid "" msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv." -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Pakkeindeksfilene er ydelagde. Feltet Filename: manglar for pakken %s." -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Feil storleik" @@ -2611,7 +2711,7 @@ msgstr "Feil storleik" msgid "Vendor block %s contains no fingerprint" msgstr "Utgjevarblokka %s inneheld ingen fingeravtrykk" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2620,52 +2720,54 @@ msgstr "" "Brukar monteringspunktet %s for CD-ROM\n" "Monterer CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "Identifiserer ... " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "Lagra etikett: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Brukar monteringspunktet %s for CD-ROM\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "Avmonterer CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "Ventar p disk ...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "Monterer CD-ROM ...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "Leitar etter indeksfiler p disken ...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "Fann %i pakkeindeksar, %i kjeldeindeksar og %i signaturar\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "Lagra etikett: %s \n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "Det er ikkje eit gyldig namn, prv igjen.\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2674,93 +2776,98 @@ msgstr "" "Disken vert kalla: \n" "%s\n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Kopierer pakkelister ..." -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Skriv ny kjeldeliste\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Kjeldelisteoppfringar for denne disken er:\n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "Avmonterer CD-ROM ..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Skreiv %i postar.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Skreiv %i postar med %i manglande filer.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Skreiv %i postar med %i filer som ikkje passa\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skreiv %i postar med %i manglande filer og %i filer som ikkje passa\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, fuzzy, c-format msgid "Preparing %s" msgstr "Opnar %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Opnar %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Opnar oppsettsfila %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, fuzzy, c-format msgid "Configuring %s" msgstr "Koplar til %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, fuzzy, c-format msgid "Installed %s" msgstr " Installert: " -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, fuzzy, c-format msgid "Removing %s" msgstr "Opnar %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, fuzzy, c-format msgid "Removed %s" msgstr "Tilrdingar" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Opnar oppsettsfila %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Klarte ikkje fjerna %s" +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Klarte ikkje opna fila %s" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Sambandet vart uventa stengd" @@ -2768,10 +2875,6 @@ msgstr "Sambandet vart uventa stengd" #~ msgid "File date has changed %s" #~ msgstr "Fildatoen er endra %s" -#, fuzzy -#~ msgid "Could not patch file" -#~ msgstr "Klarte ikkje opna fila %s" - #~ msgid "Reading file list" #~ msgstr "Les filliste" diff --git a/po/pl.po b/po/pl.po index 763ec3325..0eceb3cb8 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2006-01-23 15:32+0100\n" "Last-Translator: Bartosz Fenski \n" "Language-Team: Polish \n" @@ -14,147 +14,155 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Pakiet %s w wersji %s ma niespenione zalenoci:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Nie udao si odnale pakietu %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "Liczba nazw pakietw : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Zwykych pakietw: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Czysto wirtualnych pakietw: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Pojedynczych pakietw wirtualnych: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Mieszanych pakietw wirtualnych: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Brakujcych: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "W sumie rnych wersji: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +msgid "Total Distinct Descriptions: " +msgstr "W sumie rnych opisw: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "W sumie zalenoci: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "W sumie zalenoci wersja/plik: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "W sumie zalenoci opis/plik: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "W sumie mapowa zapewnie: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "W sumie dopasowanych napisw: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Sumaryczny rozmiar obszaru zalenoci od wersji: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Sumaryczny rozmiar niewykorzystanego miejsca: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Cakowity rozmiar: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Plik pakietu %s jest przestarzay." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Naley poda dokadnie jeden wzr" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Nie znaleziono adnych pakietw" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Plikw pakietw:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Magazyn podrczny jest przestarzay, nie mona odwoa si (x-ref) do pliku " "pakietu." -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Przypite pakiety:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(nieznaleziony)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Zainstalowana: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(brak)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Kandydujca: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Sposb przypicia: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Tabela wersji:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s dla %s %s skompilowany %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -303,7 +311,7 @@ msgstr "" " -c=? Czytaj ten plik konfiguracyjny.\n" " -o=? Ustaw dowoln opcj konfiguracji, np. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "Nie udao si pisa do %s" @@ -312,31 +320,31 @@ msgstr "Nie uda msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nie udao si pobra wersji debconf. Czy debconf jest zainstalowany?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Lista rozszerze pakietw jest zbyt duga" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "Bd przetwarzania katalogu %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Lista rozszerze pakietw rdowych jest zbyt duga" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Bd przy zapisywaniu nagwka do pliku zawartoci" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Bd podczas przetwarzania zawartoci %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -418,131 +426,131 @@ msgstr "" " -c=? Czytaj ten plik konfiguracyjny\n" " -o=? Ustaw dowoln opcj konfiguracji" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Nie dopasowano adnej nazwy" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Brakuje pewnych plikw w grupie plikw pakietw `%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Baza bya uszkodzona, plik zosta przeniesiony do %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Baza jest przestarzaa, prbuj zaktualizowa %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." msgstr "" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Nie udao si otworzy pliku DB %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "Nie udao si wykona operacji stat na %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Archiwum nie posiada rekordu control" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Nie udao si pobra kursora" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Nie udao si odczyta katalogu %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Nie mona wykona operacji stat na %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "E: Bdy odnosz si do pliku " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "Nie udao si przetumaczy nazwy %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "Przejcie po drzewie nie powiodo si" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "Nie udao si otworzy %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr " Odczenie %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "Nie udao si odczyta dowizania %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "Nie udao si usun %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Nie udao si dowiza %s do %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Osignito ograniczenie odczania %sB.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Archiwum nie posiadao pola pakietu" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s nie posiada wpisu w pliku override\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " opiekunem %s jest %s, a nie %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " %s nie posiada wpisu w pliku override\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " %s nie posiada wpisu w pliku override\n" @@ -556,165 +564,165 @@ msgstr "B msgid "realloc - Failed to allocate memory" msgstr "realloc - Nie udao si zaalokowa pamici" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Nie mona otworzy %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Bdna linia %2$lu #1 pliku override %1$s" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Bdna linia %2$lu #2 pliku override %1$s" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Bdna linia %2$lu #3 pliku override %1$s" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Nie udao si czyta pliku override %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Nieznany algorytm kompresji '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Skompresowany plik wynikowy %s wymaga podania kompresji" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Nie udao si utworzy potoku IPC do podprocesu" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "Nie udao si utworzy obiektu FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "Nie udao si utworzy procesu potomnego" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "Potomny proces kompresujcy" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "Bd wewntrzny, nie udao si utworzy %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "Nie udao si utworzy IPC z podprocesem" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "Nie udao si uruchomi kompresora " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "dekompresor" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "Zawioda operacja IO na pliku/podprocesie" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "Nie udao si czytanie w czasie liczenia skrtu MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "Problem przy usuwaniu %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Nie udao si zmieni nazwy %s na %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "T" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "Bd kompilacji wyraenia regularnego - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "Nastpujce pakiety maj niespenione zalenoci:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "ale %s jest zainstalowany" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "ale %s ma zosta zainstalowany" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "ale nie da si go zainstalowa" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "ale jest pakietem wirtualnym" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "ale nie jest zainstalowany" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "ale nie zostanie zainstalowany" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " lub" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "Zostan zainstalowane nastpujce NOWE pakiety:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "Nastpujce pakiety zostan USUNITE:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "Nastpujce pakiety zostay zatrzymane:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "Nastpujce pakiety zostan zaktualizowane:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "Zostan zainstalowane STARE wersje nastpujcych pakietw:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "Zostan zmienione nastpujce zatrzymane pakiety:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (z powodu %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -722,143 +730,143 @@ msgstr "" "UWAGA: Zostan usunite nastpujce istotne pakiety.\n" "Nie powinno si tego robi, chyba e dokadnie wiesz, co robisz!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizowanych, %lu nowo instalowanych, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu przeinstalowywanych, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu cofnitych wersji, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu usuwanych i %lu nieaktualizowanych.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nie w peni zainstalowanych lub usunitych.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Naprawianie zalenoci..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " nie udao si." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Nie udao si naprawi zalenoci" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Nie udao si zminimalizowa zbioru aktualizacji" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Gotowe" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Naley uruchomi `apt-get -f install', aby je naprawi." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Niespenione zalenoci. Sprbuj uy -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "UWAGA: Nastpujce pakiety nie mog zosta zweryfikowane!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Ostrzeenie uwierzytelniania zignorowano.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Zainstalowa te pakiety bez weryfikacji [t/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Niektre pakiety nie mogy zosta zweryfikowane" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Byy problemy, a uyto -y bez --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Bd wewntrzny, InstallPackages uyto z zepsutymi pakietami!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Pakiety powinny zosta usunite, ale Remove jest wyczone." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Bd wewntrzny, sortowanie niezakoczone" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "Nie udao si zablokowa katalogu pobierania" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Nie udao si odczyta list rde." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "Dziwne.. rozmiary si nie zgadzaj, zgo pod apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Konieczne pobranie %sB/%sB archiww.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Konieczne pobranie %sB archiww.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Po rozpakowaniu zostanie dodatkowo uyte %sB miejsca na dysku.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po rozpakowaniu zostanie zwolnione %sB miejsca na dysku.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nie udao si ustali iloci wolnego miejsca w %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Niestety w %s nie ma wystarczajcej iloci wolnego miejsca." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Nakazano wykonywa tylko trywialne operacje, a to nie jest trywialne." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Tak, rb jak mwi!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -869,28 +877,28 @@ msgstr "" "Aby kontynuowa wpisz zdanie '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "Przerwane." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Czy chcesz kontynuowa [T/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nie udao si pobra %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Nie udao si pobra niektrych plikw" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "Ukoczono pobieranie w trybie samego pobierania" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -898,48 +906,48 @@ msgstr "" "Nie udao si pobra niektrych archiww, sprbuj uruchomi apt-get update " "lub uy opcji --fix-missing" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing i zamienianie nonikw nie jest obecnie obsugiwane" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Nie udao si poprawi brakujcych pakietw." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Przerywanie instalacji" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Uwaga, wybieranie %s zamiast %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Pomijanie %s, jest ju zainstalowane, a nie zostao wybrana aktualizacja.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakiet %s nie jest zainstalowany, wic nie zostanie usunity.\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakiet %s jest pakietem wirtualnym zapewnianym przez:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Zainstalowany]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Naley jednoznacznie wybra jeden z nich do instalacji." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -950,50 +958,50 @@ msgstr "" "Zazwyczaj oznacza to, e pakietu brakuje, zosta zastpiony przez inny\n" "pakiet lub nie jest dostpny przy pomocy obecnie ustawionych rde.\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Jednak nastpujce pakiety go zastpuj:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakiet %s nie ma kandydata do instalacji" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Przeinstalowanie pakietu %s nie jest moliwe, nie moe on zosta pobrany.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s jest ju w najnowszej wersji.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Wydanie '%s' dla '%s' nie zostao znalezione" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Wersja '%s' dla '%s' nie zostaa znaleziona" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Wybrano wersj %s (%s) dla %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Polecenie update nie wymaga adnych argumentw" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Nie udao si zablokowa katalogu list" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1001,25 +1009,65 @@ msgstr "" "Nie udao si pobra niektrych plikw indeksu, zostay one zignorowane lub " "zostaa uyta ich starsza wersja." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Zostan zainstalowane nastpujce NOWE pakiety:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "Nastpujce informacje mog pomc rozpozna sytuacj:" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Bd wewntrzny, rozwizywanie problemw wszystko popsuo" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Bd wewntrzny, AllUpgrade wszystko popsuo" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Nie udao si odnale pakietu %s" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "Nie udao si odnale pakietu %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Uwaga, wybieranie %s za wyraenie '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "ale %s ma zosta zainstalowany" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Naley uruchomi `apt-get -f install', aby je naprawi:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1027,7 +1075,7 @@ msgstr "" "Niespenione zalenoci. Sprbuj 'apt-get -f install' bez pakietw (lub " "podaj rozwizanie)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1039,7 +1087,7 @@ msgstr "" "w ktrej niektre pakiety nie zostay jeszcze utworzone lub przeniesione\n" "z katalogu Incoming (\"Przychodzce\")." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1049,124 +1097,135 @@ msgstr "" "danego pakietu po prostu nie da si zainstalowa i naley zgosi w nim\n" "bd." -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Nastpujce informacje mog pomc rozpozna sytuacj:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "Pakiety s bdne" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "Zostan zainstalowane nastpujce dodatkowe pakiety:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "Sugerowane pakiety:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "Polecane pakiety:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "Obliczanie aktualizacji..." -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Nie udao si" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "Gotowe" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "Bd wewntrzny, rozwizywanie problemw wszystko popsuo" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "" "Naley poda przynajmniej jeden pakiet, dla ktrego maj zosta pobrane " "rda" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "Nie udao si odnale rda dla pakietu %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Pomijanie ju pobranego pliku '%s'\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "W %s nie ma wystarczajcej iloci wolnego miejsca" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Konieczne pobranie %sB/%sB archiww rde.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Konieczne pobranie %sB archiww rde.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "Pobierz rdo %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "Nie udao si pobra niektrych archiww." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pomijanie rozpakowania ju rozpakowanego rda w %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Polecenie rozpakowania '%s' zawiodo.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Sprawd czy pakiet 'dpkg-dev' jest zainstalowany.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "Polecenie budowania '%s' zawiodo.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "Proces potomny zawid" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "" "Naley poda przynajmniej jeden pakiet, dla ktrego maj zosta pakiety " "wymagane do budowania" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Nie udao si pobra informacji o zalenociach na czas budowania dla %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "%s nie ma zalenoci czasu budowania.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1175,7 +1234,7 @@ msgstr "" "Zaleno %s od %s nie moe zosta speniona, poniewa nie znaleziono " "pakietu %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1184,32 +1243,33 @@ msgstr "" "Zaleno %s od %s nie moe zosta speniona, poniewa adna z dostpnych " "wersji pakietu %s nie ma odpowiedniej wersji" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nie udao si speni zalenoci %s od %s: Zainstalowany pakiet %s jest zbyt " "nowy" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Nie udao si speni zalenoci %s od %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Nie udao si speni zalenoci na czas budowania od %s." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "Nie udao si przetworzy zalenoci na czas budowania" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "Obsugiwane moduy:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1224,6 +1284,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1389,188 +1450,188 @@ msgstr "b msgid "Merging available information" msgstr "czenie informacji o dostpnych pakietach" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Nie udao si utworzy potokw" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Nie udao uruchomi programu gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Uszkodzone archiwum" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Niepoprawna suma kontrolna tar, archiwum jest uszkodzone" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Nieznany typ nagwka TAR %u, skadnik %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Nieprawidowy podpis archiwum" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Bd przy czytaniu nagwka skadnika archiwum" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Nieprawidowy nagwek skadnika archiwum" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Archiwum jest za krtkie" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Nie udao si odczyta nagwkw archiwum" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode wywoane na wci podczonym wle" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Nie udao si odnale elementu hasha!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Nie udao si utworzy objazdu" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Bd wewntrzny w AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Prba nadpisania objazdu, %s -> %s i %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Podwjne dodanie objazdu %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Zduplikowany plik konfiguracyjny %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Nie udao si zapisa pliku %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Nie udao si zamkn pliku %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "cieka %s jest zbyt duga" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Wypakowanie %s wicej ni raz" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Objazd katalogu %s" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Pakiet prbuje pisa do celu objazdu %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Zbyt duga cieka objazdu" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Katalog %s zosta zastpiony obiektem nie bdcym katalogiem" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Nie udao si znale wza w jego kubeku haszujcym" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "cieka jest zbyt duga" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Dopasowanie dla %s nadpisujcego pakietu bez wersji" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Plik %s/%s nadpisuje plik w pakiecie %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Nie mona czyta %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Nie mona wykona operacji stat na %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Nie udao si usun %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Nie mona utworzy %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Nie udao si wykona operacji stat na %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "Pliki info i temp musz by na tym samym systemie plikw" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "Czytanie list pakietw" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Nie udao si przej do katalogu administracyjnego %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "Bd wewntrzny podczas pobierania nazwy pakietu" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Czytanie listy plikw" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1581,77 +1642,77 @@ msgstr "" "tego pliku, utwrz go jako pusty plik i bezzwocznie przeinstaluj t sam " "wersj pakietu!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Nie udao si przeczyta pliku listy %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Bd wewntrzny przy pobieraniu wza" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Nie udao si otworzy pliku objazdw %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Plik objazdw jest uszkodzony" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "Nieprawidowa linia w pliku objazdw: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Bd wewntrzny przy dodawaniu objazdu" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Magazyn podrczny pakietw musi wczeniej zosta zainicjalizowany" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Nie udao si znale nagwka Package:, offset %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Bdna sekcja ConfFile w pliku stanu. Offset %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Bd przy czytaniu skrtu MD5. Offset %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "To nie jest poprawne archiwum DEB, brakuje skadnika '%s'" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "To nie jest poprawne archiwum DEB, brakuje skadnika '%s' lub '%s'" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "Nie udao si przej do %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "Bd wewntrzny, nie udao si odnale skadnika" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "Nie udao si odnale poprawnego pliku control" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "Plik kontrolny nie moe zosta poprawnie zinterpretowany" @@ -1686,11 +1747,12 @@ msgid "File not found" msgstr "Nie odnaleziono pliku" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Nie udao si wykona operacji stat" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Nie udao si ustawi czasu modyfikacji" @@ -1753,7 +1815,7 @@ msgstr "Przekroczenie czasu po msgid "Server closed the connection" msgstr "Serwer zamkn poczenie" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "Bd odczytu" @@ -1765,7 +1827,7 @@ msgstr "Odpowied msgid "Protocol corruption" msgstr "Naruszenie zasad protokou" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "Bd zapisu" @@ -1819,7 +1881,7 @@ msgstr "Przekroczony czas po msgid "Unable to accept connection" msgstr "Nie udao si przyj poczenia" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Nie udao si obliczy skrtu pliku" @@ -1846,39 +1908,39 @@ msgstr "Info" msgid "Unable to invoke " msgstr "Nie mona wywoa " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Podczanie do %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Nie udao si utworzy gniazda dla %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Nie udao si zainicjalizowa poczenia z %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Nie udao si poczy z %s:%s (%s), przekroczenie czasu poczenia" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Nie udao si poczy z %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "czenie z %s" @@ -1954,428 +2016,448 @@ msgstr "Nie uda msgid "Read error from %s process" msgstr "Bd odczytu z procesu %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Oczekiwanie na nagwki" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Otrzymano pojedyncz lini nagwka o dugoci ponad %u znakw" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Nieprawidowa linia nagwka" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Serwer HTTP przysa nieprawidowy nagwek odpowiedzi" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Serwer HTTP przysa nieprawidowy nagwek Content-Length" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Serwer HTTP przysa nieprawidowy nagwek Content-Range" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Ten serwer HTTP nieprawidowo obsuguje zakresy (ranges)" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Nieznany format daty" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Operacja select nie powioda si" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Przekroczenie czasu poczenia" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Bd przy pisaniu do pliku wyjciowego" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Bd przy pisaniu do pliku" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Bd przy pisaniu do pliku" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Bd czytania z serwera: Zdalna strona zamkna poczenie" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Bd czytania z serwera" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Bdne dane nagwka" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Poczenie nie udao si" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Bd wewntrzny" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "Nie mona wykona mmap na pustym pliku" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Nie udao si wykona mmap %lu bajtw" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "Nie odnaleziono wyboru %s" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Nierozpoznany skrt typu: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "Otwieranie pliku konfiguracyjnego %s" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "Linia %d jest zbyt duga (max %d)" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Bd skadniowy %s:%u: Blok nie zaczyna si nazw." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Bd skadniowy %s:%u: Bdny znacznik" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Bd skadniowy %s:%u: Po wartoci wystpuj mieci" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Bd skadniowy %s:%u: Dyrektywy mog wystpowa tylko na poziomie najwyszym" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Bd skadniowy %s:%u: Zbyt wiele zagniedonych operacji include" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Bd skadniowy %s:%u: Wczony tutaj" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Bd skadniowy %s:%u: Nieobsugiwana dyrektywa '%s'" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Bd skadniowy %s:%u: mieci na kocu pliku" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Bd!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... Gotowe" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Opcja linii polece '%c' [z %s] jest nieznana." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "Niezrozumiaa opcja linii polece %s" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Opcja linii polece %s nie jest typu boolean" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Opcja %s wymaga argumentu." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Opcja %s: Specyfikacja elementu konfiguracji musi zawiera =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Opcja %s wymaga argumentu typu cakowitego, nie '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Opcja '%s' jest zbyt duga" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Znaczenie %s jest nieznane, sprbuj true albo false." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Nieprawidowa operacja %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Nie udao si wykona operacji stat na punkcie montowania %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Nie udao si przej do %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "Nie udao si wykona operacji stat na CDROM-ie" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Dla pliku blokady %s tylko do odczytu nie zostanie uyta blokada" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "Nie udao si otworzy pliku blokady %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Dla pliku blokady %s montowanego przez NFS nie zostanie uyta blokada" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "Nie udao si uzyska blokady %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Oczekiwano na proces %s, ale nie byo go" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Podproces %s spowodowa naruszenie segmentacji." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s zwrci kod bdu (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s zakoczy si niespodziewanie" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "Nie udao si otworzy pliku %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "naleao przeczyta jeszcze %lu, ale nic nie zostao" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "naleao zapisa jeszcze %lu, ale nie udao si to" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "Problem przy zamykaniu pliku" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "Problem przy usuwaniu pliku" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "Problem przy zapisywaniu pliku na dysk" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Pusty magazyn podrczny pakietw" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Magazyn podrczny pakietw jest uszkodzony" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Magazyn podrczny pakietw jest w niezgodnej wersji" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Ta wersja APT nie obsuguje systemu wersji '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Ten magazyn podrczny pakietw zosta zbudowany dla innej architektury" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Wymaga" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "PreWymaga" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Sugeruje" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Poleca" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Jest w konflikcie z" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Zastpuje" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Czyni zbdnym" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "wany" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "wymagany" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standardowy" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opcjonalny" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "dodatkowy" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "Budowanie drzewa zalenoci" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "Kandydujce wersje" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "Generowanie zalenoci" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "czenie informacji o dostpnych pakietach" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Nie udao si otworzy %s" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Nie udao si zapisa pliku %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Nie udao si zanalizowa pliku pakietu %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nie udao si zanalizowa pliku pakietu %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Nieprawidowa linia %lu w licie rde %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Nieprawidowa linia %lu w licie rde %s (dystrybucja)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Nieprawidowa linia %lu w licie rde %s (analiza URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Nieprawidowa linia %lu w licie rde %s (bezwzgldna dystrybucja)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Nieprawidowa linia %lu w licie rde %s (analiza dystrybucji)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Otwieranie %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Linia %u w licie rde %s jest zbyt duga." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Nieprawidowa linia %u w licie rde %s (typ)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ '%s' jest nieznany w linii %u listy rde %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Nieprawidowa linia %u w licie rde %s (identyfikator producenta)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2387,19 +2469,19 @@ msgstr "" "nic dobrego, ale jeli naprawd chcesz to zrobi, wcz opcj APT::Force-" "LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Plik indeksu typu '%s' nie jest obsugiwany" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Pakiet %s ma zosta przeinstalowany, ale nie mona znale jego archiwum." -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2407,183 +2489,198 @@ msgstr "" "Bd, pkgProblemResolver::Resolve zwrci bd, moe to by spowodowane " "\"zatrzymanymi\" pakietami." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "Nie udao si naprawi problemw, zatrzymano uszkodzone pakiety." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Brakuje katalogu list %spartial." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Brakuje katalogu archiww %spartial." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, fuzzy, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Pobieranie pliku %li z %li (%s pozostao)" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, fuzzy, c-format msgid "Retrieving file %li of %li" msgstr "Czytanie listy plikw" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Nie udao si odnale sterownika metody %s." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Metoda %s nie uruchomia si poprawnie." -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "W do napdu '%s' dysk o nazwie: '%s' i nacinij enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "System pakietw '%s' nie jest obsugiwany" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "Nie udao si okreli odpowiedniego typu systemu pakietw" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Nie udao si wykona operacji stat na pliku %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Naley dopisa jakie URI 'source' do pliku sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "Nie udao si otworzy lub zanalizowa zawartoci list pakietw." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "Naley uruchomi apt-get update aby naprawi te problemy." -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Nieprawidowy rekord w pliku ustawie, brak nagwka Package" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Nierozpoznany typ przypinania %s" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Brak (lub zerowy) priorytet przypicia" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Magazyn podrczny ma niezgodny system wersji" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Wystpi bd podczas przetwarzania %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Wystpi bd podczas przetwarzania %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Wystpi bd podczas przetwarzania %s (NewFileDesc1)" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Wystpi bd podczas przetwarzania %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Wystpi bd podczas przetwarzania %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Wystpi bd podczas przetwarzania %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Wystpi bd podczas przetwarzania %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Wystpi bd podczas przetwarzania %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Wystpi bd podczas przetwarzania %s (NewFileDesc2)" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Och, przekroczono liczb pakietw, ktr ten APT jest w stanie obsuy." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Och, przekroczono liczb wersji, ktr ten APT jest w stanie obsuy." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Och, przekroczono liczb opisw, ktr ten APT jest w stanie obsuy." + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Och, przekroczono liczb zalenoci, ktr ten APT jest w stanie obsuy." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Wystpi bd podczas przetwarzania %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Wystpi bd podczas przetwarzania %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Pakiet %s %s nie zosta odnaleziony podczas przetwarzania zalenoci plikw" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nie udao si wykona operacji stat na licie pakietw rdowych %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "Zbieranie zapewnie plikw" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "Bd wejcia/wyjcia przy zapisywaniu podrcznego magazynu rde" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "nie udao si zmieni nazwy, %s (%s -> %s)" -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Bdna suma MD5" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 #, fuzzy msgid "There is no public key available for the following key IDs:\n" msgstr "Dla nastpujcego identyfikatora klucza brakuje klucza publicznego:\n" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2592,7 +2689,7 @@ msgstr "" "Nie udao si odnale pliku dla pakietu %s. Moe to oznacza, e trzeba " "bdzie rcznie naprawi ten pakiet (z powodu brakujcej architektury)." -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2601,14 +2698,14 @@ msgstr "" "Nie udao si odnale pliku dla pakietu %s. Moe to oznacza, e trzeba " "bdzie rcznie naprawi ten pakiet." -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Pliki indeksu pakietw s uszkodzone. Brak pola Filename: dla pakietu %s." -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Bdny rozmiar" @@ -2617,7 +2714,7 @@ msgstr "B msgid "Vendor block %s contains no fingerprint" msgstr "Blok producenta %s nie zawiera odcisku" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2626,54 +2723,56 @@ msgstr "" "Wykorzystu %s jako punkt montowania CD-ROMu\n" "Montowanie CD-ROMu\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "Identyfikacja.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "Etykieta: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Wykorzystuj %s jako punkt montowania CD-ROMu\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "Odmontowanie CD-ROMu\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "Oczekiwanie na pyt...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "Montowanie CD-ROMu...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "Skawnowanie pyty w poszukiwaniu plikw indeksu..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "" "Znaleziono %i indeksw pakietw, %i indeksw rdowych, %i indeksw " "tumacze i %i sygnatur\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "Etykieta: %s \n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "To nie jest prawidowa nazwa, sprbuj ponownie.\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2682,93 +2781,97 @@ msgstr "" "Pyta nosi nazw: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Kopiowanie list pakietw..." -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Zapisywanie nowej listy rde\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "rda dla tej pyty to:\n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "Odmontowanie CD-ROMu..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Zapisano %i rekordw.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Zapisano %i rekordw z %i brakujcymi plikami.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Zapisano %i rekordw z %i niepasujcymi plikami\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Zapisano %i rekordw z %i brakujcymi plikami i %i niepasujcymi\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Przygotowanie %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Rozpakowywanie %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Przygotowanie do konfiguracji %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Konfigurowanie %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr " Zainstalowany %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Przygotowanie do usunicia %s" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Usuwanie %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "Usunito %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Przygotowanie do konfiguracji %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Nie udao si usun %s" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "Nie udao si naoy atki na plik" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Poczenie zostao zamknite przedwczenie" @@ -2787,22 +2890,3 @@ msgstr "Po #~ msgid "Removed with config %s" #~ msgstr "Usunito %s wraz z konfiguracj" - -#~ msgid "Total Distinct Descriptions: " -#~ msgstr "W sumie rnych opisw: " - -#~ msgid "Total Desc/File relations: " -#~ msgstr "W sumie zalenoci opis/plik: " - -#~ msgid "Error occured while processing %s (NewFileDesc1)" -#~ msgstr "Wystpi bd podczas przetwarzania %s (NewFileDesc1)" - -#~ msgid "Error occured while processing %s (NewFileDesc2)" -#~ msgstr "Wystpi bd podczas przetwarzania %s (NewFileDesc2)" - -#~ msgid "Wow, you exceeded the number of descriptions this APT is capable of." -#~ msgstr "" -#~ "Och, przekroczono liczb opisw, ktr ten APT jest w stanie obsuy." - -#~ msgid "Could not patch file" -#~ msgstr "Nie udao si naoy atki na plik" diff --git a/po/pt.po b/po/pt.po index 3f68b09b1..f88df0de3 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2007-05-09 22:14+0100\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" @@ -15,146 +15,156 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "O pacote %s versão %s tem uma dependência não satisfeita:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Impossível encontrar o pacote %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "Total de Nomes de Pacotes : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Pacotes Normais: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Pacotes Puramente Virtuais: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Pacotes Virtuais Únicos: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Pacotes Virtuais Misturados: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Faltam: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Total de Versões Distintas: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Total de Versões Distintas: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Total de Dependências: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Total de relações Ver/Ficheiro: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Total de relações Ver/Ficheiro: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Total de Mapeamentos Disponibilizados: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Total de Strings Globbed: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Total de espaço de Dependência de Versão: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Total de espaço Desperdiçado: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Total de Espaço Contabilizado: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "O ficheiro do pacote %s está dessincronizado." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Você deve dar exactamente um pattern" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Não foi encontrado nenhum pacote" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Ficheiros de Pacotes :" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "A cache está dessincronizada, não pode x-referenciar um ficheiro de pacote" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Pacotes Marcados: " -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(não encontrado)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Instalado: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(nenhum)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Candidato: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Marcação do Pacote: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Tabela de Versão:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado em %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -303,7 +313,7 @@ msgstr "" " -c=? Ler este arquivo de configuração\n" " -o=? Define uma opção arbitrária de configuração, ex: -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "Impossível escrever para %s" @@ -312,31 +322,31 @@ msgstr "Impossível escrever para %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Não foi possível obter a versão do debconf. O debconf está instalado?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Lista de extensão de pacotes é demasiado longa" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "Erro processando o directório %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Lista de extensão de fontes é demasiado longa" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Erro ao gravar cabeçalho no ficheiro de conteúdo" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Erro processando o ficheiro Contents %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -417,26 +427,26 @@ msgstr "" " -c=? Lê este ficheiro de configuração\n" " -o=? Define uma opção de configuração arbitrária" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Nenhuma selecção coincidiu" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Alguns ficheiros faltam no ficheiro de grupo de pacotes `%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "A base de dados estava corrompida, ficheiro renomeado para %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB é antiga, tentando uma actualização %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." @@ -444,106 +454,106 @@ msgstr "" "O formato DB é inválido. Se actualizou a partir de uma versão antiga do apt, " "por favor remova-a e recrie a base de dados." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Não foi possível abrir o ficheiro DB %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "Falha ao executar stat %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "O arquivo não tem registro de controle" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Não foi possível obter um cursor" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Não foi possível ler o directório %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Não foi possível fazer stat %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "E: Erros aplicam-se ao ficheiro " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "Falha ao resolver %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "Falhou ao percorrer a árvore" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "Falhou ao abrir %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "Falhou ao executar readlink %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "Falhou ao executar unlink %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Falhou ao ligar %s a %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Limite DeLink de %sB atingido.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Arquivo não possuía campo pacote" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s não possui entrada override\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " maintainer de %s é %s, não %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr " %s não possui fonte de entrada de 'override'\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s não possui de igual modo entrada binária de 'override'\n" @@ -557,165 +567,165 @@ msgstr "Erro Interno, não foi possível localizar o membro %s" msgid "realloc - Failed to allocate memory" msgstr "realloc - Falha ao alocar memória" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Impossível abrir %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Override malformado %s linha %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Override malformado %s linha %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Override malformado %s linha %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Falha ao ler o ficheiro override %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritmo de Compressão Desconhecido '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Saída compactada %s precisa de um conjunto de compressão" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Falha ao criar pipe IPC para subprocesso" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "Falha ao criar FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "Falha ao executar fork" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "Compactar Filho" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "Erro Interno, Falha ao criar %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "Falha ao criar subprocesso IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "Falha ao executar compressor " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "descompactador" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "IO para subprocesso/arquivo falhou" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "Falha ao ler durante o cálculo de MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "Problema ao executar unlinking %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Falha ao renomear %s para %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "Os pacotes a seguir têm dependências não satisfeitas:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "mas %s está instalado" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "mas %s está para ser instalado" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "mas não está instalável" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "mas é um pacote virtual" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "mas não está instalado" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "mas não vai ser instalado" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " ou" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "Os seguintes NOVOS pacotes serão instalados:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "Os seguintes pacotes serão REMOVIDOS:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "Os seguintes pacotes serão mantidos em suas versões actuais:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "Os seguintes pacotes serão actualizados:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "Aos seguintes pacotes será feito o DOWNGRADE :" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "Os seguintes pacotes mantidos serão mudados :" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (devido a %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -723,145 +733,145 @@ msgstr "" "AVISO: Os seguintes pacotes essenciais serão removidos.\n" "Isso NÃO deverá ser feito a menos que saiba exactamente o que está a fazer!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu a que foi feito o downgrade, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a remover e %lu não actualizados.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pacotes não totalmente instalados ou removidos.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Corrigindo dependências..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " falhou." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Impossível corrigir dependências" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Impossível minimizar o conjunto de actualizações" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Feito" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Você pode querer executar `apt-get -f install' para corrigir isso." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Dependências não satisfeitas. Tente utilizar -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO: Os seguintes pacotes não podem ser autenticados" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Aviso de autenticação ultrapassado.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Instalar estes pacotes sem verificação [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Alguns pacotes não puderam ser autenticados" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Há problemas e -y foi usado sem --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Erro Interno, Ordering não terminou" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "Impossível criar lock no directório de download" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "A lista de fontes não pôde ser lida." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Estranho.. Os tamanhos não coincidiram, escreva para apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "É necessário fazer o download de %sB/%sB de arquivos.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "É necessário fazer o download de %sB de arquivos.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" "Depois de descompactar, %sB adicionais de espaço em disco serão utilizados.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Depois de descompactar, %sB de espaço em disco serão libertados.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossível de determinar espaço livre em %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Você não possui espaço livre suficiente em %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only especificado mas essa não é uma operação trivial." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Sim, faça como eu digo!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -872,28 +882,28 @@ msgstr "" "Para continuar escreva a frase '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "Abortado." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Você deseja continuar [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falha ao obter %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Falhou o download de alguns ficheiros" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "Download completo e em modo de apenas download" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -901,47 +911,47 @@ msgstr "" "Impossível obter alguns arquivos, execute talvez apt-get update ou tente com " "--fix-missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing e troca de mídia não são suportados actualmente" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Impossível corrigir os pacotes em falta." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Abortando a Instalação." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, seleccionando %s em vez de %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Saltando %s, já está instalado e a actualização não está definida.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "O pacote %s não está instalado, então não será removido\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "O pacote %s é um pacote virtual disponibilizado por:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Instalado]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Você deve seleccionar explicitamente um para instalar." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -952,51 +962,51 @@ msgstr "" "Isso pode significar que o pacote falta, ficou obsoleto ou\n" "está disponível somente a partir de outra fonte\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "No entanto, os seguintes pacotes substituem-no:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "O pacote %s não tem candidato para instalação" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "A reinstalação de %s não é possível, o download do mesmo não pode ser " "feito.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s já é a versão mais recente.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' para '%s' não foi encontrado" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versão '%s' para '%s' não foi encontrada" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versão seleccionada %s (%s) para %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "O comando update não leva argumentos" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Impossível criar lock no directório de listas" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1004,25 +1014,65 @@ msgstr "" "Falhou o download de alguns ficheiros de índice, foram ignorados ou os " "antigos foram usados em seu lugar." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Os seguintes NOVOS pacotes serão instalados:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "A seguinte informação pode ajudar a resolver a situação:" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Erro Interno, o solucionador de problemas estragou coisas" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro Interno, AllUpgrade estragou algo" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Impossível encontrar o pacote %s" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "Impossível encontrar o pacote %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, seleccionando %s para a expressão regular '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "mas %s está para ser instalado" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Você deve querer executar `apt-get -f install' para corrigir isto:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1030,7 +1080,7 @@ msgstr "" "Dependências não satisfeitas. Tente `apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1042,7 +1092,7 @@ msgstr "" "distribuição instável, que alguns pacotes requisitados ainda não foram \n" "criados ou foram tirados do Incoming." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1053,123 +1103,134 @@ msgstr "" "de\n" "bug sobre esse pacote." -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "A seguinte informação pode ajudar a resolver a situação:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "Pacotes estragados" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "Os seguintes pacotes extra serão instalados:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "Pacotes sugeridos :" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "Pacotes recomendados :" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "Calculando Actualização... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Falhou" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "Pronto" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "Erro Interno, o solucionador de problemas estragou coisas" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "" "Deve-se especificar pelo menos um pacote para que se obtenha o código fonte" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossível encontrar um pacote de código fonte para %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saltando ficheiro do qual já havia sido feito download '%s'\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Preciso obter %sB/%sB de arquivos de código fonte.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Precisa obter %sB de arquivos de código fonte.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "Obter Código Fonte %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "Falha ao obter alguns arquivos." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Saltando a descompactação de pacote código fonte já descompactado em %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "O comando de descompactação '%s' falhou.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "O comando de compilação '%s' falhou.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "O processo filho falhou" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve especificar pelo menos um pacote para verificar as dependências de " "compilação" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossível obter informações de dependências de compilação para %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de compilação.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1178,7 +1239,7 @@ msgstr "" "a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não " "pôde ser encontrado" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1187,32 +1248,33 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque nenhuma versão " "disponível do pacote %s pode satisfazer os requisitos de versão" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falha ao satisfazer a dependência %s para %s: Pacote instalado %s é muito " "novo" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falha ao satisfazer a dependência %s para %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Não foi possível satisfazer as dependências de compilação para %s." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "Falha ao processar as dependências de compilação" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "Módulos Suportados:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1227,6 +1289,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1393,188 +1456,188 @@ msgstr "" msgid "Merging available information" msgstr "Juntando informação Disponível" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Falha ao criar pipes" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Falha ao executar gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Arquivo corrompido" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Checksum do arquivo tar falhou, arquivo corrompido" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Assinatura de arquivo inválida" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Erro na leitura de cabeçalho membro de arquivo" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Cabeçalho membro de arquivo inválido" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Arquivo é demasiado pequeno" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Falha ao ler os cabeçalhos do arquivo" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode chamado em nó ainda linkado" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Falha ao localizar o elemento de hash !" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Falha ao alocar desvio (diversion)" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Erro Interno em AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Tentando sobrescrever um desvio, %s -> %s e %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Adição dupla de desvio %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Arquivo de configuração duplicado %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Falha ao escrever ficheiro %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Falha ao fechar ficheiro %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "O caminho %s é demasiado longo" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Descompactando %s mais de uma vez" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "O directório %s é desviado" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "O pacote está a tentar gravar no alvo de desvio %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "O caminho de desvio é muito longo" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "O directório %s está sendo substituído por um não-directório" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Falha ao localizar nó no seu hash bucket" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "O caminho é demasiado longo" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Sobreescrita de pacote não coincide com nenhuma versão para %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Ficheiro %s/%s sobrescreve o que está no pacote %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Impossível ler %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Impossível executar stat %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Falha ao remover %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Impossível criar %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Impossível executar stat %sinfo." -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "Os directórios info e temp precisam estar no mesmo sistema de arquivos" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "A Ler Listas de Pacotes" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Falha ao mudar para o directório administrativo %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "Erro Interno obtendo um Nome de Pacote" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Lendo Listagem de Ficheiros" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1585,77 +1648,77 @@ msgstr "" "restaurar este ficheiro, crie outro vazio e re-instale a mesma versão do " "pacote !" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Falha ao ler o ficheiro de lista %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Erro Interno obtendo um Nó" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Falha ao abrir o ficheiro de desvios %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "O ficheiro de desvios está corrompido" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "Linha inválida no ficheiro de desvio: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Erro Interno ao adicionar um desvio" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "A cache de pacotes tem de ser inicializada primeiro" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Falha ao encontrar um Pacote: Cabeçalho, posição %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Secção ConfFile errada no ficheiro de estado. Offset %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Erro ao fazer parse ao MD5. Offset %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Este não é um arquivo DEB válido, falta o membro '%s'" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "Este não é um arquivo DEB válido, não tem '%s' ou o membro '%s'" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "Não foi possível mudar para %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "Erro Interno, não foi possível localizar membro" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "Falha em localizar um ficheiro de controle válido" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "Ficheiro de controle não interpretável" @@ -1690,11 +1753,12 @@ msgid "File not found" msgstr "Arquivo não encontrado" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Falha ao executar stat" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Falha ao definir hora de modificação" @@ -1756,7 +1820,7 @@ msgstr "Tempo limite de ligação atingido" msgid "Server closed the connection" msgstr "Servidor fechou a ligação" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "Erro de leitura" @@ -1768,7 +1832,7 @@ msgstr "Uma resposta sobrecarregou o buffer" msgid "Protocol corruption" msgstr "Corrupção de protocolo" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "Erro de escrita" @@ -1822,7 +1886,7 @@ msgstr "Ligação de socket de dados expirou" msgid "Unable to accept connection" msgstr "Impossível aceitar ligação" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema fazendo o hash do ficheiro" @@ -1849,39 +1913,39 @@ msgstr "Pesquisa" msgid "Unable to invoke " msgstr "Impossível invocar " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Ligando a %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Não foi possível criar um socket para %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Não posso iniciar a ligação para %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Não foi possível ligar a %s:%s (%s), a conexão expirou" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Não foi possível ligar em %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Ligando a %s" @@ -1960,429 +2024,449 @@ msgstr "Não foi possível abrir pipe para %s" msgid "Read error from %s process" msgstr "Erro de leitura do processo %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Aguardando por cabeçalhos" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Linha de cabeçalho errada" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "O servidor http enviou um cabeçalho de resposta inválido" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "O servidor http enviou um cabeçalho Conten-Length inválido" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "O servidor http enviou um cabeçalho Conten-Range inválido" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Este servidor http possui suporte a range errado" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Select falhou." -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "A ligação expirou" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Erro gravando para ficheiro de saída" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Erro gravando para ficheiro" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Erro gravando para o ficheiro" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor. O Remoto fechou a ligação" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Erro lendo do servidor" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Dados de cabeçalho errados" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Falhou a ligação" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Erro interno" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "Não é possível fazer mmap a um ficheiro vazio" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Impossível fazer mmap de %lu bytes" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "Selecção %s não encontrada" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Abreviatura de tipo desconhecida: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "Abrindo ficheiro de configuração %s" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "Linha %d é demasiado longa (max %d)" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Erro de sintaxe %s:%u: Bloco inicia sem nome." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Erro de sintaxe %s:%u: Tag Malformada" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Erro de sintaxe %s:%u: Lixo extra depois do valor" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Erro de sintaxe %s:%u: Directivas só podem ser feitas no nível mais alto" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Erro de sintaxe %s:%u: Muitos includes encadeados" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Erro de sintaxe %s:%u: Incluído a partir deste ponto" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Erro de sintaxe %s:%u: Directiva '%s' não suportada" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Erro de sintaxe %s:%u: Lixo extra no final do ficheiro" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Erro !" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... Pronto" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Opção de linha de comandos '%c' [de %s] é desconnhecida." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "Opção de linha de comandos %s não é compreendida" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Opção de linha de comandos %s não é booleana" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Opção %s requer um argumento." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" "Opção %s: Especificação de item de configuração deve possuir um =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Opção %s requer um argumento inteiro, não '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Opção '%s' é demasiado longa" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "O sentido %s não é compreendido, tente verdadeiro ou falso." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Operação %s inválida" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Impossível executar stat ao ponto de montagem %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Impossível mudar para %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "Impossível executar stat ao cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Não utilizando locking para ficheiro lock apenas de leitura %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "Não foi possível abrir ficheiro de lock %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Não usando locking para ficheiro de lock montado via nfs %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "Não foi possível obter lock %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperou, por %s mas não estava lá" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Sub-processo %s recebeu uma falha de segmentação." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Sub-processo %s retornou um código de erro (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Sub-processo %s finalizou inesperadamente" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "Não foi possível abrir ficheiro o %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "leitura, ainda restam %lu para serem lidos mas não resta nenhum" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "gravação, ainda restam %lu para gravar mas não foi possível" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "Problema ao fechar o ficheiro" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "Problema removendo o link ao ficheiro" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "Problema sincronizando o ficheiro" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Cache de pacotes vazia" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "O ficheiro de cache de pacotes está corrompido" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "O ficheiro de cache de pacotes é de uma versão incompatível" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Este APT não suporta o Sistema de Versões '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "A cache de pacotes foi gerada para uma arquitectura diferente" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Depende" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Pré-Depende" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Sugere" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Recomenda" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Em Conflito" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Substitui" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Obsoleta" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "requerido" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "padrão" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opcional" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "Construindo Árvore de Dependências" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "Versões Candidatas" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "Geração de Dependência" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "Juntando informação Disponível" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Falhou ao abrir %s" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Falha ao escrever ficheiro %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Impossível o parse ao ficheiro de pacote %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Impossível o parse ao ficheiro de pacote %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linha malformada %lu na lista de fontes %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linha malformada %lu na lista de fontes %s (distribuição)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linha malformada %lu na lista de fontes %s (parse de URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linha malformada %lu na lista de fontes %s (Distribuição absoluta)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Linha malformada %lu na lista de fontes %s (dist parse)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Abrindo %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Linha %u é demasiado longa na lista de fontes %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linha malformada %u na lista de fontes %s (tipo)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Linha malformada %u na lista de fontes %s (id de fornecedor)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2394,12 +2478,12 @@ msgstr "" "normalmente é mau, mas se você quer realmente fazer isso, active a opção " "APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Tipo do ficheiro de índice '%s' não é suportado" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2407,7 +2491,7 @@ msgstr "" "O pacote %s precisa ser reinstalado, mas não foi possível encontrar um " "repositório para o mesmo." -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2415,190 +2499,207 @@ msgstr "" "Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por " "pacotes mantidos (hold)." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "Impossível corrigir problemas, você manteve (hold) pacotes estragados." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Falta directório de listas %spartial." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Falta o directório de repositório %spartial." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "A obter o ficheiro %li de %li (%s restantes)" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "A obter o ficheiro %li·of·%li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "O driver do método %s não pôde ser encontrado." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Método %s não iniciou corretamente" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Por favor insira o disco denominado: '%s' no leitor '%s' e pressione enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Sistema de empacotamento '%s' não é suportado" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "" "Não foi possível determinar um tipo de sistema de empacotamento aplicável" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Impossível executar stat %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Você deve colocar alguns URIs 'source' no seu sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "" "As listas de pacotes ou o ficheiro de status não pôde ser analisado ou " "aberto." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "Você terá que executar apt-get update para corrigir estes problemas" -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Registro inválido no ficheiro de preferências, sem cabeçalho Pacote" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Não foi possível entender o tipo de marca %s" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Nenhuma prioridade (ou zero) especificada para marcação" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "A Cache possui um sistema de versões incompatível" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Um erro ocorreu ao processar %s (NovoPacote)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Um erro ocorreu ao processar %s (UsePacote1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Um erro ocorreu ao processar %s (UsePacote2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Um erro ocorreu ao processar %s (NovaVersão1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Um erro ocorreu ao processar %s (UsePacote3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Um erro ocorreu ao processar %s (NovaVersão2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Uau, você excedeu o número de nomes de pacotes que este APT é capaz de " "suportar." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Uau, você excedeu o número de versões que este APT é capaz de suportar." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"Uau, você excedeu o número de versões que este APT é capaz de suportar." + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Uau, você excedeu o número de dependências que este APT é capaz de suportar." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Um erro ocorreu ao processar %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Um erro ocorreu ao processar %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "O pacote %s %s não foi encontrado ao processar as dependências de ficheiros" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "Não foi possível executar stat à lista de pacotes de código fonte %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "Obtendo File Provides" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "Erro de I/O ao gravar a cache de código fonte" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "falhou renomear, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Não existe qualquer chave pública disponível para as seguintes IDs de " "chave:\n" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2608,7 +2709,7 @@ msgstr "" "que você precisa consertar manualmente este pacote. (devido a arquitectura " "não especificada)." -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2617,7 +2718,7 @@ msgstr "" "Não foi possível localizar arquivo para o pacote %s. Isto pode significar " "que você precisa consertar manualmente este pacote." -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2625,7 +2726,7 @@ msgstr "" "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " "para o pacote %s." -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Tamanho incorrecto" @@ -2634,7 +2735,7 @@ msgstr "Tamanho incorrecto" msgid "Vendor block %s contains no fingerprint" msgstr "O bloco de fabricante %s não contém a impressão digital" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2643,52 +2744,54 @@ msgstr "" "Utilizando o ponto de montagem do CD-ROM %s\n" "A montar o CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "A identificar.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "Label Guardada: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "A utilizar o mount point do CD-ROM %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "A desmontar o CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "A aguardar pelo disco...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "A montar o CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "A pesquisar os ficheiros de index do Disco..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "Encontrou %i indexes de pacotes, %indexes de source e %i assinaturas\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, c-format msgid "Found label '%s'\n" msgstr "Encontrada etiqueta '%s'\n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "Isso não é um nome válido, tente de novo.\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2697,94 +2800,98 @@ msgstr "" "Este Disco tem o nome: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "A copiar listas de pacotes..." -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "A escrever lista de novas source\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "As entradas de listas de Source para este Disco são:\n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 msgid "Unmounting CD-ROM...\n" msgstr "A desmontar o CD-ROM...\n" -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Escreveu %i registos.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Escreveu %i registos com %i ficheiros em falta.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Escreveu %i registos com %i ficheiros não coincidentes\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "Escreveu %i registos com %i ficheiros em falta e %i ficheiros não " "coincidentes\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "A preparar %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "A desempacotar %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "A preparar para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "A configurar %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "%s instalado" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "A preparar para remoção de %s" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "A remover %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "%s removido" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "A preparar para remover completamente %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "Remoção completa de %s" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "Não foi possível abrir ficheiro o %s" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Conexão encerrada prematuramente" @@ -2792,9 +2899,6 @@ msgstr "Conexão encerrada prematuramente" #~ msgid "File date has changed %s" #~ msgstr "Data do ficheiro mudou %s" -#~ msgid "Could not patch file" -#~ msgstr "Não foi possível abrir ficheiro o %s" - #~ msgid "Reading file list" #~ msgstr "Lendo Lista de Ficheiros" @@ -2819,9 +2923,6 @@ msgstr "Conexão encerrada prematuramente" #~ msgid "Error occured while processing %s (UsePackage2)" #~ msgstr "Um erro ocorreu ao processar %s (UsePacote2)" -#~ msgid "Error occured while processing %s (NewFileVer1)" -#~ msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)" - #~ msgid "Error occured while processing %s (NewVersion1)" #~ msgstr "Um erro ocorreu ao processar %s (NovaVersão1)" diff --git a/po/pt_BR.po b/po/pt_BR.po index a0e38072f..aab540c40 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2006-08-21 00:40-0300\n" "Last-Translator: Felipe Augusto van de Wiel (faw) \n" "Language-Team: l10n portuguese \n" @@ -15,145 +15,155 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "O pacote %s versão %s tem uma dependência desencontrada:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Impossível encontrar o pacote %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "Total de Nomes de Pacotes : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Pacotes normais: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Pacotes puramente virtuais: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Pacotes virtuais únicos: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Pacotes virtuais misturados: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Faltando: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Total de versões distintas: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Total de versões distintas: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Total de dependências: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Total de relações ver/arquivo: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Total de relações ver/arquivo: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Total de mapeamentos Provides: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Total de strings globbed: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Total de espaço de dependência de versão: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Total de espaço frouxo: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Total de espaço contabilizado: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "O arquivo de pacote %s está dessincronizado." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Você deve passar exatamente um padrão" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Nenhum pacote encontrado" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Arquivos de pacote:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "O cache está fora de sincronia, não posso x-ref um arquivo de pacote" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Pacotes pinados:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(não encontrado)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Instalado: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(nenhum)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Candidato: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Pin do pacote: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Tabela de versão:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado em %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -304,7 +314,7 @@ msgstr "" " -c=? Ler esse arquivo de configuração\n" " -o=? Define uma opção arbitrária de configuração, ex: -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "Impossível escrever para %s" @@ -313,31 +323,31 @@ msgstr "Impossível escrever para %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Não foi possível obter a versão do debconf. O debconf está instalado?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Lista de extensão de pacotes é muito extensa" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "Erro processando o diretório %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Lista de extensão de fontes é muito extensa" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Erro ao gravar cabeçalho no arquivo de conteúdo" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Erro processando conteúdo %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -418,26 +428,26 @@ msgstr "" " -c=? Lê este arquivo de configuração\n" " -o=? Define uma opção de configuração arbitrária" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Nenhuma seleção correspondente" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Alguns arquivos estão faltando no arquivo de grupo de pacotes `%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "BD estava corrompido, arquivo renomeado para %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "BD é antigo, tentando atualizar %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." @@ -445,106 +455,106 @@ msgstr "" "Formato do BD é inválido. Se você atualizou a partir de uma versão antiga do " "apt, por favor remova e recrie o banco de dados." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Impossível abrir arquivo BD %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "Falha ao checar %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Repositório não possui registro de controle" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Impossível obter um cursor" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Impossível ler o diretório %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Impossível checar %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "E: Erros aplicam ao arquivo " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "Falha ao resolver %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "Falha ao percorrer a árvore" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "Falha ao abrir %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "Falha ao executar readlink %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "Falha ao executar unlink %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Falha ao ligar %s a %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Limite DeLink de %sB atingido.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Repositório não possuía campo pacote" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s não possui entrada override\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " mantenedor de %s é %s, não %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr " %s não possui entrada source override\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s também não possui entrada binary override\n" @@ -558,165 +568,165 @@ msgstr "Erro interno, não foi possível localizar membro %s" msgid "realloc - Failed to allocate memory" msgstr "realloc - Falha ao alocar memória" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Impossível abrir %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Override malformado %s linha %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Override malformado %s linha %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Override malformado %s linha %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Falha ao ler o arquivo override %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritmo de compactação desconhecido '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Saída compactada %s precisa de um conjunto de compactação" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Falha ao criar pipe IPC para subprocesso" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "Falha ao criar FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "Falha oa executar fork" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "Compactar filho" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "Erro interno, falha ao criar %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "Falha ao criar subprocesso IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "Falha ao executar compressor " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "descompactador" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "IO para subprocesso/arquivo falhou" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "Falha ao ler durante o cálculo MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "Problema executando unlinking %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Falha ao renomear %s para %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "Os pacotes a seguir têm dependências desencontradas:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "mas %s está instalado" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "mas %s está para ser instalado" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "mas não está instalável" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "mas é um pacote virtual" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "mas não está instalado" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "mas não vai ser instalado" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " ou" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "Os NOVOS pacotes a seguir serão instalados:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "Os pacotes a seguir serão REMOVIDOS:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "Os pacotes a seguir serão mantidos em suas versões atuais:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "Os pacotes a seguir serão atualizados:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "Os pacotes a seguir serão REVERTIDOS:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "Os seguintes pacotes mantidos serão mudados:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (por causa de %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -725,144 +735,144 @@ msgstr "" "Isso NÃO deveria ser feito a menos que você saiba exatamente o que você está " "fazendo!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalados, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu desatualizados, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu a serem removidos e %lu não atualizados.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu pacotes não totalmente instalados ou removidos.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Corrigindo dependências..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " falhou." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Impossível corrigir dependências" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Impossível minimizar o conjunto de atualizações" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Pronto" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Você pode querer rodar `apt-get -f install' para corrigir isso." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Dependências desencontradas. Tente usar -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISO: Os pacotes a seguir não podem ser autenticados!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Aviso de autenticação sobrescrito.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Instalar estes pacotes sem verificação [s/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Alguns pacotes não puderam ser autenticados" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Há problemas e -y foi usado sem --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Erro interno, InstallPackages foi chamado com pacotes quebrados!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Pacotes precisam ser removidos mas a remoção está desabilitada." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Erro interno, Ordenação não finalizou" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "Impossível criar lock no diretório de download" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "A lista de fontes não pôde ser lida." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "Que estranho.. Os tamanhos não batem, informe apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "É preciso fazer o download de %sB/%sB de arquivos.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "É preciso fazer o download de %sB de arquivos.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" "Depois de desempacotar, %sB adicionais de espaço em disco serão usados.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Depois de desempacotar, %sB de espaço em disco serão liberados.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "Não foi possível determinar o espaço livre em %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Você não possui espaço suficiente em %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only especificado mas essa não é uma operação trivial." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Sim, faça o que eu digo!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -873,28 +883,28 @@ msgstr "" "Para continuar digite a frase '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "Abortar." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Quer continuar [S/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falha ao buscar %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Alguns arquivos falharam ao baixar" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "Baixar completo e no modo somente baixar (\"download only\")" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -902,48 +912,48 @@ msgstr "" "Impossível buscar alguns arquivos, talvez executar apt-get update ou tentar " "com --fix-missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing e troca de mídia não são suportados atualmente" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Impossível corrigir pacotes faltosos." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Abortando instalação." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, selecionando %s ao invés de %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Ignorando %s, já está instalado e a atualização não está configurada.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "O pacote %s não está instalado, então não será removido\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "O pacote %s é um pacote virtual provido por:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Instalado]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Você deve selecionar um explicitamente para instalar." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -954,49 +964,49 @@ msgstr "" "Isso pode significar que o pacote está faltando, ficou obsoleto ou\n" "está disponível somente a partir de outra fonte\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "No entanto, os pacotes a seguir o substituem:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "O pacote %s não tem candidato para instalação" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "A reinstalação de %s não é possível, não pode ser baixado.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s já é a versão mais nova.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' para '%s' não foi encontrada" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versão '%s' para '%s' não foi encontrada" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versão selecionada %s (%s) para %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "O comando update não leva argumentos" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Impossível criar lock no diretório de listas" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1004,25 +1014,65 @@ msgstr "" "Alguns arquivos de índice falharam para baixar, eles foram ignorados ou os " "antigos foram usados no lugar." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Os NOVOS pacotes a seguir serão instalados:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "A informação a seguir pode ajudar a resolver a situação:" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Erro interno, o solucionador de problemas quebrou coisas" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro interno, AllUpgrade quebrou as coisas" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Impossível achar pacote %s" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "Impossível achar pacote %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, selecionando %s para expressão regular '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "mas %s está para ser instalado" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Você deve querer executar `apt-get -f install' para corrigir isso:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1030,7 +1080,7 @@ msgstr "" "Dependências desencontradas. Tente `apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1042,7 +1092,7 @@ msgstr "" "distribuição instável, que alguns pacotes requeridos não foram\n" "criados ainda ou foram tirados do Incoming." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1052,121 +1102,132 @@ msgstr "" "esteja simplesmente não instalável e um relato de erro sobre esse\n" "pacotes deve ser enviado." -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "A informação a seguir pode ajudar a resolver a situação:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "Pacotes quebrados" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "Os pacotes extra a seguir serão instalados:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "Pacotes sugeridos:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "Pacotes recomendados:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "Calculando atualização... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Falhou" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "Pronto" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "Erro interno, o solucionador de problemas quebrou coisas" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossível encontrar um pacote fonte para %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Ignorando arquivo já obtido '%s'\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Preciso obter %sB/%sB de arquivos fonte.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Precisa obter %sB de arquivos fonte.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "Obter fonte %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "Falha ao buscar alguns arquivos." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ignorando desempacotamento de fonte já desempacotado em %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando de desempacotamento '%s' falhou.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando de construção '%s' falhou.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "Processo filho falhou" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve-se especificar pelo menos um pacote para que se cheque as dependências " "de construção" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossível conseguir informações de dependência de construção para %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de construção.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1175,7 +1236,7 @@ msgstr "" "a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não " "pôde ser encontrado" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1184,32 +1245,33 @@ msgstr "" "a dependência de %s por %s não pôde ser satisfeita porque nenhuma versão " "disponível do pacote %s pôde satisfazer os requerimentos de versão" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falha ao satisfazer a dependência de %s por %s: Pacote instalado %s é muito " "novo" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falha ao satisfazer dependência de %s por %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Não foi possível satisfazer as dependências de compilação para %s." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "Falha ao processar as dependências de construção" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "Módulos suportados:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1224,6 +1286,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1391,188 +1454,188 @@ msgstr "são importantes. Por favor, conserte-os e execute [I]nstalar novamente" msgid "Merging available information" msgstr "Mesclando informação disponível" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Falha ao criar pipes" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Falha ao executar gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Arquivo corrompido" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Checksum do arquivo tar falhou, arquivo corrompido" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Assinatura de arquivo inválida" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Erro na leitura de cabeçalho membro de arquivo" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Cabeçalho membro de arquivo inválido" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Arquivo é muito pequeno" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Falha ao ler os cabeçalhos do arquivo" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode chamado em nodo ainda ligado (linked)" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Falha ao localizar o elemento hash!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Falha ao alocar desvio (diversion)" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Erro interno em AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Tentando sobreescrever um desvio, %s -> %s e %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Adição dupla de desvio %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Arquivo de configuração duplicado %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Falha ao gravar arquivo %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Falha ao fechar arquivo %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "O caminho %s é muito longo" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Desempacotando %s mais de uma vez" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "O diretório %s é desviado (diverted)" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "O pacote está tentando gravar no alvo de desvio %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "O caminho de desvio é muito longo" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "O diretório %s está sendo substituído por um não-diretório" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Falha ao localizar nodo em seu hash bucket" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "O caminho é muito longo" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Sobreescrita de pacote não casa com nenhuma versão para %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Arquivo %s/%s sobreescreve arquivo no pacote %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Impossível ler %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Impossível checar %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Falha ao remover %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Impossível criar %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Falha ao checar %sinfo." -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "Os diretórios info e temp precisam estar no mesmo sistema de arquivos" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "Lendo lista de pacotes" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Falha ao mudar para o diretório administrativo %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "Erro interno obtendo um nome de pacote" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Lendo listagem de pacotes" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1583,78 +1646,78 @@ msgstr "" "restaurar esse arquivo, crie um outro arquivo vazio e reinstale a mesma " "versão do pacote!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Falha ao ler o arquivo de lista %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Erro interno obtendo um nodo" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Falha ao abrir o arquivo de desvios %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "O arquivo de desvios está corrompido" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "Linha inválida no arquivo de desvio: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Erro interno ao adicionar um desvio" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "O cache de pacotes deve ser inicializado primeiro" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Falha ao encontrar um Pacote: cabeçalho, posição %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Seção ConfFile ruim no arquivo de estado. Posição %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Erro interpretando MD5. Posição %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Este não é um arquivo DEB válido, membro '%s' faltando" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "" "Este não é um arquivo DEB válido, o mesmo não possui um membro '%s' ou '%s'" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "Não foi possível mudar para %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "Erro interno, não foi possível localizar membro" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "Falha em localizar um arquivo de controle válido" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "Arquivo de controle não interpretável" @@ -1689,11 +1752,12 @@ msgid "File not found" msgstr "Arquivo não encontrado" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Falha ao checar" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Falha ao definir hora de modificação" @@ -1755,7 +1819,7 @@ msgstr "Conexão expirou" msgid "Server closed the connection" msgstr "Servidor fechou a conexão" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "Erro de leitura" @@ -1767,7 +1831,7 @@ msgstr "Uma resposta sobrecarregou o buffer" msgid "Protocol corruption" msgstr "Corrupção de protocolo" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "Erro de gravação" @@ -1821,7 +1885,7 @@ msgstr "Conexão do socket de dados expirou" msgid "Unable to accept connection" msgstr "Impossível aceitar conexão" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema fazendo o hash do arquivo" @@ -1848,39 +1912,39 @@ msgstr "Pesquisa" msgid "Unable to invoke " msgstr "Impossível invocar " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Conectando em %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Não foi possível criar um socket para %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Não posso iniciar a conexão para %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Não foi possível conectar em %s:%s (%s), conexão expirou" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Não foi possível conectar em %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Conectando a %s" @@ -1959,430 +2023,450 @@ msgstr "Não foi possível abrir pipe para %s" msgid "Read error from %s process" msgstr "Erro de leitura do processo %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Aguardando por cabeçalhos" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Linha de cabeçalho ruim" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "O servidor HTTP enviou um cabeçalho Content-Length inválido" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "O servidor HTTP enviou um cabeçalho Content-Range inválido" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Este servidor HTTP possui suporte a range quebrado" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Seleção falhou" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Conexão expirou" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Erro gravando para arquivo de saída" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Erro gravando para arquivo" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Erro gravando para o arquivo" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Erro lendo do servidor" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Dados de cabeçalho ruins" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Conexão falhou" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Erro interno" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "Não foi possível fazer mmap de arquivo vazio" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Impossível fazer mmap de %lu bytes" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "Seleção %s não encontrada" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Abreviação de tipo desconhecida: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "Abrindo arquivo de configuração %s" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "Linha %d muito longa (máx. %d)" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Erro de sintaxe %s:%u: Bloco inicia sem nome." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Erro de sintaxe %s:%u: Tag mal formada" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Erro de sintaxe %s:%u: Lixo extra depois do valor" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Erro de sintaxe %s:%u: Diretivas podem ser feitas somente no nível mais alto" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Erro de sintaxe %s:%u: Muitos includes aninhados" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Erro de sintaxe %s:%u: Incluído a partir deste ponto" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Erro de sintaxe %s:%u: Diretiva '%s' não suportada" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Erro de sintaxe %s:%u: Lixo extra no final do arquivo" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Erro!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... Pronto" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Opção de linha de comando '%c' [de %s] é desconnhecida." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "Opção de linha de comando %s não é compreendida" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Opção de linha de comando %s não é booleana" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Opção %s requer um argumento." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" "Opção %s: Especificação de item de configuração deve possuir um =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Opção %s requer um argumento inteiro, não '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Opção '%s' é muito longa" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Sentido %s não é compreendido, tente verdadeiro ou falso." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Operação %s inválida" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Impossível checar o ponto de montagem %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Impossível mudar para %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "Impossível checar o cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Não usando locking para arquivo de trava somente leitura %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "Não foi possível abrir arquivo de trava %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Não usando locking para arquivo de trava montado via nfs %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "Não foi possível obter trava %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperado %s mas este não estava lá" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Sub-processo %s recebeu uma falha de segmentação." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Sub-processo %s retornou um código de erro (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Sub-processo %s finalizou inesperadamente" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "Não foi possível abrir arquivo %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "leitura, ainda restam %lu para serem lidos mas nenhum deixado" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "gravação, ainda restam %lu para gravar mas não foi possível" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "Problema fechando o arquivo" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "Problema removendo o link do arquivo" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "Problema sincronizando o arquivo" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Cache de pacotes vazio" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "O arquivo de cache de pacotes está corrompido" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "O arquivo de cache de pacotes é uma versão incompatível" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Este APT não suporta o sistema de versões '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "O cache de pacotes foi gerado para uma arquitetura diferente" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Depende" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Pré-Depende" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Sugere" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Recomenda" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Conflita" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Substitui" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Obsoleta" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "requerido" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "padrão" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opcional" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "Construindo árvore de dependências" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "Versões candidatas" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "Geração de dependência" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "Mesclando informação disponível" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Falha ao abrir %s" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Falha ao gravar arquivo %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Impossível analisar arquivo de pacote %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Impossível analisar arquivo de pacote %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linha mal formada %lu no arquivo de fontes %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linha mal formada %lu no arquivo de fontes %s (análise de URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição absoluta)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Abrindo %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Linha %u muito longa na lista de fontes %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linha mal formada %u no arquivo de fontes %s (tipo)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Linha mal formada %u na lista de fontes %s (id de fornecedor)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2394,12 +2478,12 @@ msgstr "" "é ruim, mas se você realmente quer fazer isso, ative a opção APT::Force-" "LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Tipo de arquivo de índice '%s' não é suportado" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2407,7 +2491,7 @@ msgstr "" "O pacote %s precisa ser reinstalado, mas não foi possível encontrar um " "arquivo para o mesmo." -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2415,188 +2499,205 @@ msgstr "" "Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por " "pacotes mantidos (hold)." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "Impossível corrigir problemas, você manteve (hold) pacotes quebrados." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Diretório de listas %spartial está faltando." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Diretório de repositório %spartial está faltando." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Obtendo o arquivo %li de %li (%s restantes)" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "Obtendo arquivo %li de %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "O driver do método %s não pôde ser encontrado." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Método %s não iniciou corretamente" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Por favor, insira o disco nomeado: '%s' no leitor '%s' e pressione enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Sistema de empacotamento '%s' não é suportado" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "" "Não foi possível determinar um tipo de sistema de empacotamento aplicável." -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Impossível checar %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Você deve colocar algumas URIs 'source' em seu sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "" "As listas de pacotes ou os arquivos de status não puderam ser analisados ou " "abertos." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "Você terá que executar apt-get update para corrigir esses problemas" -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Registro inválido no arquivo de preferências, sem cabeçalho Package" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Não foi possível entender o tipo de pin %s" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Nenhuma prioridade (ou zero) especificada para pin" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "O cache possui um sistema de versões incompatível" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Um erro ocorreu processando %s (NovoPacote)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Um erro ocorreu processando %s (UsePacote1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Um erro ocorreu processando %s (UsePacote2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Um erro ocorreu processando %s (NovaVersão1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Um erro ocorreu processando %s (UsePacote3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Um erro ocorreu processando %s (NovaVersão2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Uau, você excedeu o número de nomes de pacotes que este APT é capaz de " "suportar." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Uau, você excedeu o número de versões que este APT é capaz de suportar." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"Uau, você excedeu o número de versões que este APT é capaz de suportar." + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Uau, você excedeu o número de dependências que este APT é capaz de suportar." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Um erro ocorreu processando %s (EncontrarPacote)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Um erro ocorreu processando %s (ColetarArquivoProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Pacote %s %s não foi encontrado enquanto processando dependências de arquivo" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "Não foi possível checar a lista de pacotes fonte %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "Coletando Arquivo Provides" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "Erro de I/O ao gravar cache fonte" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "renomeação falhou, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "Não existem chaves públicas para os seguintes IDs de chaves:\n" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2606,7 +2707,7 @@ msgstr "" "que você precisa consertar manualmente este pacote. (devido a arquitetura " "não especificada)." -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2615,7 +2716,7 @@ msgstr "" "Não foi possível localizar arquivo para o pacote %s. Isto pode significar " "que você precisa consertar manualmente este pacote." -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2623,7 +2724,7 @@ msgstr "" "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " "para o pacote %s." -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Tamanho incorreto" @@ -2632,7 +2733,7 @@ msgstr "Tamanho incorreto" msgid "Vendor block %s contains no fingerprint" msgstr "Bloco Fornecedor %s não contém impressão digital (\"fingerprint\"" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2641,54 +2742,56 @@ msgstr "" "Usando ponto de montagem de CD-ROM %s\n" "Montando CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "Identificando.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "Rótulo armazenado: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Usando ponto de montagem de CD-ROM %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "Desmontando CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "Aguardando por disco...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "Montando CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "Procurando por arquivos de índice no disco..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "" "Encontrado(s) %i índice(s) de pacote(s), %i índice(s) de fonte(s) e %i " "assinaturas\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "Rótulo armazenado: %s \n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "Este não é um nome válido, tente novamente.\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2697,95 +2800,99 @@ msgstr "" "Esse disco é chamado: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Copiando lista de pacotes..." -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Gravando nova lista de fontes\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Entradas na lista de fontes para este disco são:\n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "Desmontando CD-ROM..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Gravados %i registros.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Gravados %i registros com %i arquivos faltando.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Gravados %i registros com %i arquivos que não combinam\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "Gravados %i registros com %i arquivos faltando e %i arquivos que não " "combinam\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Preparando %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Desempacotando %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Preparando para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Configurando %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "%s instalado" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Preparando para a remoção de %s" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Removendo %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "%s removido" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparando para remover completamente %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "%s completamente removido" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "Não foi possível aplicar o patch" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Conexão encerrada prematuramente" @@ -2793,9 +2900,6 @@ msgstr "Conexão encerrada prematuramente" #~ msgid "Total package names: " #~ msgstr "Total de nomes de pacotes: " -#~ msgid "Could not patch file" -#~ msgstr "Não foi possível aplicar o patch" - #~ msgid "File date has changed %s" #~ msgstr "Data do arquivo mudou %s" diff --git a/po/ro.po b/po/ro.po index 42c1e02af..66b75e2fa 100644 --- a/po/ro.po +++ b/po/ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_ro\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2006-09-19 01:35+0300\n" "Last-Translator: Sorin Batariuc \n" "Language-Team: Romanian \n" @@ -16,145 +16,155 @@ msgstr "" "X-Generator: KBabel 1.11.2\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Pachetul %s versiunea %s are o dependenţă neîndeplinită:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Nu pot localiza pachetul %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "Total nume pachete : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Pachete normale: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Pachete virtuale pure: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Pachete virtuale singulare: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Pachete virtuale mixte: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Lipsă: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Total versiuni distincte: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Total versiuni distincte: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Total dependenţe: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Total relaţii versiune/fişier: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Total relaţii versiune/fişier: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Total cartări Furnizează: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Total şiruri înglobate: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Total spaţiu versiuni ale dependenţelor: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Total spaţiu intern: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Total spaţiu contorizat pentru: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Fişierul pachetului %s este desincronizat." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Trebuie să daţi exact un şablon" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Nu s-au găsit pachete" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Fişiere pachet: " -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cache este desincronizat, nu pot executa x-ref un fişier pachet" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Pachete alese special:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(negăsit)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Instalat: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(niciunul)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Candidează: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Pachet ales special: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Tabela de versiuni:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pentru %s %s compilat pe %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -303,7 +313,7 @@ msgstr "" " -c=? Citeşte acest fişier de configurare\n" " -o=? Ajustează o opţiune de configurare arbitrară, ex. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "Nu pot scrie în %s" @@ -312,31 +322,31 @@ msgstr "Nu pot scrie în %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nu pot citi versiunea debconf. Este instalat debconf?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Lista de extensii pentru pachet este prea lungă" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "Eroare la prelucrarea directorului %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Lista de extensii pentru sursă este prea lungă" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Eroare la scrierea antetului în fişierul index" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Eroare la prelucrarea conţinutului %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -424,26 +434,26 @@ msgstr "" " -c=? Citeşte acest fişier de configurare\n" " -o=? Ajustează o opţiune de configurare arbitrară" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Nu s-a potrivit nici o selecţie" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Unele fişiere lipsesc din grupul fişierului pachet '%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB a fost corupt, fişierul a fost redenumit %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB este vechi, se încearcă înnoirea %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." @@ -451,106 +461,106 @@ msgstr "" "Formatul DB este nevalid. Dacă l-aţi înnoit pe apt de la o versiune mai " "veche, ştergeţi şi recreaţi baza de date." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Nu pot deschide fişierul DB %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "Eşuare în determinarea stării %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Arhiva nu are înregistrare de control" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Nu pot obţine un cursor" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "A: Nu pot citi directorul %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "A: Nu pot determina starea %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "A: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "E: Erori la fişierul " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "Eşuare în a rezolva %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "Eşuare în parcurgerea arborelui" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "Eşuare la deschiderea %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr " Dezlegare %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "Eşuare la citirea legăturii %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "Eşuare în desfacerea legăturii %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Eşuare în legarea %s de %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Limita de %sB a dezlegării a fost atinsă.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Arhiva nu are câmp de pachet" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s nu are intrare de înlocuire\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s responsabil este %s nu %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr " %s nu are nici o intrare sursă de înlocuire\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nu are nici intrare binară de înlocuire\n" @@ -564,165 +574,165 @@ msgstr "Eroare internă, nu pot localiza membrul %s" msgid "realloc - Failed to allocate memory" msgstr "realloc - Eşuare în alocarea memoriei" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Nu pot deschide %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Înlocuire greşită %s linia %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Înlocuire greşită %s linia %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Înlocuire greşită %s linia %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Eşuare la citirea fişierului de înlocuire %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Algoritm de compresie necunoscut '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Rezultatul comprimat %s are nevoie de o ajustare a compresiei" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Eşuare în crearea conexiunii IPC către subproces" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "Eşuare în crearea FIŞIERULUI*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "Eşuare în bifurcare" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "Comprimare copil" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "Eroare internă, eşuare în a crea %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "Eşuare în a crea subprocesul IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "Eşuare în executarea compresorului" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "decompresor" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "IE către subproces/fişier eşuat" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "Eşuare la citire în timpul calculării MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "Problemă la desfacerea %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Eşuare în a redenumi %s în %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "Eroare de compilare expresie regulată - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "Următoarele pachete au dependenţe neîndeplinite:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "dar %s este instalat" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "dar %s este pe cale de a fi instalat" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "dar nu este instalabil" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "dar este un pachet virtual" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "dar nu este instalat" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "dar nu este pe cale să fie instalat" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " sau" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "Următoarele pachete NOI vor fi instalate:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "Următoarele pachete vor fi ŞTERSE:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "Următoarele pachete au fost reţinute:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "Următoarele pachete vor fi ÎNNOITE:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "Următoarele pachete vor fi DE-GRADATE:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "Următoarele pachete ţinute vor fi schimbate:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (datorită %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -730,145 +740,145 @@ msgstr "" "AVERTISMENT: Următoarele pachete esenţiale vor fi şterse.\n" "Aceasta NU ar trebui făcută decât dacă ştiţi exact ce vreţi!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu înnoite, %lu nou instalate, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalate, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu de-gradate, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu de şters şi %lu neînnoite.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu instalate sau şterse incomplet.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Corectez dependenţele..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " eşuare." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Nu pot corecta dependenţele" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Nu pot micşora mulţimea pachetelor de înnoire" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Terminat" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Aţi putea să porniţi 'apt-get -f install' pentru a corecta acestea." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Dependenţe neîndeplinite. Încercaţi să folosiţi -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Avertisment de autentificare înlocuit.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Instalaţi aceste pachete fără verificare [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Unele pachete n-au putut fi autentificate" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Sunt unele probleme şi -y a fost folosit fără --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Pachete trebuiesc şterse dar ştergerea este dezactivată." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Eroare internă, Ordering nu s-a terminat" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "Nu pot încuia directorul de descărcare" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Lista surselor nu poate fi citită." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Ce ciudat.. Dimensiunile nu se potrivesc, scrieţi la apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Este nevoie să descărcaţi %sB/%sB de arhive.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Este nevoie să descărcaţi %sB de arhive.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "După despachetare va fi folosit %sB de spaţiu suplimentar pe disc.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "După despachetare va fi eliberat %sB din spaţiul de pe disc.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "N-am putut determina spaţiul disponibil în %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Nu aveţi suficient spaţiu în %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "A fost specificat 'doar neimportant' dar nu este o operaţiune neimportantă." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Da, fă cum îţi spun!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -879,28 +889,28 @@ msgstr "" "Pentru a continua tastaţi fraza '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "Renunţare." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Vreţi să continuaţi [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Eşuare în aducerea %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Eşuare în descărcarea unor fişiere" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "Descărcare completă şi în modul doar descărcare" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -908,47 +918,47 @@ msgstr "" "Nu pot aduce unele arhive, poate porniţi 'apt-get update' sau încercaţi cu --" "fix-missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing şi schimbul de mediu nu este deocamdată suportat" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Nu pot corecta pachetele lipsă." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Abandonez instalarea." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Notă, se selectează %s în locul lui %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Sar peste %s, este deja instalat şi înnoirea nu este activată.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pachetul %s nu este instalat, aşa încât nu este şters\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pachetul %s este un pachet virtual furnizat de către:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Instalat]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Ar trebui să alegeţi în mod explicit unul pentru instalare." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -959,49 +969,49 @@ msgstr "" "Aceasta ar putea însemna că pachetul lipseşte, s-a învechit, sau\n" "este disponibil numai din altă sursă\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Oricum următoarele pachete îl înlocuiesc:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Pachetul %s nu are nici un candidat la instalare" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Reinstalarea lui %s nu este posibilă, nu poate fi descărcat.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s este deja la cea mai nouă versiune.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' pentru '%s' n-a fost găsită" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versiunea '%s' pentru '%s' n-a fost găsită" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versiune selectată %s (%s) pentru %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Comanda de actualizare nu are argumente" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Nu pot încuia directorul cu lista" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1009,25 +1019,66 @@ msgstr "" "Unele fişiere index au eşuat la descărcare, fie au fost ignorate, fie au " "fost folosite în loc unele vechi." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Următoarele pachete NOI vor fi instalate:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "Următoarele informaţii ar putea să vă ajute la rezolvarea situaţiei:" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "" +"Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Nu pot găsi pachetul %s" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "Nu pot găsi pachetul %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Notă, selectare %s pentru expresie regulată '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "dar %s este pe cale de a fi instalat" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Aţi putea porni 'apt-get -f install' pentru a corecta acestea:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1035,7 +1086,7 @@ msgstr "" "Dependenţe neîndeplinite. Încercaţi 'apt-get -f install' fără nici un pachet " "(sau oferiţi o altă soluţie)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1048,7 +1099,7 @@ msgstr "" "pachete\n" "cerute n-au fost create încă sau au fost mutate din Incoming." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1058,122 +1109,133 @@ msgstr "" " că pachetul pur şi simplu nu este instalabil şi un raport de eroare pentru\n" "acest pachet ar trebui completat." -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Următoarele informaţii ar putea să vă ajute la rezolvarea situaţiei:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "Pachete deteriorate" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "Următoarele extra pachete vor fi instalate:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "Pachete sugerate:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "Pachete recomandate:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "Calculez înnoirea... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Eşuare" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "Terminat" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "" "Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "Trebuie specificat cel puţin un pachet pentru a-i aduce sursa" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "Nu pot găsi o sursă pachet pentru %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Sar peste fişierul deja descărcat '%s'\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "Nu aveţi suficient spaţiu în %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Este nevoie să descărcaţi %sB/%sB din arhivele surselor.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Este nevoie să descărcaţi %sB din arhivele surselor.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "Aducere sursa %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "Eşuare în a aduce unele arhive." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Sar peste despachetarea sursei deja despachetate în %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comanda de despachetare '%s' eşuată.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verificaţi dacă pachetul 'dpkg-dev' este instalat.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comanda de construire '%s' eşuată.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "Eşuare proces copil" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "" "Trebuie specificat cel puţin un pachet pentru a-i verifica dependenţele " "înglobate" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nu pot prelua informaţiile despre dependenţele înglobate ale lui %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "%s nu are dependenţe înglobate.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1182,7 +1244,7 @@ msgstr "" "Dependenţa lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu " "poate fi găsit" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1191,32 +1253,33 @@ msgstr "" "Dependenţa lui %s de %s nu poate fi satisfăcută deoarece nici o versiune " "disponibilă a pachetului %s nu poate satisface versiunile cerute" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Eşuare în a satisface dependenţa lui %s de %s: Pachetul instalat %s este " "prea nou" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Eşuare în a satisface dependenţa lui %s de %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Dependenţele înglobate pentru %s nu pot fi satisfăcute." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "Eşuare în a prelucra dependenţele înglobate" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "Module suportate:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1231,6 +1294,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1398,190 +1462,190 @@ msgstr "" msgid "Merging available information" msgstr "Unirea informaţiilor disponibile" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Eşuare în crearea conexiunilor" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Eşuare în executarea gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Arhivă deteriorată" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Eşuarea sumei de control în arhiva tar, arhivă deteriorată" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Tip antet TAR %u necunoscut, membru %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Semnătură de arhivă necorespunzătoare" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Eroare la citirea antetului membru al arhivei" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Antet membru de arhivă necorespunzător" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Arhiva este prea scurtă" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Eşuare la citirea antetelor de arhivă" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "Chemat DropNode pe un nod încă legat" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Eşuare în localizarea elementului hash!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Eşuare în alocarea diversiunii" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Eroare internă în adăugare diversiune" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Încercare de suprascriere diversiune, %s -> %s şi %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Adăugare dublă de diversiune %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Fişier de configurare duplicat %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Eşuare în scrierea fişierului %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Eşuare în a închide fişierul %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Calea %s este prea lungă" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Despachetarea %s de mai multe ori" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Directorul %s este distras" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Pachetul încearcă să scrie în ţinta de diversiune %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Calea de diversiune este prea lungă" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Directorul %s este înlocuit de un non-director" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Eşuare în localizarea nodului din tranşa hash" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Calea este prea lungă" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Pachetul suprascris nu se potriveşte cu nici o versiune pentru %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Fişierul %s/%s suprascrie pe cel din pachetul %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Nu pot citi %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Nu pot determina starea %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Eşuare în ştergerea %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Nu pot crea %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Eşuare în a determina starea %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "" "Directoarele de informaţii şi temporare trebuie să fie în acelaşi sistem de " "fişiere" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "Citire liste de pachete" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Eşuare în a schimba către directorul %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "Eroare internă la preluarea numelui de pachet" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Citire derulare fişier" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1592,77 +1656,77 @@ msgstr "" "acest fişier atunci goliţi-l şi imediat reinstalaţi aceeaşi versiune a " "pachetului!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Eşuare la citirea fişierului listă %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Eroare internă la preluarea unui nod" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Eşuare la deschiderea fişierului de diversiuni %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Fişierul diversiune este deteriorat" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "Linie necorespunzătoare în fişierul diversiune: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Eroare internă în timpul adăugării unei diversiuni" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Cache-ul pachetului trebuie întâi iniţializat" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Eşuare în a găsi un pachet: antet, ofset %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Secţiune necorespunzătoare ConfFile în fişierul de stare. Offset %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Eroare la analiza MD5. Offset %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Aceasta nu este o arhivă DEB validă, lipseşte membrul '%s'" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "Aceasta nu este o arhivă DEB validă, nu are membrul '%s' sau '%s'" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "Nu pot schimba la %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "Eroare internă, nu pot localiza membrul" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "Eşuare de localizare a unui fişier de control valid" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "Fişier de control neanalizabil" @@ -1697,11 +1761,12 @@ msgid "File not found" msgstr "Fişier negăsit" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Eşuare de determinare a stării" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Eşuare la ajustarea timpului" @@ -1763,7 +1828,7 @@ msgstr "Timpul de conectare a expirat" msgid "Server closed the connection" msgstr "Serverul a terminat conexiunea" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "Eroare de citire" @@ -1775,7 +1840,7 @@ msgstr "Un răspuns a inundat zona tampon." msgid "Protocol corruption" msgstr "Degradare protocol" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "Eroare de scriere" @@ -1829,7 +1894,7 @@ msgstr "Timp de conectare data socket expirat" msgid "Unable to accept connection" msgstr "Nu pot accepta conexiune" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problemă la indexarea fişierului" @@ -1856,39 +1921,39 @@ msgstr "Interogare" msgid "Unable to invoke " msgstr "Nu pot invoca" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Conectare la %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Nu pot crea un socket pentru %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Nu pot iniţia conectarea la %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "N-am putut conecta la %s:%s (%s), timp de conectare expirat" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "N-am putut conecta la %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Conectare la %s" @@ -1965,430 +2030,450 @@ msgstr "Nu pot deschide conexiunea pentru %s" msgid "Read error from %s process" msgstr "Eroare de citire din procesul %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "În aşteptarea antetelor" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Primit o singură linie de antet peste %u caractere" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Linie de antet necorespunzătoare" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Serverul http a trimis un antet de răspuns necorespunzător" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Serverul http a trimis un antet lungime-conţinut necorespunzător" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Serverul http a trimis un antet zonă de conţinut necorespunzător" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Acest server http are zonă de suport necorespunzătoare" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Format de date necunoscut" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Eşuarea selecţiei" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Timp de conectare expirat" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Eroare la scrierea fişierului de rezultat" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Eroare la scrierea în fişier" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Eroare la scrierea în fişierul" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "" "Eroare la citirea de pe server, conexiunea a fost închisă de la distanţă" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Eroare la citirea de pe server" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Antet de date necorespunzător" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Conectare eşuată" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Eroare internă" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "Nu pot mmap un fişier gol" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Nu pot face mmap la %lu bytes" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "Selecţia %s nu s-a găsit" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Tip de prescurtare nerecunoscut: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "Deschidere fişier de configurare %s" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "Linie %d prea lungă (max %d)" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Eroare de sintaxă %s:%u: Blocul începe fără nume" -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Eroare de sintaxă %s:%u: etichetă greşită" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Eroare de sintaxă %s:%u: mizerii suplimentare după valoare" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Eroare de sintaxă %s:%u: directivele pot fi date doar la nivelul superior" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Eroare de sintaxă %s:%u: prea multe imbricări incluse" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Eroare de sintaxă %s:%u: incluse de aici" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Eroare de sintaxă %s:%u: directivă nesuportată '%s'" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Eroare de sintaxă %s:%u: mizerii suplimentare la sfârşitul fişierului" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Eroare!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... Terminat" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Opţiunea linie de comandă '%c' [din %s] este necunoscută." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "Opţiunea linie de comandă %s nu este înţeleasă" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Opţiunea linie de comandă %s nu este booleană" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Opţiunea %s necesită un argument" -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" "Opţiunea %s: Specificaţia configurării articolului trebuie să aibă o =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Opţiunea %s necesită un argument integru, nu '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Opţiunea '%s' este prea lungă" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Sensul %s nu este înţeles, încercaţi adevărat (true) sau fals (false)." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Operaţiune invalidă %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Nu pot determina starea punctului de montare %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Nu pot schimba la %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "Eşuare la determinarea stării cdrom-ului" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Nu s-a folosit închiderea pentru fişierul disponibil doar-citire %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "Nu pot deschide fişierul blocat %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nu este folosit blocajul pentru fişierul montat nfs %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "Nu pot determina blocajul %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Aşteptat %s, dar n-a fost acolo" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Subprocesul %s a primit o eroare de segmentare." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Subprocesul %s a întors un cod de eroare (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Subprocesul %s s-a terminat brusc" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "Nu pot deschide fişierul %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "citire, încă mai am %lu de citit dar n-a mai rămas nimic" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "scriere, încă mai am %lu de scris dar nu pot" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "Problemă la închiderea fişierului" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "Problemă la dezlegarea fişierului" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "Problemă în timpul sincronizării fişierului" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Cache gol de pachet" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Cache-ul fişierului pachet este deteriorat" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Fişierul cache al pachetului este o versiune incompatibilă" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Acest APT nu suportă versioning system '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Cache-ul pachetului a fost construit pentru o arhitectură diferită" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Depinde" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Pre-depinde" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Sugerează" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Recomandă" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Este în conflict" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Înlocuieşte" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Învechit" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "important" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "cerut" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "opţional" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "Se construieşte arborele de dependenţă" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "Versiuni candidat" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "Generare dependenţe" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "Unirea informaţiilor disponibile" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Eşuare la deschiderea %s" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Eşuare în scrierea fişierului %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Nu pot analiza fişierul pachet %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nu pot analiza fişierul pachet %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linie greşită %lu în lista sursă %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linie greşită %lu în lista sursă %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linie greşită %lu în lista sursă %s (analiza URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linie greşită %lu în lista sursă %s (dist. absolută)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Linie greşită %lu în lista sursă %s (analiza dist.)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Deschidere %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Linia %u prea lungă în lista sursă %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linie greşită %u în lista sursă %s (tip)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Linie greşită %u în lista sursă %s (identificator vânzător)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2400,19 +2485,19 @@ msgstr "" "nu-i de bine, dar dacă vreţi întradevăr s-o faceţi, activaţi opţiunea APT::" "Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Tipul de fişier index '%s' nu este suportat" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el." -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2420,190 +2505,207 @@ msgstr "" "Eroare, pkgProblemResolver::Resolve a generat întreruperi, aceasta poate fi " "cauzată de pachete ţinute." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "Nu pot corecta problema, aţi ţinut pachete deteriorate." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Directorul de liste %spartial lipseşte." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Directorul de arhive %spartial lipseşte." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Se descarcă fişierul %li din %li (%s rămas)" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "Se descarcă fişierul %li din %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Metoda driver %s nu poate fi găsită." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Metoda %s nu s-a lansat corect" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Vă rog introduceţi discul numit: '%s' în unitatea '%s' şi apăsaţi Enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Sistemul de pachete '%s' nu este suportat" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "Nu pot determina un tip de sistem de pachete potrivit" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Nu pot determina starea %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Trebuie să puneţi nişte 'surse' de URI în sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Listele de pachete sau fişierul de stare n-au putut fi analizate sau " "deschise." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Aţi putea vrea să porniţi 'apt-get update' pentru a corecta aceste probleme." -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Înregistrare invalidă în fişierul de preferinţe, fără antet de pachet" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Nu s-a înţeles tipul de pin %s" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Fără prioritate (sau zero) specificată pentru pin" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Cache are un versioning system incompatibil" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Eroare apărută în timpul procesării %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Eroare apărută în timpul procesării %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Eroare apărută în timpul procesării %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Eroare apărută în timpul procesării %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Eroare apărută în timpul procesării %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Eroare apărută în timpul procesării %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Eroare apărută în timpul procesării %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Eroare apărută în timpul procesării %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Eroare apărută în timpul procesării %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Mamăăă, aţi depăşit numărul de nume de pachete de care este capabil acest " "APT." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" "Mamăăă, aţi depăşit numărul de versiuni de care este capabil acest APT." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" +"Mamăăă, aţi depăşit numărul de versiuni de care este capabil acest APT." + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Mamăăă, aţi depăşit numărul de dependenţe de care este capabil acest APT." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Eroare apărută în timpul procesării %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Eroare apărută în timpul procesării %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Nu s-a găsit pachetul %s %s în timpul procesării dependenţelor de fişiere" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nu pot determina starea listei surse de pachete %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "Colectare furnizori fişier" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "Eroare IO în timpul salvării sursei cache" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "redenumire eşuată, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Nepotrivire MD5Sum" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Nu există nici o cheie publică disponibilă pentru următoarele " "identificatoare de chei:\n" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2612,7 +2714,7 @@ msgstr "" "N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna " "că aveţi nevoie să reparaţi manual acest pachet (din pricina unui arch lipsă)" -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2621,7 +2723,7 @@ msgstr "" "N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna " "că aveţi nevoie să depanaţi manual acest pachet." -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2629,7 +2731,7 @@ msgstr "" "Fişierele index de pachete sunt deteriorate. Fără câmpul 'nume fişier:' la " "pachetul %s." -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Nepotrivire dimensiune" @@ -2638,7 +2740,7 @@ msgstr "Nepotrivire dimensiune" msgid "Vendor block %s contains no fingerprint" msgstr "Blocul vânzător %s nu conţine amprentă" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2647,52 +2749,54 @@ msgstr "" "Utilizare puct de montare CD-ROM %s\n" "Montare CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "Identificare.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "Etichetă memorată: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Utilizare punct de montare CD-ROM %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "Demontare CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "Aştept discul...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "Montez CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "Scanez discul de fişierele index..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "Găsite %i indexuri de pachete, %i indexuri de surse şi %i semnături\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "Etichetă memorată: %s \n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "Acesta nu este un nume valid, mai încercaţi.\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2701,94 +2805,99 @@ msgstr "" "Acest disc este numit: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Copiez listele de pachete.." -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Scriere noua listă sursă\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Intrările listei surselor pentru acest disc sunt:\n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "Demontez CD-ROM..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "S-au scris %i înregistrări.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "S-au scris %i înregistrări cu %i fişiere lipsă.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "S-au scris %i înregistrări cu %i fişiere nepotrivite\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "S-au scris %i înregistrări cu %i fişiere lipsă şi %i fişiere nepotrivite\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Se pregăteşte %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Se despachetează %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Se pregăteşte configurarea %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Se configurează %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "Instalat %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Se pregăteşte ştergerea lui %s" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Se şterge %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "Şters %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Se pregăteşte ştergerea completă a %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "Şters complet %s" +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Nu pot deschide fişierul %s" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Conexiune închisă prematur" diff --git a/po/ru.po b/po/ru.po index a5e8813ec..c90b2b191 100644 --- a/po/ru.po +++ b/po/ru.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.6.46.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2007-01-03 23:33+0300\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -24,145 +24,155 @@ msgstr "" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Пакет %s версии %s имеет неудовлетворённую зависимость:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Не удалось найти пакет %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "Всего имён пакетов : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Нормальных пакетов: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Чисто виртуальных пакетов: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Одиночных виртуальных пакетов: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Смешанных виртуальных пакетов: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Пропущено: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Всего уникальных версий: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Всего уникальных версий: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Всего зависимостей: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Всего отношений Версия/Файл: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Всего отношений Версия/Файл: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Всего отношений Provides: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Всего развёрнутых строк: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Всего информации о зависимостях: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Пустого места в кеше: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Общее пространство посчитанное для: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Список пакетов %s рассинхронизирован." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Вы должны задать только один шаблон" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Не найдено ни одного пакета" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Списки пакетов:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Кеш рассинхронизирован, невозможно обнаружить ссылку на список пакетов" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Зафиксированные пакеты:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(не найдено)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Установлен: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(отсутствует)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Кандидат: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Фиксатор пакета: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Таблица версий:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s для %s %s скомпилирован %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -308,7 +318,7 @@ msgstr "" " -c=? Читать указанный конфигурационный файл\n" " -o=? Указать произвольную опцию, к примеру, -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "Невозможно записать в %s" @@ -317,34 +327,34 @@ msgstr "Невозможно записать в %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Невозможно определить версию debconf. Он установлен?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Список расширений, допустимых для пакетов, слишком длинен" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "Ошибка обработки каталога %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "" "Список расширений, допустимых для пакетов с исходными текстами, слишком " "длинен" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "" "Ошибка записи заголовка в полный перечень содержимого пакетов (Contents)" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "ошибка обработки полного перечня содержимого пакетов (Contents) %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -431,26 +441,26 @@ msgstr "" " -c=? Использовать указанный конфигурационный файл\n" " -o=? Указать произвольный параметр конфигурации" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Совпадений не обнаружено" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "В группе пакетов `%s' отсутствуют некоторые файлы" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "БД была повреждена, файл переименован в %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB устарела, попытка обновить %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." @@ -458,106 +468,106 @@ msgstr "" "Некорректный формат базы данных (DB). Если вы обновляли версию apt, удалите " "и создайте базу данных заново." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Не удалось открыть DB файл %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "Не удалось получить атрибуты %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "В архиве нет поля control" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Невозможно получить курсор" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Не удалось прочитать каталог %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Не удалось прочитать атрибуты %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "E: Ошибки относятся к файлу '" -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "Не удалось проследовать по ссылке %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "Не удалось совершить обход дерева" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "Не удалось открыть %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr "DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "Не удалось прочесть ссылку %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "Не удалось удалить %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Не удалось создать ссылку %s на %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Превышен лимит в %sB в DeLink.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "В архиве нет поля package" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " Нет записи о переназначении (override) для %s\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " пакет %s сопровождает %s, а не %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr " Нет записи source override для %s\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr " Нет записи binary override для %s\n" @@ -571,167 +581,167 @@ msgstr "Внутренняя ошибка, не удалось найти сос msgid "realloc - Failed to allocate memory" msgstr "realloc - не удалось выделить память" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Не удалось открыть %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Неправильная запись о переназначении (override) %s на строке %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Неправильная запись о переназначении (override) %s на строке %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Неправильная запись о переназначении (override) %s на строке %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Не удалось прочесть файл переназначений (override)%s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Неизвестный алгоритм сжатия '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "" "Для получения сжатого вывода %s необходимо включить использования сжатия" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Не удалось создать IPC-канал для порождённого процесса" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "Не удалось создать FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "Не удалось запустить порождённый процесс" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "Процесс-потомок, производящий сжатие" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "Внутренняя ошибка, не удалось создать %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "Не удалось создать IPC с порождённым процессом" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "Не удалось выполнить компрессор " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "декомпрессор" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "Ошибка ввода/вывода в подпроцесс/файл" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "Ошибка чтения во время вычисления MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "Не удалось удалить %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Не удалось переименовать %s в %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "д" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "Ошибка компиляции регулярного выражения - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "Пакеты, имеющие неудовлетворённые зависимости:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "но %s уже установлен" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "но %s будет установлен" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "но он не может быть установлен" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "но это виртуальный пакет" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "но он не установлен" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "но он не будет установлен" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " или" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "НОВЫЕ пакеты, которые будут установлены:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "Пакеты, которые будут УДАЛЕНЫ:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "Пакеты, которые будут оставлены в неизменном виде:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "Пакеты, которые будут обновлены:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "" "Пакеты, которые должны были бы остаться без изменений, но будут заменены:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (вследствие %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -739,151 +749,151 @@ msgstr "" "ВНИМАНИЕ: Эти существенно важные пакеты будут удалены.\n" "НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "обновлено %lu, установлено %lu новых пакетов, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "переустановлено %lu переустановлено, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu пакетов заменены на старые версии, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "для удаления отмечено %lu пакетов, и %lu пакетов не обновлено.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "не установлено до конца или удалено %lu пакетов.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Исправление зависимостей..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " не удалось." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Невозможно скорректировать зависимости" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Невозможно минимизировать набор обновлений" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Готово" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -" "f install'." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Неудовлетворённые зависимости. Попытайтесь использовать -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "ВНИМАНИЕ: Следующие пакеты невозможно аутентифицировать!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Аутентификационное предупреждение не принято в внимание.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Установить эти пакеты без проверки [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Некоторые пакеты невозможно аутентифицировать" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Существуют проблемы, а опция -y использована без --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "Внутренняя ошибка, InstallPackages была вызвана с неработоспособными " "пакетами!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Пакеты необходимо удалить, но удаление запрещено." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Внутренняя ошибка, Ordering не завершилась" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "Невозможно заблокировать каталог для загрузки" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Не читается перечень источников." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "Странно.. Несовпадение размеров, напишите на apt@packages.debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Необходимо скачать %sB/%sB архивов.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Необходимо скачать %sБ архивов.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" "После распаковки объем занятого дискового пространства возрастёт на %sB.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "" "После распаковки объем занятого дискового пространства уменьшится на %sB.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не удалось определить количество свободного места в %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Недостаточно свободного места в %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Запрошено выполнение только тривиальных операций, но это не тривиальная " "операция." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Да, делать, как я скажу!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -894,28 +904,28 @@ msgstr "" "Чтобы продолжить, введите фразу: '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "Аварийное завершение." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Хотите продолжить [Д/н]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не удалось загрузить %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Некоторые файлы не удалось загрузить" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "Указан режим \"только загрузка\", и загрузка завершена" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -923,48 +933,48 @@ msgstr "" "Невозможно загрузить некоторые архивы, вероятно надо запустить apt-get " "update или попытаться повторить запуск с ключом --fix-missing" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing и смена носителя в данный момент не поддерживаются" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Невозможно исправить ситуацию с пропущенными пакетами." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Аварийное завершение установки." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Заметьте, вместо %2$s выбирается %1$s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Пропускается %s - пакет уже установлен, и опция upgrade не установлена.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Пакет %s не установлен, поэтому не может быть удалён\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Пакет %s - виртуальный, его функции предоставляются пакетами:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Установлен]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Вы должны явно указать, какой именно вы хотите установить." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -975,49 +985,49 @@ msgstr "" "Это может означать, что пакет отсутствует, устарел, или доступен из " "источников, не упомянутых в sources.list\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Однако следующие пакеты могут его заменить:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Для пакета %s не найдены кандидаты на установку" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Переустановка %s невозможна, он не загружается.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "Уже установлена самая новая версия %s.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Релиз '%s' для '%s' не найден" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Версия '%s' для '%s' не найдена" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Выбрана версия %s (%s) для %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Команде update не нужны аргументы" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Невозможно заблокировать каталог со списками пакетов" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1025,27 +1035,67 @@ msgstr "" "Некоторые индексные файлы не загрузились, они были проигнорированы или " "вместо них были использованы старые версии" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "НОВЫЕ пакеты, которые будут установлены:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "Следующая информация, возможно, поможет вам:" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Внутренняя ошибка, решатель проблем всё поломал" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Внутренняя ошибка, AllUpgrade все поломал" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Не удалось найти пакет %s" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "Не удалось найти пакет %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Заметьте, регулярное выражение %2$s приводит к выбору %1$s\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "но %s будет установлен" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -" "f install':" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1053,7 +1103,7 @@ msgstr "" "Неудовлетворённые зависимости. Попытайтесь выполнить 'apt-get -f install', " "не указывая имени пакета, (или найдите другое решение)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1064,7 +1114,7 @@ msgstr "" "или же используете нестабильную версию дистрибутива, где запрошенные вами\n" "пакеты ещё не созданы или были удалены из Incoming." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1074,125 +1124,136 @@ msgstr "" "пакет просто не может быть установлен из-за ошибок в самом пакете.\n" "Необходимо послать отчёт об этой ошибке." -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Следующая информация, возможно, поможет вам:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "Сломанные пакеты" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "Будут установлены следующие дополнительные пакеты:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "Предлагаемые пакеты:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "Рекомендуемые пакеты:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "Расчёт обновлений... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Неудачно" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "Готово" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "Внутренняя ошибка, решатель проблем всё поломал" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "" "Укажите как минимум один пакет, для которого необходимо загрузить исходные " "тексты" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "Невозможно найти пакет с исходными текстами для %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускаем уже загруженный файл '%s'\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостаточно места в %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо загрузить %sB/%sB из архивов исходных текстов.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Нужно загрузить %sB архивов с исходными текстами.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "Загрузка исходных текстов %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "Некоторые архивы не удалось загрузить." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Распаковка исходных текстов пропущена, так как в %s уже находятся " "распакованные исходные тексты\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда распаковки '%s' завершилась неудачно.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверьте, установлен ли пакет 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда сборки '%s' завершилась неудачно.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "Порождённый процесс завершился неудачно" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для проверки зависимостей для сборки необходимо указать как минимум один " "пакет" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Невозможно получить информацию о зависимостях для сборки %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "%s не имеет зависимостей для сборки.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1201,7 +1262,7 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "найден" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1210,32 +1271,33 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, поскольку ни одна из " "версий пакета %s не удовлетворяет требованиям" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный " "пакет %s новее, чем надо" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимости для сборки %s не могут быть удовлетворены." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "Обработка зависимостей для сборки завершилась неудачно" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "Поддерживаемые модули:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1250,6 +1312,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1414,188 +1477,188 @@ msgstr "" msgid "Merging available information" msgstr "Объединение информации о доступных пакетах" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Не удалось создать порождённые процессы" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Не удалось выполнить gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Повреждённый архив" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Неправильная контрольная сумма Tar, архив повреждён" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Неизвестный заголовок в архиве TAR. Тип %u, элемент %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Неверная сигнатура архива" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Ошибка чтения заголовка элемента архива" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Неправильный заголовок элемента архива" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Слишком короткий архив" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Не удалось прочитать заголовки архива" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode вызван для узла, который ещё используется" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Не удалось найти элемент хеша!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Не удалось создать diversion" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Внутренняя ошибка в AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Попытка изменения diversion, %s -> %s и %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Двойное добавление diversion %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Повторно указанный конфигурационный файл %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Не удалось записать в файл %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Не удалось закрыть файл %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Слишком длинный путь %s" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Повторная распаковка %s" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Каталог %s входит в список diverted" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Пакет пытается писать в diversion %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Путь diversion слишком длинен" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Каталог %s был заменён не-каталогом" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Не удалось разместить узел в хеше" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Путь слишком длинен" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Файлы заменяются содержимым пакета %s без версии" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Файл %s/%s переписывает файл в пакете %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Невозможно прочитать %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Невозможно получить атрибуты %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Не удалось удалить %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Не удалось создать %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Не удалось получить атрибуты %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "Каталоги info и temp должны находиться на одной файловой системе" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "Чтение списков пакетов" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Не удалось сменить текущий каталог на административный каталог %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "Внутренняя ошибка при получении имени пакета" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Чтение списков файлов в пакете" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1606,77 +1669,77 @@ msgstr "" "восстановить этот файл, то обнулите его и немедленно переустановите ту же " "версию пакета!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Ошибка чтения списка файлов %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Внутренняя ошибка при получении node" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Не удалось открыть файл diversions %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Файл diversions повреждён" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "Неверная строка в файле diversions: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Внутренняя ошибка при добавлении diversion" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "В первую очередь должен быть проинициализирован кеш пакетов" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Не удалось найти заголовок Package:, смещение %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Неверная секция ConfFile в status-файле. Смещение %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Ошибка чтения контрольной суммы. Смещение %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Это неправильный DEB-архив - отсутствует составная часть '%s'" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "Это неправильный DEB-архив - отсутствует составная часть '%s' или '%s'" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "Не удалось перейти в каталог %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "Внутренняя ошибка, не удалось найти составную часть" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "Не удалось найти правильный control-файл" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "Не удалось прочесть содержимое control-файла" @@ -1711,11 +1774,12 @@ msgid "File not found" msgstr "Файл не найден" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Не удалось получить атрибуты" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Не удалось установить время модификации" @@ -1779,7 +1843,7 @@ msgstr "Допустимое время ожидания для соединен msgid "Server closed the connection" msgstr "Сервер прервал соединение" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "Ошибка чтения" @@ -1791,7 +1855,7 @@ msgstr "Ответ переполнил буфер." msgid "Protocol corruption" msgstr "Искажение протокола" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "Ошибка записи" @@ -1847,7 +1911,7 @@ msgstr "Время установления соединения для соке msgid "Unable to accept connection" msgstr "Невозможно принять соединение" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Проблема при хешировании файла" @@ -1874,39 +1938,39 @@ msgstr "Запрос" msgid "Unable to invoke " msgstr "Невозможно вызвать " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Соединение с %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Не удаётся создать сокет для %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Невозможно инициализировать соединение с %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Не удаётся соединиться с %s:%s (%s), connection timed out" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Не удаётся соединиться с %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Соединение с %s" @@ -1984,436 +2048,456 @@ msgstr "Не удалось открыть канал для %s" msgid "Read error from %s process" msgstr "Ошибка чтения из процесса %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Ожидание заголовков" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Получен заголовок длиннее %u символов" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Неверный заголовок" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Http-сервер послал неверный заголовок" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Http сервер послал неверный заголовок Content-Length" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Http-сервер послал неверный заголовок Content-Range" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Этот http-сервер не поддерживает загрузку фрагментов файлов" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Неизвестный формат данных" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Ошибка в select" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Время ожидания для соединения истекло" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Ошибка записи в выходной файл" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Ошибка записи в файл" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Ошибка записи в файл" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Ошибка чтения, удалённый сервер прервал соединение" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Ошибка чтения с сервера" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Неверный заголовок данных" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Соединение разорвано" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Внутренняя ошибка" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "Невозможно отобразить в память пустой файл" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Невозможно отобразить в память %lu байт" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "Не найдено: %s" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Неизвестная аббревиатура типа: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "Открытие файла конфигурации %s" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "Строка %d слишком длинна (максимум %d)." -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Синтаксическая ошибка %s:%u: в начале блока нет имени." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Синтаксическая ошибка %s:%u: искажённый тег" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Синтаксическая ошибка %s:%u: лишние символы после значения" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Синтаксическая ошибка %s:%u: директивы могут задаваться только на верхнем " "уровне" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Синтаксическая ошибка %s:%u: слишком много вложенных include" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Синтаксическая ошибка %s:%u вызвана include из этого места" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Синтаксическая ошибка %s:%u: не поддерживаемая директива '%s'" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Синтаксическая ошибка %s:%u: лишние символы в конце файла" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Ошибка!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... Готово" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Неизвестная опция командной строки '%c' [из %s]." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "Не распознанная опция командной строки %s" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Опция командной строки %s - не логический переключатель \"да/нет\"" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Опция %s требует аргумента." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Опция %s: значение должно иметь вид =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Опция %s требует аргумент в виде целого числа, а не '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Слишком длинная опция '%s'" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Смысл %s не ясен, используйте true или false." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Неверная операция %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Невозможно прочитать атрибуты точки монтирования %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Невозможно сменить текущий каталог на %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "Невозможно получить атрибуты cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Блокировка не используется, так как файл блокировки %s доступен только для " "чтения" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "Не удалось открыть файл блокировки %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Блокировка не используется, так как файл блокировки %s находится на файловой " "системе nfs" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "Не удалось получить доступ к файлу блокировки %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ожидалось завершение процесса %s, но он не был запущен" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" "Нарушение защиты памяти (segmentation fault) в порождённом процессе %s." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Порождённый процесс %s вернул код ошибки (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Порождённый процесс %s неожиданно завершился" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "Не удалось открыть файл %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "" "ошибка при чтении. собирались прочесть ещё %lu байт, но ничего больше нет" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "ошибка при записи, собирались записать ещё %lu байт, но не смогли" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "Проблема закрытия файла" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "Ошибка при удалении файла" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "Проблема при синхронизации файловых буферов с диском" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Кеш пакетов пуст" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Кеш пакетов повреждён" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Не поддерживаемая версия кеша пакетов" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Данный APT не поддерживает систему версий '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Кеш пакетов был собран для другой архитектуры" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Зависит" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "ПредЗависит" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Предлагает" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Рекомендует" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Конфликтует" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Заменяет" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Замещает" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "важный" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "необходимый" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "стандартный" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "необязательный" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "дополнительный" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "Построение дерева зависимостей" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "Версии-кандидаты" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "Генерирование зависимостей" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "Объединение информации о доступных пакетах" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Не удалось открыть %s" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Не удалось записать в файл %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Невозможно прочесть содержимое пакета %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Невозможно прочесть содержимое пакета %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Искажённая строка %lu в списке источников %s (проблема в URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" "Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Искажённая строка %lu в списке источников %s (анализ URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Искажённая строка %lu в списке источников %s (absolute dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Искажённая строка %lu в списке источников %s (dist parse)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Открытие %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Строка %u в списке источников %s слишком длинна." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Искажённая строка %u в списке источников %s (тип)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Неизвестный тип '%s' в строке %u в списке источников %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Искажённая строка %u в списке источников %s (vendor id)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2425,19 +2509,19 @@ msgstr "" "существенно важный пакет %s. Это может привести к фатальным последствиям. " "Если вы действительно хотите продолжить, включите опцию APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Не поддерживается индексный файл типа '%s'" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Пакет %s нуждается в переустановке, но найти архив для него не удалось." -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2445,179 +2529,195 @@ msgstr "" "Ошибка, pkgProblemResolver::Resolve сгенерировал повреждённые пакеты. Это " "может быть вызвано отложенными (held) пакетами." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "Невозможно исправить ошибки, у вас отложены (held) битые пакеты." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Каталог %spartial отсутствует." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Архивный каталог %spartial отсутствует." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Загружается файл %li из %li (%s осталось)" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "Загружается файл %li из %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Драйвер для метода %s не найден." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Метод %s запустился не корректно" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Вставьте диск с меткой '%s' в устройство '%s' и нажмите ввод." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Менеджер пакетов '%s' не поддерживается" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "Невозможно определить подходящий тип менеджера пакетов" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Невозможно получить атрибуты %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Вы должны заполнить sources.list, поместив туда URI источников пактов" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "Списки пакетов или status-файл не могут быть открыты или прочитаны." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "Вы можете запустить 'apt-get update' для исправления этих ошибок" -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Неверная запись в файле preferences: отсутствует заголовок Package" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Неизвестный тип фиксации %s" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Для фиксации не указан приоритет (или указан нулевой)" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Кеш имеет несовместимую систему версий" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Произошла ошибка во время обработки %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Произошла ошибка во время обработки %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Произошла ошибка во время обработки %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Произошла ошибка во время обработки %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Произошла ошибка во время обработки %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Произошла ошибка во время обработки %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Произошла ошибка во время обработки %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Произошла ошибка во время обработки %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Произошла ошибка во время обработки %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Превышено допустимое количество имён пакетов." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Превышено допустимое количество версий." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Превышено допустимое количество версий." + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Превышено допустимое количество зависимостей." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Произошла ошибка во время обработки %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Произошла ошибка во время обработки %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Во время обработки файла зависимостей не найден пакет %s %s" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "Не удалось получить атрибуты списка пакетов с исходными текстами %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "Сбор информации о Provides" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "Ошибка ввода/вывода при попытке сохранить кеш исходных текстов" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "переименовать не удалось, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "MD5Sum не совпадает" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "Недоступен общий ключ для следующих ID ключей:\n" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2626,7 +2726,7 @@ msgstr "" "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся " "вручную исправить этот пакет (возможно, пропущен arch)" -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2635,13 +2735,13 @@ msgstr "" "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся " "вручную исправить этот пакет." -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s." -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Не совпадает размер" @@ -2650,7 +2750,7 @@ msgstr "Не совпадает размер" msgid "Vendor block %s contains no fingerprint" msgstr "Блок поставщика %s не содержит отпечатка (fingerprint)" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2659,54 +2759,56 @@ msgstr "" "В качестве точки монтирования CD-ROM используется %s\n" "Монтируется CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "Идентификация.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "Найдена метка: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Использование %s в качестве точки монтирования CD-ROM\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "Размонтирование CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "Ожидание операции работы с диском...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "Монтирование CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "Поиск на диске индексных файлов..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "" "Найдено индексов: %i для пакетов, %i для пакетов c исходными текстами\n" "и %i для сигнатур\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "Найдена метка: %s \n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "Это неправильное имя, попробуйте ещё раз.\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2715,98 +2817,99 @@ msgstr "" "Название диска: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Копирование списков пакетов..." -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Запись нового списка источников\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Записи в списке источников для этого диска:\n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "Размонтирование CD-ROM..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Сохранено %i записей.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Сохранено %i записей с %i отсутствующими файлами.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Сохранено %i записей с %i несовпадающими файлами\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "Сохранено %i записей с %i отсутствующими файлами и с %i несовпадающими " "файлами\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Подготавливается %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Распаковывается %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Подготавливается для конфигурации %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Настройка %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "Установлен %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Подготавливается для удаления %s" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Удаление %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "Удалён %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Подготовка к полному удалению %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "%s полностью удалён" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "Не удалось пропатчить файл" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Соединение закрыто преждевременно" - -#~ msgid "Could not patch file" -#~ msgstr "Не удалось пропатчить файл" diff --git a/po/sk.po b/po/sk.po index 87514e27b..92e8bcad4 100644 --- a/po/sk.po +++ b/po/sk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2006-09-10 18:50+0200\n" "Last-Translator: Peter Mann \n" "Language-Team: Slovak \n" @@ -15,145 +15,155 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Balík %s verzie %s má nesplnené závislosti:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Balík %s sa nedá nájsť" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "Celkom názvov balíkov: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Normálnych balíkov: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Čisto virtuálnych balíkov: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Jednoduchých virtuálnych balíkov: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Zmiešaných virtuálnych balíkov: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Chýbajúcich: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Celkom rôznych verzií: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Celkom rôznych verzií: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Celkom závislostí: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Celkom vzťahov ver/súbor: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Celkom vzťahov ver/súbor: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Celkom poskytnutých mapovaní: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Celkom globovaných reťazcov: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Celkom miesta závislých verzií: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Celkom jalového miesta: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Celkom priradeného miesta: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Súbor balíkov %s je neaktuálny." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Musíte zadať práve jeden vzor" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Neboli nájdené žiadne balíky" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Súbory balíka:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cache je neaktuálna, nedá sa odvolať na súbor balíka" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Pripevnené balíky:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(nenájdené)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Nainštalovaná verzia: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(žiadna)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Kandidát: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Pripevnený balík:" #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Tabuľka verzií:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s pre %s %s skompilovaný na %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -300,7 +310,7 @@ msgstr "" " -c=? Načíta tento konfiguračný súbor\n" " -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "Do %s sa nedá zapisovať" @@ -309,31 +319,31 @@ msgstr "Do %s sa nedá zapisovať" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nedá sa určiť verzia programu debconf. Je debconf nainštalovaný?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Zoznam rozšírení balíka je príliš dlhý" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "Chyba pri spracovávaní adresára %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Zoznam zdrojových rozšírení je príliš dlhý" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Chyba pri zapisovaní hlavičky do súboru" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Chyba pri spracovávaní obsahu %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -413,26 +423,26 @@ msgstr "" " -c=? Načíta tento konfiguračný súbor\n" " -o=? Nastaví ľubovoľnú voľbu" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Nevyhovel žiaden výber" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "V balíkovom súbore skupiny `%s' chýbajú niektoré súbory" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB je narušená, súbor je premenovaný na %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB je neaktuálna, prebieha pokus o aktualizáciu %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." @@ -440,106 +450,106 @@ msgstr "" "Formát DB je neplatný. Ak ste aktualizovali staršiu verziu apt, musíte " "odstrániť a znovu vytvoriť databázu." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Nedá sa otvoriť DB súbor %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "%s sa nedá vyhodnotiť" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Archív nemá riadiaci záznam" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Nedá sa získať kurzor" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Adresár %s sa nedá čítať\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: %s sa nedá vyhodnotiť\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "E: Chyby sa týkajú súboru " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "Chyba pri zisťovaní %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "Priechod stromom zlyhal" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "%s sa nedá otvoriť" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr "Odlinkovanie %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "Linka %s sa nedá čítať" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "%s sa nedá odlinkovať" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Nepodarilo sa zlinkovať %s s %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Bol dosiahnutý odlinkovací limit %sB.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Archív neobsahuje pole package" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s nemá žiadnu položku pre override\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " správcom %s je %s, nie %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr " %s nemá žiadnu source položku pre override\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nemá žiadnu binary položku pre override\n" @@ -553,165 +563,165 @@ msgstr "Vnútorná chyba, nedá sa nájsť časť %s" msgid "realloc - Failed to allocate memory" msgstr "realloc - Zlyhal pokus o pridelenie pamäti" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "%s sa nedá otvoriť" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Skomolený súbor %s, riadok %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Skomolený súbor %s, riadok %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Skomolený súbor %s, riadok %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Nepodarilo sa prečítať override súbor %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Neznámy kompresný algoritmus '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimovaný výstup %s potrebuje kompresnú sadu" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Zlyhalo vytvorenie medziprocesovej rúry k podprocesu" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "Zlyhalo vytvorenie FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "Volanie fork() zlyhalo" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "Komprimovať potomka" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "Interná chyba, nepodarilo sa vytvoriť %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "Nedá sa vytvoriť podproces IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "Nepodarilo sa spustiť kompresor " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "dekompresor" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "V/V operácia s podprocesom/súborom zlyhala" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "Chyba čítania pri výpočte MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "Problém s odlinkovaním %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Premenovanie %s na %s zlyhalo" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba pri preklade regulárneho výrazu - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "Nasledovné balíky majú nesplnené závislosti:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "ale nainštalovaný je %s" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "ale inštalovať sa bude %s" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "ale sa nedá nainštalovať" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "ale je to virtuálny balík" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "ale nie je nainštalovaný" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "ale sa nebude inštalovať" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " alebo" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "Nainštalujú sa nasledovné NOVÉ balíky:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "Nasledovné balíky sa ODSTRÁNIA:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "Nasledovné balíky sa ponechajú v súčasnej verzii:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "Nasledovné balíky sa aktualizujú:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "Nasledovné balíky sa DEGRADUJÚ:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "Nasledovné pridržané balíky sa zmenia:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (kvôli %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -719,145 +729,145 @@ msgstr "" "UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n" "Ak presne neviete, čo robíte, tak to NEROBTE!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualizovaných, %lu nových inštalovaných, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinštalovaných, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu degradovaných, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu na odstránenie a %lu neaktualizovaných.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Opravujú sa závislosti..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " zlyhalo." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Závislosti sa nedajú opraviť" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Sada pre aktualizáciu sa nedá minimalizovať" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Hotovo" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Na opravu môžete spustiť `apt-get -f install'." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Nesplnené závislosti. Skúste použiť -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "UPOZORNENIE: Pri nasledovných balíkoch sa nedá overiť vierohodnosť!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Upozornenie o vierohodnosti bolo potlačené.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Nainštalovať tieto nekontrolované balíky [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Nedala sa zistiť vierohodnosť niektorých balíkov" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Nastali problémy a -y bolo použité bez --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Vnútorná chyba, InstallPackages bolo volané s poškodenými balíkmi!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Vnútorná chyba, Triedenie sa neukončilo" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "Adresár pre sťahovanie sa nedá zamknúť" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Nedá sa načítať zoznam zdrojov." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Nezvyčajná udalosť... Veľkosti nesúhlasia, pošlite e-mail na apt@packages." "debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Je potrebné stiahnuť %sB/%sB archívov.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Je potrebné stiahnuť %sB archívov.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Po rozbalení sa na disku použije ďalších %sB.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po rozbalení sa na disku uvoľní %sB.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "Na %s sa nedá zistiť veľkosť voľného miesta" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Na %s nemáte dostatok voľného miesta." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Zadané 'iba triviálne', ale toto nie je triviálna operácia." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Áno, urob to, čo vravím!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -868,28 +878,28 @@ msgstr "" "Pre pokračovanie opíšte frázu '%s'\n" " ?]" -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "Prerušené." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovať [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Zlyhalo stiahnutie %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Niektoré súbory sa nedajú stiahnuť" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "Sťahovanie ukončené v režime \"iba stiahnuť\"" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -897,47 +907,47 @@ msgstr "" "Niektoré archívy sa nedajú stiahnuť. Skúste spustiť apt-get update alebo --" "fix-missing" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing a výmena média nie sú momentálne podporované" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Chýbajúce balíky sa nedajú opraviť." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Inštalácia sa prerušuje." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Poznámka: %s sa vyberá namiesto %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Preskakuje sa %s, pretože je už nainštalovaný.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Balík %s nie je nainštalovaný, nedá sa teda odstrániť\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Balík %s je virtuálny balík poskytovaný:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr "[Inštalovaný]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Mali by ste explicitne vybrať jeden na inštaláciu." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -947,49 +957,49 @@ msgstr "" "Balík %s nie je dostupný, ale odkazuje naň iný balík. Možno to znamená,\n" "že balík chýba, bol zrušený, alebo je dostupný iba z iného zdroja\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Avšak nahrádzajú ho nasledovné balíky:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Balík %s nemá kandidáta na inštaláciu" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Nie je možná reinštalácia %s, pretože sa nedá stiahnuť.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s je už najnovšej verzie.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Nebolo nájdené vydanie '%s' pre '%s'" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Nebola nájdená verzia '%s' pre '%s'" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Zvolená verzia %s (%s) pre %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Príkaz update neprijíma žiadne argumenty" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Adresár zoznamov sa nedá zamknúť" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -997,25 +1007,65 @@ msgstr "" "Niektoré indexové súbory sa nepodarilo stiahnuť, boli ignorované, alebo sa " "použili staršie verzie." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Nainštalujú sa nasledovné NOVÉ balíky:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "Nasledovné informácie vám možno pomôžu vyriešiť túto situáciu:" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Vnútorná chyba, problem resolver pokazil veci" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnútorná chyba, AllUpgrade pokazil veci" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Balík %s sa nedá nájsť" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "Balík %s sa nedá nájsť" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Poznámka: vyberá sa %s pre regulárny výraz '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "ale inštalovať sa bude %s" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Na opravu nasledovných môžete spustiť `apt-get -f install':" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1023,7 +1073,7 @@ msgstr "" "Nesplnené závislosti. Skúste spustiť 'apt-get -f install' bez balíkov (alebo " "navrhnite riešenie)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1035,7 +1085,7 @@ msgstr "" "požadované balíky ešte neboli vytvorené alebo presunuté z fronty\n" "Novoprichádzajúcich (Incoming) balíkov." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1045,128 +1095,139 @@ msgstr "" "balík nie je inštalovateľný a mali by ste zaslať hlásenie o chybe\n" "(bug report) pre daný balík." -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Nasledovné informácie vám možno pomôžu vyriešiť túto situáciu:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "Poškodené balíky" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "Nainštalujú sa nasledovné extra balíky:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "Odporúčané balíky:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "Prepočítava sa aktualizácia... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Chyba" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "Vnútorná chyba, problem resolver pokazil veci" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "Musíte zadať aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "Nedá sa nájsť zdrojový balík pre %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Preskakuje sa už stiahnutý súbor '%s'\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatok voľného miesta" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Je potrebné stiahnuť %sB/%sB zdrojových archívov.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Je potrebné stiahnuť %sB zdrojových archívov.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "Stiahnuť zdroj %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "Zlyhalo stiahnutie niektorých archívov." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Preskakuje sa rozbalenie už rozbaleného zdroja v %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Príkaz pre rozbalenie '%s' zlyhal.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Skontrolujte, či je nainštalovaný balík 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "Príkaz pre zostavenie '%s' zlyhal.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "Proces potomka zlyhal" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "" "Musíte zadať aspoň jeden balík, pre ktorý sa budú overovať závislosti na " "zostavenie" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nedajú sa získať závislosti pre zostavenie %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žiadne závislosti pre zostavenie.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s závislosť pre %s sa nemôže splniť, pretože sa nedá nájsť balík %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1175,31 +1236,32 @@ msgstr "" "%s závislosť pre %s sa nedá splniť, protože sa nedá nájsť verzia balíku %s, " "ktorá zodpovedá požiadavke na verziu" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Zlyhalo splnenie %s závislosti pre %s: Inštalovaný balík %s je príliš nový" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Zlyhalo splnenie %s závislosti pre %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti pre zostavenie %s sa nedajú splniť." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "Spracovanie závislostí pre zostavenie zlyhalo" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1214,6 +1276,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1375,188 +1438,188 @@ msgstr "" msgid "Merging available information" msgstr "Zlučujú sa dostupné informácie" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Vytvorenie rúry zlyhalo" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Spustenie gzip zlyhalo " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Porušený archív" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Kontrolný súčet pre tar zlyhal, archív je poškodený" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Neznáma hlavička TARu typ %u, člen %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Neplatný podpis archívu" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Chyba pri čítaní záhlavia prvku archívu" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Neplatné záhlavie prvku archívu" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Archív je príliš krátky" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Chyba pri čítaní hlavičiek archívu" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "Pokus o uvoľnenie uzla (DropNode) na stále prepojenom uzle" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Hashovací prvok sa nedá nájsť!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Nedá sa alokovať diverzia" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Vnútorná chyba pri AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Pokus o prepísanie diverzie, %s -> %s a %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Dvojité pridanie diverzie %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Duplicitný konfiguračný súbor %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Zápis súboru %s zlyhal" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Zatvorenie súboru %s zlyhalo" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Cesta %s je príliš dlhá" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "%s sa rozbaľuje viackrát" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Adresár %s je divertovaný" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Balík sa pokúša zapisovať do diverzného cieľa %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Diverzná cesta je príliš dlhá" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Adresár %s sa nahradí neadresárom" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Nedá sa nájsť uzol v jeho hashovacej oblasti" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Cesta je príliš dlhá" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Prepísať zodpovedajúci balík bez udania verzie pre %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Súbor %s/%s prepisuje ten z balíka %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "%s sa nedá čítať" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "%s sa nedá vyhodnotiť" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Odstránenie %s zlyhalo" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "%s sa nedá vytvoriť" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Vyhodnotenie %sinfo zlyhalo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "Adresáre info a temp musia byť na tom istom súborovom systéme" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "Načítavajú sa zoznamy balíkov" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Nedá sa zmeniť na admin adresár %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "Vnútorná chyba pri získavaní názvu balíka" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Načítavam výpis súborov" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1567,77 +1630,77 @@ msgstr "" "súbor, vytvorte ho nový prázdny a ihneď znovu nainštalujte tú istú verziu " "balíka!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Chyba pri čítaní súboru so zoznamami %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Vnútorná chyba pri získavaní uzla" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Zlyhalo otvorenie súboru s diverziami %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Diverzný súbor je porušený" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "Neplatný riadok v diverznom súbore: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Vnútorná chyba pri pridávaní diverzie" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Vyrovnávacia pamäť balíkov sa musí najprv inicializovať" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Chyba pri hľadaní Balíka: Hlavička, offset %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Zlá sekcia ConfFile v stavovom súbore na pozícii %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Chyba pri spracovaní MD5. Offset %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Toto nie je platný DEB archív, chýba časť '%s'" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "Toto nie je platný DEB archív, chýba časť '%s' alebo '%s'" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "Nedá sa prejsť do %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "Vnútorná chyba, nedá sa nájsť člen" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "Nedá sa nájsť platný riadiaci súbor" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "Nespracovateľný riadiaci súbor" @@ -1672,11 +1735,12 @@ msgid "File not found" msgstr "Súbor sa nenašiel" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Vyhodnotenie zlyhalo" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Zlyhalo nastavenie času zmeny" @@ -1738,7 +1802,7 @@ msgstr "Uplynul čas spojenia" msgid "Server closed the connection" msgstr "Server ukončil spojenie" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "Chyba pri čítaní" @@ -1750,7 +1814,7 @@ msgstr "Odpoveď preplnila zásobník." msgid "Protocol corruption" msgstr "Narušenie protokolu" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "Chyba pri zápise" @@ -1804,7 +1868,7 @@ msgstr "Uplynulo spojenie dátového socketu" msgid "Unable to accept connection" msgstr "Spojenie sa nedá prijať" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problém s hashovaním súboru" @@ -1831,39 +1895,39 @@ msgstr "Dotaz" msgid "Unable to invoke " msgstr "Nedá sa vyvolať " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Pripája sa k %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Nedá sa vytvoriť socket pre %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Nedá sa nadviazať spojenie na %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Nedá sa pripojiť k %s:%s (%s), uplynul čas spojenia" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Nedá sa pripojiť k %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Pripája sa k %s" @@ -1939,428 +2003,448 @@ msgstr "Nedá sa otvoriť rúra pre %s" msgid "Read error from %s process" msgstr "Chyba pri čítaní z procesu %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Čaká sa na hlavičky" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Získal sa jeden riadok hlavičky cez %u znakov" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Chybná hlavička" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP server poslal neplatnú hlavičku odpovede" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP server poslal neplatnú hlavičku Content-Length" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP server poslal neplatnú hlavičku Content-Range" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Tento HTTP server má poškodenú podporu rozsahov" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Neznámy formát dátumu" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Výber zlyhal" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Uplynul čas spojenia" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupného súboru" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Chyba pri čítaní zo servera" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Zlé dátové záhlavie" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Spojenie zlyhalo" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Vnútorná chyba" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "Nedá sa vykonať mmap prázdneho súboru" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Nedá sa urobiť mmap %lu bajtov" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "Voľba %s nenájdená" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Nerozpoznaná skratka typu: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "Otvára sa konfiguračný súbor %s" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "Riadok %d je príliš dlhý (nanajvýš %d)" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaktická chyba %s:%u: Blok začína bez názvu." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaktická chyba %s:%u: Skomolená značka" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaktická chyba %s:%u: Za hodnotou nasledujú chybné údaje" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Syntaktická chyba %s:%u: Direktívy sa dajú vykonať len na najvyššej úrovni" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaktická chyba %s:%u: Príliš mnoho vnorených prepojení (include)" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaktická chyba %s:%u: Zahrnuté odtiaľ" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktíva '%s'" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaktická chyba %s:%u: Na konci súboru sú chybné údaje" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Chyba!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... Hotovo" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Parameter príkazového riadku '%c' [z %s] je neznámy" -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "Nezrozumiteľný parameter %s v príkazovom riadku" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Parameter príkazového riadku %s nie je pravdivostná hodnota" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Voľba %s vyžaduje argument." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Parameter %s: Zadanie konfiguračnej položky musí obsahovať =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Voľba %s vyžaduje ako argument celé číslo (integer), nie '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Voľba '%s' je príliš dlhá" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Nezrozumiteľný význam %s, skúste true alebo false. " -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Neplatná operácia %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Prípojný bod %s sa nedá vyhodnotiť" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Nedá sa prejsť do %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "Nedá sa vyhodnotiť cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Zamykanie pre zámkový súbor %s, ktorý je iba na čítanie, sa nepoužíva" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "Zámkový súbor %s sa nedá otvoriť" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Zamykanie pre zámkový súbor %s pripojený cez nfs sa nepoužíva" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "Zámok %s sa nedá získať" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Čakalo sa na %s, ale nebolo to tam" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Podproces %s obdržal chybu segmentácie." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s vrátil chybový kód (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s neočakávane skončil" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "Súbor %s sa nedá otvoriť súbor" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "čítanie, stále treba prečítať %lu, ale už nič neostáva" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "zápis, stále treba zapísať %lu, no nedá sa to" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "Problém pri zatváraní súboru" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "Problém pri odstraňovaní súboru" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "Problém pri synchronizovaní súboru" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Vyrovnávacia pamäť balíkov je prázdna" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Súbor vyrovnávacej pamäti balíkov je poškodený" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Súbor vyrovnávacej pamäti balíkov je nezlučiteľnej verzie" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Tento APT nepodporuje systém pre správu verzií '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Súbor vyrovnávacej pamäti balíkov bol vytvorený pre inú architektúru" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Závisí na" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Predzávisí na" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Navrhuje" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Odporúča" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Koliduje s" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Nahrádza" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Zneplatňuje" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "dôležitý" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "požadovaný" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "štandartný" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "voliteľný" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "Vytvára sa strom závislostí" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "Kandidátske verzie" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "Generovanie závislostí" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "Zlučujú sa dostupné informácie" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "%s sa nedá otvoriť" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Zápis súboru %s zlyhal" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Súbor %s sa nedá spracovať (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Súbor %s sa nedá spracovať (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (Absolútny dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie dist)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Otvára sa %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Riadok %u v zozname zdrojov %s je príliš dlhý." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ '%s' je neznámy na riadku %u v zozname zdrojov %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Skomolený riadok %u v zozname zdrojov %s (id výrobcu)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2371,18 +2455,18 @@ msgstr "" "kvôli slučke v Conflicts/Pre-Depends. Často je to nevhodné, ale ak to chcete " "naozaj urobiť, aktivujte možnosť APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Indexový typ súboru '%s' nie je podporovaný" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Je nutné preinštalovať balík %s, ale nemôžem pre neho nájsť archív." -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2390,181 +2474,197 @@ msgstr "" "Chyba, pkgProblemResolver::Resolve vytvára poruchy, čo môže být spôsobené " "pridržanými balíkmi." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "Problémy sa nedajú opraviť, niektoré balíky držíte v poškodenom stave." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Adresár zoznamov %spartial chýba." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Archívny adresár %spartial chýba." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Sťahuje sa %li. súbor z %li (zostáva %s)" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "Sťahuje sa %li. súbor z %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Nedá sa nájsť ovládač spôsobu %s." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Spôsob %s nebol správne spustený" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Vložte disk nazvaný '%s' do mechaniky '%s' a stlačte Enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Balíčkovací systém '%s' nie je podporovaný" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "Nedá sa určiť vhodný typ balíčkovacieho systému" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Nedá sa vyhodnotiť %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Do sources.list musíte zadať nejaké 'zdrojové' URI" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "Zoznamy balíkov alebo stavový súbor sa nedajú spracovať alebo otvoriť." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "Na opravu týchto problémov môžete skúsiť spustiť apt-get update" -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Neplatný záznam v súbore preferencií, žiadne záhlavie balíka" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Nezrozumiteľné pripevnenie typu %s" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Pre pripevnenie nebola zadaná žiadna (alebo nulová) priorita" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Chyba pri spracovávaní %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Chyba pri spracovávaní %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Chyba pri spracovávaní %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Chyba pri spracovávaní %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Chyba pri spracovávaní %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Chyba pri spracovávaní %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Chyba pri spracovávaní %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Chyba pri spracovávaní %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Chyba pri spracovávaní %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Fíha, prekročili ste počet názvov balíkov, ktoré toto APT zvládne spracovať." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Fíha, prekročili ste počet verzií, ktoré toto APT zvládne spracovať." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Fíha, prekročili ste počet verzií, ktoré toto APT zvládne spracovať." + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Fíha, prekročili ste počet závislostí, ktoré toto APT zvládne spracovať." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Chyba pri spracovávaní %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Chyba pri spracovávaní %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Pri spracovaní závislostí nebol nájdený balík %s %s" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "Collecting File poskytuje" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäte" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "premenovanie zlyhalo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Nezhoda MD5 súčtov" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "Nie sú dostupné žiadne verejné kľúče ku kľúčom s nasledovnými ID:\n" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2573,7 +2673,7 @@ msgstr "" "Nedá sa nájsť súbor s balíkom %s. To by mohlo znamenať, že tento balík je " "potrebné opraviť manuálne (kvôli chýbajúcej architektúre)." -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2582,13 +2682,13 @@ msgstr "" "Nedá sa nájsť súbor s balíkom %s. Asi budete musieť opraviť tento balík " "manuálne." -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Indexové súbory balíka sú narušené. Chýba pole Filename: pre balík %s." -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Veľkosti sa nezhodujú" @@ -2597,7 +2697,7 @@ msgstr "Veľkosti sa nezhodujú" msgid "Vendor block %s contains no fingerprint" msgstr "Blok výrobcu %s neobsahuje otlačok (fingerprint)" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2606,53 +2706,55 @@ msgstr "" "Použije sa CD-ROM prípojný bod %s\n" "Pripája sa CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "Identifikuje sa.." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "Uložená menovka: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Použije sa CD-ROM prípojný bod %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "CD-ROM sa odpája\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "Čaká sa na disk...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "Pripája sa CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "Na disku sa hľadajú indexové súbory..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "" "Nájdených %i indexov balíkov, %i indexov zdrojových balíkov a %i signatúr\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "Uložená menovka: %s \n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "Neplatný názov, skúste znova.\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2661,99 +2763,100 @@ msgstr "" "Názov tohto disku je: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Kopírujú sa zoznamy balíkov..." -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Zapisuje sa nový zoznam zdrojov\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Položky zoznamu zdrojov pre tento disk sú:\n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "CD-ROM sa odpája..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Zapísaných %i záznamov.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Zapísaných %i záznamov s %i chýbajúcimi súbormi.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Zapísaných %i záznamov s %i chybnými súbormi\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Zapísaných %i záznamov s %i chýbajúcimi a %i chybnými súbormi\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Pripravuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Rozbaľuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Pripravuje sa nastavenie %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Nastavuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "Nainštalovaný balík %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Pripravuje sa odstránenie %s" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Odstraňuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "Odstránený balík %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Pripravuje sa úplné odstránenie %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "Balík '%s' je úplne odstránený" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "Súbor %s sa nedá otvoriť súbor" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Spojenie bolo predčasne ukončené" #~ msgid "File date has changed %s" #~ msgstr "Dátum súboru sa zmenil %s" - -#~ msgid "Could not patch file" -#~ msgstr "Súbor %s sa nedá otvoriť súbor" diff --git a/po/sl.po b/po/sl.po index ddce35520..337609474 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2005-02-16 22:18+0100\n" "Last-Translator: Jure Cuhalev \n" "Language-Team: Slovenian \n" @@ -12,145 +12,155 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Paket %s razliica %s ima nereene odvisnosti:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Ne najdem paketa %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "Vseh imen paketov:" -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Navadni paketi:" -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " isti navidezni paketi:" -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Posamezni navidezni paketi:" -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Meani navidezni paketi:" -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Manjka: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Vseh razliic:" -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Vseh razliic:" + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Vseh odvisnosti:" -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Vseh povezava Raz/Dat:" -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Vseh povezava Raz/Dat:" + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Vseh dobljenih preslikav: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Vseh razirjenih nizov: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Celotna velikost z odvisnostmi: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Celotna ohlapna velikost: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Celotna velikost, izraunana za: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Paketna datoteka %s ni usklajena." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Podati morate natanno en vzorec" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Nobena datoteka ni bila najdena" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Paketne datoteke:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Predpomnilnik ni usklajen, x-ref paketne datotek ni mogo" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Pripeti paketi:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(ni najden)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Nameen: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(brez)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Kandidat:" -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Zaponka paketa:" #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Tabela razliic:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s za %s %s preveden na %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -301,7 +311,7 @@ msgstr "" " -c=? Prebere podano datoteko z nastavitvami\n" " -o=? Nastavi poljubno nastavitveno monost, npr. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "Ni mogoe pisati na %s" @@ -310,31 +320,31 @@ msgstr "Ni mogo msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ni mogoe ugotoviti razliice debconfa. Je sploh nameen?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Seznam raziritev paketov je predolg" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "Napaka pri obdelavi imenika %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Seznam raziritev virov je predolg" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Napaka pri pisanju glave v vsebinsko datoteko" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Napaka pri obdelavi vsebine %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 #, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" @@ -415,131 +425,131 @@ msgstr "" " -c=? Prebere podano datoteko z nastavitvami\n" " -o=? Nastavi poljubno nastavitveno monost" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Nobena izbira se ne ujema" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Nekatere datoteke manjkajo v skupini paketnih datotek '%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "ZP je pokvarjena, datoteka je preimenovana v %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "ZP je stara, poskuam nadgraditi %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." msgstr "" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Ni mogoe odprti datoteke ZP %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "Napaka pri postavitvi %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Arhiv nima nadzornega zapisa" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Ni mogoe najti kazalca" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "O: ni mogoe brati imenika %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "O: Ni mogoe nastaviti %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "O: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "N: Napake se sklicujejo na datoteko" -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "Ni mogoe razreiti %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "Hoja drevesa ni uspela" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "Ni mogoe odprti %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr " RazVei %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "Napaka pri branju povezave %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "Napaka pri odvezovanju %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Napaka pri povezovanju %s z %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Doseena meja RazVezovanja %sB.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Arhiv ni imel polja s paketom" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s nima prekrivnega vnosa\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Vzdrevalec %s je %s in ne %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " %s nima prekrivnega vnosa\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " %s nima prekrivnega vnosa\n" @@ -553,165 +563,165 @@ msgstr "Notranja napaka. Ni mogo msgid "realloc - Failed to allocate memory" msgstr "realloc - Napaka pri dodeljevanju prostora" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Ne morem odpreti %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Napano prekrivanje %s vrstica %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Napano prekrivanje %s vrstica %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Napano prekrivanje %s vrstica %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Napaka pri branju prekrite datoteke %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Neznan algoritem stiskanja '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Stisnjen izhod %s potrebuje niz stiskanja" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Ustvarjanje pipe IPC podprocesa ni uspelo" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "Ustvarjanje DATOTEKE* ni uspelo" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "Vejitev ni uspela" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "Otrok stiskanja" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "Notranja napaka. Ni mogoe ustvariti %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "Ni mogoe ustvariti podprocesa IPD" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "Ni mogoe izvesti stiskanja" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "program za dekompresijo" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "IO podprocesa/datoteke je spodletel" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "Med raunanjem MD5 ni mogoe brati" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "Napaka pri odvezovanju %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Ni mogoe preimenovati %s v %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "Napaka pri prevajanju regex - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "Naslednji paketi imajo nereene odvisnosti:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "vendar je paket %s nameen" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "vendar bo paket %s nameen" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "vendar se ga ne da namestiti" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "vendar je navidezen paket" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "vendar ni nameen" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "vendar ne bo nameen" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " ali" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "Naslednji NOVI paketi bodo nameeni:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "Naslednji novi paketi bodo ODSTRANJENI:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "Naslednji paketi so bili zadrani:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "Naslednji paketi bodo nadgrajeni:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "Naslednji paketi bodo POSTARANI:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "Naslednji zadrani paketi bodo spremenjeni:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (zaradi %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -720,144 +730,144 @@ msgstr "" "OPOZORILO: Naslednji kljuni paketi bodo odstranjeni.\n" "To NI priporoljivo, razen e natanno veste, kaj ponete." -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu nadgrajenih, %lu na novo nameenih, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu posodobljenih, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu postaranih, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ne popolnoma nameenih ali odstranjenih.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Popravljanje odvisnosti ..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " spodletelo." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Ni mogoe popraviti odvisnosti" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Ni mogoe pomanjati zbirke za nadgradnjo" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Opravljeno" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "e elite popraviti napake, poskusite pognati 'apt-get -f install'." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Nereene odvisnosti. Poskusite uporabiti -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "POZORO: Naslednjih paketov ni bilo mogoe avtenticirati!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Namestim te pakete brez prevejanje [y/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Nisem uspel avtenticirati nekaterih paketkov" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Prilo je do teav in -y je bil uporabljen brez --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Odstraniti je potrebno pakete, a je Odstranjevanje onemogoeno." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Notranja napaka pri dodajanju odklona" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "Ni mogoe zakleniti imenika za prenose" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Seznama virov ni mogoe brati." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Potrebno je dobiti %sB/%sB arhivov.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Potrebno je dobiti %sB arhivov.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Po odpakiranju bo uporabljenega %sB dodatnega prostora na disku.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po odpakiranju bo sproenega %sB prostora na disku.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Nimate dovolj prostora na %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "V %s je premalo prostora." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Izbrana je monost Samo preprosto, a to opravilo ni preprosto." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Da, naredi tako kot pravim!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -868,28 +878,28 @@ msgstr "" "Za nadaljevanje vnesite frazo '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "Prekini." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Ali elite nadaljevati [Y/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ni mogoe dobiti %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Prenos nekaterih datotek ni uspel" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "Prenos dokonan in uporabljen nain samo prenos" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -897,47 +907,47 @@ msgstr "" "Nekaterih arhivov ni mogoe dobiti. Poskusite uporabiti apt-get update ali --" "fix-missing." -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing in izmenjava medija trenutno nista podprta" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Ni mogoe popraviti manjkajoih paketov." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Prekinjanje namestitve." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Opomba: izbran %s namesto %s \n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s preskoen, ker je e nameen in ne potrebuje nadgradnje.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Paket %s ni nameen, zato ni odstranjen\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paket %s je navidezen in ga je priskrbel:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Nameeno]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Sami izberite paket, ki ga elite namestiti." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -948,49 +958,49 @@ msgstr "" "To ponavadi pomeni, da paket manjka, je zastaran ali\n" "pa je na voljo samo iz drugega vira.\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Kakorkoli, naslednji paketi ga nadomestijo:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Paket %s nima kandidata za namestitev" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Ponovna namestitev %s ni mona, ker ni moen prenos.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "Najnoveja razliica %s je e nameena.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Izdaje '%s' za '%s' ni mogoe najti" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Razliice '%s' za '%s' ni mogoe najti" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Izbrana razliica %s (%s) za %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Ukaz update ne potrebuje argumentov" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Imenika seznamov ni mogoe zakleniti" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -998,25 +1008,65 @@ msgstr "" "Nekaterih kazal ni mogoe prenesti, zato so preklicana, ali pa so " "uporabljena stareja." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Naslednji NOVI paketi bodo nameeni:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "Naslednji podatki vam bodo morda pomagali reiti teavo:" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Notranja napaka zaradi AllUpgrade." + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Ni mogoe najti paketa %s" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "Ni mogoe najti paketa %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Opomba: izbran %s namesto regex '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "vendar bo paket %s nameen" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Poskusite zagnati 'apt-get -f install', e elite popraviti:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1024,7 +1074,7 @@ msgstr "" "Nereene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali " "podajte reitev)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1035,7 +1085,7 @@ msgstr "" "nemogo poloaj, e uporabljate nestabilno izdajo pa, da nekateri zahtevani " "paketi e niso ustvarjeni ali preneeni iz Prihajajoe." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1045,130 +1095,141 @@ msgstr "" "preprosto ne da namestiti in je potrebno vloiti poroilo o hrou\n" "o tem paketu." -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Naslednji podatki vam bodo morda pomagali reiti teavo:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "Pokvarjeni paketi" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "Naslednji dodatni paketi bodo nameeni:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "Predlagani paketi:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "Priporoeni paketi:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "Preraunavanje nadgradnje ... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Spodletelo" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "Opravljeno" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega elite dobiti izorno kodo" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "Izvornega paketa za %s ni mogoe najti" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "Nimate dovolj prostora na %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potrebno je dobiti %sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "Dobi vir %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "Nekaterih arhivov ni mogoe dobiti." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Ukaz odpakiranja '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "Ukaz gradnje '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "Otroki proces ni uspel" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega elite preveriti odvisnosti " "za gradnjo" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni mogoe dobiti informacij o odvisnostih za gradnjo za %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "%s nima odvisnosti za gradnjo.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s odvisnosti za %s ni mogoe zadostiti, ker ni mogoe najti paketa %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1177,31 +1238,32 @@ msgstr "" "%s odvisnosti za %s ni mogoe zadostiti, ker nobena razliica paketa %s ne " "more zadostiti zahtevi po razliici" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Ni mogoe zadostiti %s odvisnosti za %s. Nameen paket %s je preve nov" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Ni mogoe zadostiti %s odvisnosti za %s. %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Odvisnostim za gradnjo %s ni mogoe zadostiti." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "Obdelava odvisnosti za gradnjo ni uspela" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "Podprti moduli:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1216,6 +1278,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1379,188 +1442,188 @@ msgstr "nad tem sporo msgid "Merging available information" msgstr "Spajanje informacij na voljo" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Ni mogoe ustvariti pip" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Ni mogoe izvesti gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Pokvarjen arhiv" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Kontrolna vsota tar ni uspela, arhiv je pokvarjen" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Neznan tip glave TAR %u, lan %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Napaen podpis arhiva" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Napaka pri branju glave lana arhiva" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Napana glava lana arhiva" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Arhiv je prekratek" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Glav arhiva ni mogoe brati" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode je poklical stabilno povezano vozlie" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Ni mogoe najti razprenega elementa!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Ni mogoe dodeliti odklona" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Notranja napaka v AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Poskuam prepisati odklon, %s -> %s in %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Dvojni setevek odklona %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Dvojnik datoteke z nastavitvami %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, fuzzy, c-format msgid "Failed to write file %s" msgstr "Napaka pri pisanju datoteke %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Napaka pri zapiranju datoteke %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Pot %s je predolga" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Odpakiranje %s ve kot enkrat" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Imenik %s je odklonjen" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Paket poskua pisati v taro odklona %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Pot odklona je predloga" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Imenik %s je bil zamenjan z ne-imenikom" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Iskanje vozlia v njegovem razprenem vedru ni uspelo" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Pot je predolga" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Prepii zadetek paketa brez vnosa razliice za %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Ni mogoe brati %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Ni mogoe doloiti %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Odstranitev %s ni uspela" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Ni mogoe ustvariti %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Doloitev %sinfo ni uspela" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "Podatki in zaasni imeniki morajo biti v istem datotenem sistemu" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "Branje seznama paketov" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Premik v skrbnikov imenik %sinfo ni uspel" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "Notranja napaka pri sprejemanju imena paketa" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Branje seznama datotek" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1570,77 +1633,77 @@ msgstr "" "Odpiranje datoteke s seznamom '%sinfo/%s' ni uspelo. e ne morete povrniti " "datoteke, jo izpraznite in takoj ponovno namestite enako razliico paketa!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Branje datoteke s seznamom %sinfo/%s ni uspelo" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Notranja napaka pri sprejemanju vozlia" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Odpiranje datoteke z odklonom %sdiversions ni uspelo" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Datoteka z odklonom je pokvarjena" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "Napana vrstica v datoteki z odklonom: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Notranja napaka pri dodajanju odklona" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Najprej se mora izvesti predpomnilnik paketov" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Napaka pri iskanju paketa: glava, odmik %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Napana izbira ConfFile v datoteki stanja. Odmik %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Napaka pri razlenjevanju MD5. Odmik %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "To ni veljaven arhiv DEB. Manjka lan '%s'." -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "To ni veljaven arhiv DEB. Manjka lan '%s' ali '%s'." -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "Ni mogoe spremeniti v %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "Notranja napaka. Ni mogoe najti lana." -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "Ni mogoe najti veljavne nadzorne datoteka" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "Nadzorne datoteke ni mogoe razleniti" @@ -1676,11 +1739,12 @@ msgid "File not found" msgstr "Datoteke ni mogoe najti" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Doloitev ni uspela" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Nastavitev asa spremembe ni uspela" @@ -1742,7 +1806,7 @@ msgstr "Povezava potekla" msgid "Server closed the connection" msgstr "Strenik je zaprl povezavo" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "Napaka pri branju" @@ -1754,7 +1818,7 @@ msgstr "Odgovor je prekora msgid "Protocol corruption" msgstr "Okvara protokola" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "Napaka pri pisanju" @@ -1808,7 +1872,7 @@ msgstr "Povezava podatkovne vti msgid "Unable to accept connection" msgstr "Ni mogoe sprejeti povezave" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Teava pri razprevanju datoteke" @@ -1835,39 +1899,39 @@ msgstr "Poizvedba" msgid "Unable to invoke " msgstr "Ni mogoe zagnati " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Povezovanje z %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Ni mogoe ustvariti vtinice za %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Ni mogoe zaeti povezave z %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Ni se mogoe povezati z %s:%s (%s). Povezava potekla." -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Ni se mogoe povezati z %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Povezujem se z %s" @@ -1940,428 +2004,448 @@ msgstr "Ni mogo msgid "Read error from %s process" msgstr "Napaka pri branju iz procesa %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "akanje na glave" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Dobljena je ena vrstica glave preko %u znakov" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Napana vrstica glave" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Strenik HTTP je poslal napano glavo odgovora" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Strenik HTTP je poslal glavo z napano dolino vsebine" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Strenik HTTP je poslal glavo z napanim obsegom vsebine" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Ta strenik HTTP ima pokvarjen obseg podpore" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Neznana oblika datuma" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Izbira ni uspela" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "as za povezavo se je iztekel" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Napaka pri pisanju v izhodno datoteko" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Napaka pri branju oddaljene in zaprte povezave s strenika " -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Napaka pri branju s strenika" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Napani podatki glave" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Povezava ni uspela" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Notranja napaka" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "mmap prazne datoteke ni mogo" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Ni mogoe narediti mmap %lu bajtov" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "Izbira %s ni mogoe najti" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ne-prepoznan tip okrajave: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "Odpiranje nastavitvene datoteke %s" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "Vrstica %d je predolga (najve %d)" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Skladenjska napaka %s:%u: Blok se zane brez imena." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Skladenjska napaka %s:%u: Nepravilna znaka." -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Skladenjska napaka %s:%u: Dodatno smetje za vrednostjo." -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Skladenjska napaka %s:%u: Napotki se lahko izvedejo le na vrhnjem nivoju." -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Skladenjska napaka %s:%u: Preve ugnezdenih vkljuitev." -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Skladenjska napaka %s:%u: Vkljuen od tu." -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Skladenjska napaka %s:%u: Nepodprt napotek '%s'" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Skladenjska napaka %s:%u: Dodatno smetje na koncu datoteke" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s ... Napaka!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... Narejeno" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Monost ukazne vrstice '%c' [iz %s] ni poznana." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "Ne razumem monosti ukazne vrstice %s" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Monost ukazne vrstice %s ni boolean" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Monost %s zahteva argument." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Monost %s: Podrobnosti predmeta za nastavitve potrebujejo =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Monost %s zahteva celotevilski argument, ne '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Monost '%s' je predolga" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Pomena %s ni mogoe razumeti, poskusite pravilno ali napano." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Napana operacija %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Ni mogoe doloiti priklopne toke %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Ni mogoe spremeniti v %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "Ni mogoe doloiti CD-ROM-a" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Brez uporabe zaklepanja za zaklenjeno datoteko samo za branje %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "Ni mogoe odprti zaklenjene datoteke %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Brez uporabe zaklepanja za datoteko %s, priklopljeno z NTFS" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "Ni mogoe dobiti zaklenjene datoteke %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "akal, a %s ni bil tam" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Napaka pri razlenjenosti podprocesa %s." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s je vrnil kodo napake (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s se je nepriakovano zakljuil" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "Ne morem odpreti datoteke %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "berem, e vedno %lu za branje, a nobeden ostal" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "piem, e vedno %lu za pisanje, a ni mogoe" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "Teava pri zapiranju datoteke" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "Teava pri odvezovanju datoteke" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "Teava pri usklajevanju datoteke" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Prazen predpomnilnik paketov" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Datoteka s predpomnilnikom paketov je pokvarjena" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Razliica datoteke s predpomnilnikom paketov ni ustrezna" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Ta APT ne podpira sistema razliic '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Predpomnilnik paketov je bil zgrajen za drugano arhitekturo" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Odvisen od" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Predodvisnost" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Priporoa" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Priporoa" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "V sporu z" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Zamenja" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Zastarani" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "pomembno" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "obvezno" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standardno" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "izbirno" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "dodatno" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "Gradnja drevesa odvisnosti" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "Razliice kandidatov" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "Ustvarjanje odvisnosti" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "Spajanje informacij na voljo" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Ni mogoe odprti %s" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Napaka pri pisanju datoteke %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Ni mogoe razleniti paketne datoteke %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ni mogoe razleniti paketne datoteke %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Napana vrstica %lu v seznamu virov %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Napana vrstica %lu v seznamu virov %s (distribucija)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Napana vrstica %lu v seznamu virov %s (razlenitev URI)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Napana vrstica %lu v seznamu virov %s (absolutna distribucija)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Napana vrstica %lu v seznamu virov %s (razlenitev distribucije)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Odpiram %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Vrstica %u v seznamu virov %s je predolga." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Napana vrstica %u v seznamu virov %s (vrsta)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Vrsta '%s' v vrstici %u v seznamu virov %s ni znana" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Napana vrstica %u v seznamu virov %s (ID ponudnika)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2372,19 +2456,19 @@ msgstr "" "zanke spora/predodvisnosti. To je ponavadi slabo, toda e zares elite " "odstranitev, vkljuite monost APT::Force-LoopBreak." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Vrsta datoteke s kazalom '%s' ni podprta" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Paket %s mora biti ponovno nameen, vendar ne morem najti arhiva zanj." -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2392,43 +2476,43 @@ msgstr "" "Napaka. pkgProblemResolver::Napake pri razreitvi, ki so jih morda " "povzroili zadrani paketi." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "Ni mogoe popraviti teav. Imate zadrane pakete." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Manjka imenik s seznami %spartial." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Manjka imenik z arhivi %spartial." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, fuzzy, c-format msgid "Retrieving file %li of %li" msgstr "Branje seznama datotek" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Ni mogoe najti gonilnika metod %s." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Metoda %s se ni zaela pravilno" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, fuzzy, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -2436,138 +2520,154 @@ msgstr "" " '%s'\n" "v enoto '%s' in pritisnite enter\n" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketni sistem '%s' ni podprt" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "Ni mogoe ugotoviti ustrezne vrste paketnega sistema" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Ni mogoe doloiti %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "V sources.list morate vstaviti URI-je z viri" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "Ni mogoe odprti ali razleniti seznama paketov ali datoteke stanja." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "e elite odpraviti teave, poskusite zagnati apt-get update." -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Napaen zapis v datoteki z nastavitvami. Ni glave paketa" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Ni mogoe razumeti vrste zaponke %s" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Prioriteta zaponke ni doloena ali pa je ni." -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Predpomnilnik ima neustrezen sistem razliic" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Prilo je do napake pri obdelavi %s (Nov paket)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Prilo je do napake pri obdelavi %s (Uporabi paket 1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Prilo je do napake pri obdelavi %s (Nova razliica datoteke 1)" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Prilo je do napake pri obdelavi %s (Uporabi paket 2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Prilo je do napake pri obdelavi %s (Nova razliica datoteke 1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Prilo je do napake pri obdelavi %s (Nova razliica 1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Prilo je do napake pri obdelavi %s (Uporabi paket 3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Prilo je do napake pri obdelavi %s (Nova razliica 2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Prilo je do napake pri obdelavi %s (Nova razliica datoteke 1)" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Uau, presegli ste tevilo imen paketov, ki jih zmore APT." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Uau, presegli ste tevilo razliic, ki jih zmore APT." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Uau, presegli ste tevilo razliic, ki jih zmore APT." + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Uau, presegli ste tevilo odvisnosti, ki jih zmore APT." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Prilo je do napake pri obdelavi %s (Najdi paket)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Prilo je do napake pri obdelavi %s (Zberi dobavitelje datotek)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Paketa %s %s ni bilo mogoe najti med obdelavo odvisnosti" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "Ni mogoe doloiti seznama izvornih paketov %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "Zbiranje dobaviteljev datotek" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "Napaka IO pri shranjevanju predpomnilnika virov" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "preimenovanje spodletelo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Neujemanje vsote MD5" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2576,7 +2676,7 @@ msgstr "" "Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono " "popraviti ta paket (zaradi manjkajoega arhiva)." -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2585,7 +2685,7 @@ msgstr "" "Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono " "popraviti ta paket." -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2593,7 +2693,7 @@ msgstr "" "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket " "%s." -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Neujemanje velikosti" @@ -2602,7 +2702,7 @@ msgstr "Neujemanje velikosti" msgid "Vendor block %s contains no fingerprint" msgstr "Ponudnikov blok %s ne vsebuje podpisa" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2611,52 +2711,54 @@ msgstr "" "Uporabljam CD-ROM priklopno toko %s\n" "Priklapljam CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "Identificiram.." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "Shranjena oznaka: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Uporabljam CD-ROM priklopno toko %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "Odklapljam CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "akam na medij...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "Priklapljam CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "Preverjam medij za datoteke s kazalom..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "Nael sem %i kazal paketov, %i kazal izvornih paketov in %i podpisov\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "Shranjena oznaka: %s \n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "To ni veljavno ime, poskusite e enkrat.\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2665,95 +2767,100 @@ msgstr "" "Ta medij se imenuje: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Kopiranje seznama paketov..." -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Piem nov seznam virov\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Izvorni vnosi za ta medij so:\n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "Odklapljam CD-ROM..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Zapisal %i zapisov.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Zapisal %i zapisov z %i manjkajoimi datotekami.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Zapisal %i zapisov z %i neujemajoimi datotekami.\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "Zapisal %i zapisov z %i manjkajoimi datotekami in %i neujemajoimi " "datotekami.\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, fuzzy, c-format msgid "Preparing %s" msgstr "Odpiram %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Odpiram %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Odpiranje nastavitvene datoteke %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, fuzzy, c-format msgid "Configuring %s" msgstr "Povezujem se z %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, fuzzy, c-format msgid "Installed %s" msgstr " Nameen: " -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, fuzzy, c-format msgid "Removing %s" msgstr "Odpiram %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, fuzzy, c-format msgid "Removed %s" msgstr "Priporoa" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Odpiranje nastavitvene datoteke %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Odstranitev %s ni uspela" +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Ne morem odpreti datoteke %s" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Povezava se je prezgodaj zaprla" @@ -2761,10 +2868,6 @@ msgstr "Povezava se je prezgodaj zaprla" #~ msgid "File date has changed %s" #~ msgstr "Datum datoteke se je spremenil %s" -#, fuzzy -#~ msgid "Could not patch file" -#~ msgstr "Ne morem odpreti datoteke %s" - #~ msgid "Reading file list" #~ msgstr "Branje seznama datotek" diff --git a/po/sv.po b/po/sv.po index 66863c0de..21c325289 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2006-08-18 15:45+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -15,146 +15,156 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Paket %s version %s har ett beroende som inte kan tillfredsstllas:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Kunde inte lokalisera paket %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "Totalt antal paketnamn: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Normala paket: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Rent virtuella paket: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Enkelt virtuella paket: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Blandat virtuella paket: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Saknade: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Totalt antal olika versioner: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Totalt antal olika versioner: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Totalt antal beroenden: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Totalt antal version/filrelationer: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Totalt antal version/filrelationer: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Totalt antal tillhandahllningsmarkeringar: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Totalt antal skmnsterstrngar: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Totalt utrymme fr versionsberoenden: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Totalt bortkastat utrymme: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Totalt utrymme som kan redogras fr: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Paketfilen %s r inte synkroniserad." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Du mste ange exakt ett mnster" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Inga paket hittades" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "\"Package\"-filer:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cachen r ur synk, kan inte korsreferera en paketfil" # Prioritet fljt av URI -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Fastnlade paket:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(ej funnen)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Installerad: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(ingen)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Kandidat: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Paketnlning: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Versionstabell:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s fr %s %s kompilerad den %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -301,7 +311,7 @@ msgstr "" " -c=? Ls denna instllningsfil.\n" " -o=? Ange valfri instllningsflagga. T.ex -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "Kunde inte skriva till %s" @@ -310,31 +320,31 @@ msgstr "Kunde inte skriva till %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kan inte ta reda p debconfs version. r debconf installerat?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Listan ver filtillgg fr Packages r fr lng" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "Fel vid behandling av katalogen %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Listan ver filtillgg fr Sources r fr lng" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Fel vid skrivning av huvud till innehllsfil" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Fel vid behaldning av innehllet %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -415,26 +425,26 @@ msgstr "" " -c=? Ls denna konfigurationsfil\n" " -o=? Ange valfri instllningsflagga" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Inga val trffades" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Ngra filer saknas i paketfilsgruppen \"%s\"" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB var skadad, filen omdpt till %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB r fr gammal, frsker uppgradera %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." @@ -442,109 +452,109 @@ msgstr "" "DB-formatet r ogiltigt. Ta bort och terskapa databasen om du uppgraderar " "frn en ldre version av apt." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Kunde inte ppna DB-filen %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "Misslyckades med att ta status p %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Arkivet har ingen styrpost" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Kunde inte f tag i ngon markr" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "V: Kunde inte lsa katalogen %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "V: Kunde inte ta status p %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "F: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "V: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "F: Felen gller filen " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "Misslyckades med att sl upp %s" # ??? -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "Trdvandring misslyckades" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "Misslyckades med att ppna %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr " Avlnka %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "Misslyckades med att lsa lnk %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "Misslyckades med att lnka ut %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Misslyckades med att lnka %s till %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Avlnkningsgrns p %sB ndd.\n" # Flt vid namn "Package" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Arkivet har inget package-flt" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen post i override-filen\n" # parametrar: paket, ny, gammal -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " ansvarig fr %s r %s ej %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr " %s har ingen kllsidosttningspost\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s har heller ingen binr sidosttningspost\n" @@ -558,167 +568,167 @@ msgstr "Internt fel, kunde inta hitta delen %s" msgid "realloc - Failed to allocate memory" msgstr "realloc - Misslyckades med att allokera minne" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Kunde inte ppna %s" # parametrar: filnamn, radnummer -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Felaktig override %s rad %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Felaktig override %s rad %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Felaktig override %s rad %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Misslyckades med att lsa sidosttningsfilen %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Oknd komprimeringsalgoritm \"%s\"" # ??? -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Komprimerad utdata %s behver en komprimeringsuppsttning" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Misslyckades med att skapa IPC-rr till underprocess" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "Misslyckades med att skapa FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "Misslyckades med att grena process" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "Barnprocess fr komprimering" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "Internt fel, misslyckades med att skapa %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "Misslyckades med att skapa underprocess-IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "Misslyckades med att starta packare " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "uppackare" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "Barnprocessen misslyckades" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "Misslyckades med att lsa vid berkning av MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "Problem med att lnka ut %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Misslyckades med att byta namn p %s till %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "Fel vid tolkning av reguljrt uttryck - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "Fljande paket har beroenden som inte kan tillfredsstllas:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "men %s r installerat" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "men %s kommer att installeras" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "men det kan inte installeras" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "men det r ett virtuellt paket" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "men det r inte installerat" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "men det kommer inte att installeras" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " eller" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "Fljande NYA paket kommer att installeras:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "Fljande paket kommer att TAS BORT:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "Fljande paket har hllits tillbaka:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "Fljande paket kommer att uppgraderas:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "Fljande paket kommer att NEDGRADERAS:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "Fljande hllna paket kommer att ndras:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (p grund av %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -726,146 +736,146 @@ msgstr "" "VARNING: Fljande systemkritiska paket kommer att tas bort\n" "Detta br INTE gras svida du inte vet exakt vad du gr!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu uppgraderade, %lu nyinstallerade, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu ominstallerade, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu nedgraderade, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu att ta bort och %lu ej uppgraderade.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu ej helt installerade eller borttagna.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Rttar till beroenden...." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " misslyckades." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Kunde inte rtta till beroenden" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Kunde inte minimera uppgraderingsuppsttningen" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Frdig" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" "Du kan mjligen rtta till dessa genom att kra \"apt-get -f install\"." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "Otillfredsstllda beroenden. Frsk med -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "VARNING: Fljande paket kunde inte autentiseras!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Autentiseringsvarning sidosatt.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Installera dessa paket utan verifiering [j/N]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Ngra av paketen kunde inte autentiseras" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Problem har uppsttt och -y anvndes utan --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Internt fel. InstallPackages kallades upp med brutna paket!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Paket mste tas bort men \"Remove\" r inaktiverat." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Internt fel. Sorteringen frdigstlldes inte" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "Kunde inte lsa hmtningskatalogen." -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Listan ver kllor kunde inte lsas." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Konstigt.. storlekarna stmde inte verens, skicka e-post till apt@packages." "debian.org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Behver hmta %sB/%sB arkiv.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Behver hmta %sB arkiv.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Efter uppackning kommer %sB ytterligare diskutrymme att anvndas.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Efter uppackning kommer %sB frigras p disken.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunde inte lsa av ledigt utrymme i %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Du har inte tillrckligt ledigt utrymme i %s" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "\"Trivial Only\" angavs, men detta r inte en trivial handling." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Ja, gr som jag sger!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -877,28 +887,28 @@ msgstr "" " ?] " # Visas d man svarar nej -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "Avbryter." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Vill du fortstta [J/n]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Misslyckades med att hmta %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Misslyckades med att hmta vissa filer" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "Hmtningen frdig i \"endast-hmta\"-lge" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -906,48 +916,48 @@ msgstr "" "Vissa arkiv kunte inte hmtas. Prva eventuellt \"apt-get update\" eller med " "--fix-missing." -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing och mediabyte stds inte nnu" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Kunde inte rtta till saknade paket." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Avbryter installationen." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Observera, vljer %s istllet fr %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Hoppar ver %s, det r redan installerat och uppgradering har inte valts.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Paketet %s r inte installerat, s tas inte bort\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paketet %s r ett virtuellt paket som tillhandahlls av:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Installerat]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Du br explicit ange ett att installera." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -958,49 +968,49 @@ msgstr "" "Detta betyder vanligen att paketet saknas, har blivit frldrat eller\n" "bara r tillgngligt frn andra kllor\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Dock kan fljande paket erstta det:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Paketet %s har ingen installationskandidat" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Ominstallation av %s r inte mjlig, det kan inte hmtas.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s r redan den senaste versionen.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Utgvan \"%s\" fr \"%s\" hittades inte" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version \"%s\" fr \"%s\" hittades inte" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Vald version %s (%s) fr %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Uppdateringskommandot tar inga argument" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Kunde inte lsa listkatalogen" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1008,26 +1018,66 @@ msgstr "" "Vissa indexfiler kunde inte hmtas, de har ignorerats eller s har de gamla " "anvnts istllet." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Fljande NYA paket kommer att installeras:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "Fljande information kan vara till hjlp fr att lsa situationen:" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Internt fel, problemlsaren brt snder saker" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internt fel, AllUpgrade frstrde ngot" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Kunde inte hitta paketet %s" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "Kunde inte hitta paketet %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Observera, vljer %s fr regex \"%s\"\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "men %s kommer att installeras" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Du kan mjligen rtta till detta genom att kra \"apt-get -f install\":" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1035,7 +1085,7 @@ msgstr "" "Otillfredsstllda beroenden. Frsk med \"apt-get -f install\" utan paket " "(eller ange en lsning)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1047,7 +1097,7 @@ msgstr "" "distributionen, att ngra krvda paket nnu inte har skapats eller\n" "lagts in frn \"Incoming\"." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1057,119 +1107,130 @@ msgstr "" "helt enkelt inte kan installeras och att en felrapport om detta br\n" "skrivas." -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Fljande information kan vara till hjlp fr att lsa situationen:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "Trasiga paket" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "Fljande ytterligare paket kommer att installeras:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "Freslagna paket:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "Rekommenderade paket:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "Berknar uppgradering... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Misslyckades" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "Frdig" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "Internt fel, problemlsaren brt snder saker" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "Du mste ange tminstone ett paket att hmta kllkod fr" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunde inte hitta ngot kllkodspaket fr %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar ver redan hmtad fil \"%s\"\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har inte tillrckligt ledigt utrymme i %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Behver hmta %sB/%sB kllkodsarkiv.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Behver hmta %sB kllkodsarkiv.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "Hmtar kllkod %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "Misslyckades med att hmta vissa arkiv." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Packar inte upp redan redan uppackad kllkod i %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uppackningskommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Kontrollera att paketet \"dpkg-dev\" r installerat.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggkommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "Barnprocessen misslyckades" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "Du mste ange tminstone ett paket att inhmta byggberoenden fr" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunde inte hmta byggberoendeinformation fr %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "%s har inga byggberoenden.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1177,7 +1238,7 @@ msgid "" msgstr "" "%s-beroendet p %s kan inte tillfredsstllas eftersom paketet %s inte hittas" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1186,32 +1247,33 @@ msgstr "" "%s-beroendet p %s kan inte tillfredsstllas eftersom inga tillgngliga " "versioner av paketet %s uppfyller versionskraven" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Misslyckades med att uppfylla %s-beroendet fr %s: Det installerade paketet %" "s r fr nytt" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Misslyckades med att uppfylla %s-beroendet fr %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggberoenden fr %s kunde inte uppfyllas." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "Kunde inte hantera byggberoenden" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "Moduler som stds:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1226,6 +1288,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1393,191 +1456,191 @@ msgstr "meddelande msgid "Merging available information" msgstr "Lgger in tillgnglighetsinformation" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Misslyckades med att skapa rr" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Misslyckades med att kra gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Frdrvat arkiv" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Tar-kontrollsumma misslyckades, arkiv trasigt" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Oknd TAR-huvudtyp %u, del %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Ogiltig arkivsignatur" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Misslyckades med att lsa huvud fr arkivdel" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Ogiltigt arkivdelshuvud" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Arkivet r fr kort" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Misslyckades med att lsa arkivhuvuden" # noden har inte ngon lnk till nsta paket -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode anropat p olnkad nod" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Misslyckades med att hitta hash-element!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Misslyckades med att allokera omdirigering" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Internt fel i AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Frsker skriva ver en omdirigering, %s -> %s och %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Omdirigering %s -> %s inlagd tv gnger" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Duplicerad konfigurationsfil %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Misslyckades med att skriva filen %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Misslyckades med att stnga filen %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Skvgen %s r fr lng" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Packar upp %s flera gnger" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Katalogen %s r omdirigerad" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Paketet frsker skriva till omdirigeringsmlet %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Omdirigeringsskvgen r fr lng" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Katalogen %s erstts av en icke-katalog" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Misslyckades med att hitta noden i sin hashkorg" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Skvgen r fr lng" # ??? -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Skriver ver pakettrff utan version fr %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Filen %s/%s skriver ver den i paketet %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Kunde inte lsa %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Kunde inte ta status p %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Misslyckades med att ta bort %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Kunde inte skapa %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Kunde inte ta status p %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "Katalogerna info och temp mste ligga p samma filsystem" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "Lser paketlistor" # Felmeddelande fr misslyckad chdir -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Kunde inte g till adminkatalogen %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "Internt fel nr namn p Package-fil skulle hmtas" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Lser fillista" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1587,78 +1650,78 @@ msgstr "" "Misslyckades med att ppna listfilen \"%sinfo/%s\". Om du inte kan terskapa " "filen, skapa en tom och installera omedelbart om samma version av paketet!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Misslyckades med att lsa listfilen %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Internt fel nr en nod skulle hmtas" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Misslyckades med att ppna omdirigeringsfilen %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Omdirigeringsfilen r trasig" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "Felaktig rad i omdirigeringsfilen: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Internt fel nr en omdirigering skulle lggas till" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Paketcachen mste ha initierats frst" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Misslyckades med att hitta Package:-huvud, position %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Felaktig ConfFile-sektion i statusfilen. Position %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Fel vid tolkning av MD5. Offset %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Detta r inte ett giltigt DEB-arkiv, delen \"%s\" saknas" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "Detta r inte ett giltigt DEB-arkiv, bde \"%s\" och \"%s\" saknas" # chdir -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "Kunde inte g till %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "Internt fel, kunde inte hitta del" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "Misslyckades med att hitta en giltig control-fil" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "Kunde inte tolka control-filen" @@ -1693,11 +1756,12 @@ msgid "File not found" msgstr "Filen ej funnen" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Kunde inte ta status" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Misslyckades stta modifieringstid" @@ -1759,7 +1823,7 @@ msgstr "Inget svar p msgid "Server closed the connection" msgstr "Servern stngde anslutningen" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "Lsfel" @@ -1771,7 +1835,7 @@ msgstr "Ett svar spillde bufferten." msgid "Protocol corruption" msgstr "Protokollet frdrvat" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "Skrivfel" @@ -1825,7 +1889,7 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgr msgid "Unable to accept connection" msgstr "Kunde inte ta emot anslutning" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem med att lgga filen till hashtabellen" @@ -1854,40 +1918,40 @@ msgid "Unable to invoke " msgstr "Kunde inte starta " # Felmeddelande fr misslyckad chdir -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Ansluter till %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" # [f]amilj, [t]yp, [p]rotokoll -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Kunde inte skapa uttag (socket) fr %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Kunde inte pbrja anslutning till %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Kunde inte ansluta till %s:%s (%s), tog fr lng tid" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Kunde inte ansluta till %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Ansluter till %s" @@ -1965,431 +2029,451 @@ msgstr "Kunde inte msgid "Read error from %s process" msgstr "Lsfel p %s-processen" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Vntar p huvuden" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Fick en ensam huvudrad p %u tecken" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Trasig huvudrad" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Http-servern snde ett ogiltigt svarshuvud" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Http-servern snde ett ogiltigt Content-Length-huvud" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Http-servern snde ett ogiltigt Content-Range-huvud" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Denna http-servers std fr delvis hmtning fungerar inte" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Oknt datumformat" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "\"Select\" misslyckades" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Tidsgrnsen fr anslutningen nddes" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Fel vid skrivning till utdatafil" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Fel vid skrivning till fil" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Fel vid skrivning till filen" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Fel vid lsning frn server: Andra nden stngde frbindelsen" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Fel vid lsning frn server" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Trasigt data i huvud" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Anslutning misslyckades" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Internt fel" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "Kan inte utfra mmap p en tom fil" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Kunde inte utfra mmap p %lu byte" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "Valet %s ej funnet" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Oknd typfrkortning: \"%c\"" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "ppnar konfigurationsfil %s" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "Rad %d fr lng (max %d)" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaxfel %s:%u: Block brjar utan namn." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaxfel %s:%u: Felformat mrke" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaxfel %s:%u: verfldigt skrp efter vrde" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntaxfel %s:%u: Direktiv kan endast utfras p toppnivn" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaxfel %s:%u: Fr mnga nstlade inkluderingar" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaxfel %s:%u: Inkluderad hrifrn" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaxfel %s:%u: Direktivet \"%s\" stds ej" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaxfel %s:%u: verfldigt skrp vid filens slut" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Fel!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... Frdig" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Kommandoradsflagga \"%c\" [frn %s] r ej knd." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "Frstr inte kommandoradsflaggan %s" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Kommandoradsflaggan %s r inte boolsk" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Flaggan %s krver ett vrde." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Flagga %s: Den angivna konfigurationsposten mste innehlla =." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Flaggan %s krver ett heltalsvrde, inte \"%s\"" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Flaggan \"%s\" r fr lng" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Frstr ej %s, frsk med \"true\" eller \"false\"." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Felaktig operation %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Kunde inte ta status p monteringspunkt %s." # Felmeddelande fr misslyckad chdir -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Kunde inte g till %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "Kunde inte ta status p cd-romen." -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Anvnder inte lsning fr skrivskyddad lsfil %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "Kunde inte ppna lsfilen %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Anvnder inte lsning fr nfs-monterad lsfil %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "Kunde inte erhlla lset %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Vntade, p %s men den fanns inte dr" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprocessen %s rkade ut fr ett segmenteringsfel." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprocessen %s returnerade en felkod (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprocessen %s avslutade ovntat" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "Kunde inte ppna filen %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "lsning, har fortfarande %lu att lsa men inget r kvar" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "skrivning, har fortfarande %lu att skriva men kunde ej" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "Problem med att stnga filens" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "Problem med att lnka ut filen" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "Problem med att synka filen" # Felmeddelande -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Paketcachen r tom" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Paketcachefilen r trasig" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Paketcachefilens version r inkompatibel" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Denna APT stder inte versionssystemet \"%s\"" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Paketcachen byggdes fr en annan arkitektur" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Beror" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Beror i frvg" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Freslr" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Rekommenderar" # "Konfliktar"? -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "I konflikt med" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Erstter" # "Frldrar"? -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Gr frldrad" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "viktigt" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "krvt" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "normalt" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "valfri" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "Bygger beroendetrd" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "Kandiderande versioner" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "Beroendegenerering" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "Lgger in tillgnglighetsinformation" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Misslyckades med att ppna %s" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Misslyckades med att skriva filen %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Kunde inte tolka paketfilen %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Kunde inte tolka paketfilen %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Rad %lu i kllistan %s har fel format (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Rad %lu i kllistan %s har fel format (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Rad %lu i kllistan %s har fel format (URI-tolkning)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Rad %lu i kllistan %s har fel format (Absolut dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Rad %lu i kllistan %s har fel format (dist-tolkning)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "ppnar %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Rad %u fr lng i kllistan %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Rad %u i kllistan %s har fel format (typ)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ \"%s\" r oknd p rad %u i listan ver kllor %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Rad %u i kllistan %s har fel format (leverantrs-id)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2401,19 +2485,19 @@ msgstr "" "Detta r oftast en dlig id, men om du verkligen vill gra det kan du " "aktivera flaggan \"APT::Force-LoopBreak\"." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Indexfiler av typ \"%s\" stds inte" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Paketet %s mste installeras om, men jag kan inte hitta ngot arkiv fr det." -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2421,183 +2505,199 @@ msgstr "" "Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero p " "hllna paket." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "Kunde inte korrigera problemen, du har hllt trasiga paket." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Listkatalogen %spartial saknas." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Arkivkatalogen %spartial saknas." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Hmtar fil %li av %li (%s terstr)" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "Hmtar fil %li av %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Metoddrivrutinen %s kunde inte hittas." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Metoden %s startade inte korrekt" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Mata in skivan med etiketten \"%s\" i enheten \"%s\" och tryck Enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketsystemet \"%s\" stds inte" # -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "Kunde inte avgra en lmpligt paketsystemstyp" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Kunde inte ta status p %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Du mste lgga till ngra \"source\"-URI:er i din sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "Paketlistan eller statusfilen kunde inte tolkas eller ppnas." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "Du kan mjligen rtta till problemet genom att kra \"apt-get update\"" # "Package" r en strng i instllningsfilen -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Ogiltig post i instllningsfilen, \"Package\"-huvud saknas" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Frstod inte nltypen %s" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Prioritet ej angiven (eller noll) fr nl" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Cachen har ett inkompatibelt versionssystem" # NewPackage etc. r funktionsnamn -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Fel uppstod vid hantering av %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Fel uppstod vid hantering av %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Fel uppstod vid hantering av %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Fel uppstod vid hantering av %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Fel uppstod vid hantering av %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Fel uppstod vid hantering av %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Fel uppstod vid hantering av %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Fel uppstod vid hantering av %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Fel uppstod vid hantering av %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Grattis, du verskred antalet paketnamn denna APT kan hantera." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Grattis, du verskred antalet versioner denna APT kan hantera." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Grattis, du verskred antalet versioner denna APT kan hantera." + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Grattis, du verskred antalet beroenden denna APT kan hantera." # NewPackage etc. r funktionsnamn -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Fel uppstod vid hantering av %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Fel uppstod vid hantering av %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Paketet %s %s hittades inte nr filberoenden hanterades" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kunde inte ta status p kllkodspaketlistan %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "Samlar filberoenden" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "In-/utfel vid lagring av kllcache" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "namnbyte misslyckades, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "MD5-kontrollsumma stmmer inte" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "Det finns ingen publik nyckel tillgnglig fr fljande nyckel-id:n:\n" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2606,7 +2706,7 @@ msgstr "" "Jag kunde inte lokalisera ngon fil fr paketet %s. Detta kan betyda att du " "manuellt mste reparera detta paket (p grund av saknad arkitektur)." -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2615,13 +2715,13 @@ msgstr "" "Jag kunde inte lokalisera ngon fil fr paketet %s. Detta kan betyda att du " "manuellt mste reparera detta paket." -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Paketindexfilerna r trasiga. Inget \"Filename:\"-flt fr paketet %s." -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Storleken stmmer inte" @@ -2630,7 +2730,7 @@ msgstr "Storleken st msgid "Vendor block %s contains no fingerprint" msgstr "Leverantrsblock %s saknar fingeravtryck" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2639,52 +2739,54 @@ msgstr "" "Anvnder cd-rom-monteringspunkt %s\n" "Monterar cd-rom\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "Identifierar.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "Etikett: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Anvnder cd-rom-monteringspunkt %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "Avmonterar cd-rom\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "Vntar p skiva...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "Monterar cd-rom...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "Sker efter indexfiler p disken...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "Hittade %i paketindex, %i kllkodsindex och %i signaturer\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "Etikett: %s \n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "Namnet r ogiltigt, frsk igen.\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2693,93 +2795,97 @@ msgstr "" "Denna skiva heter: \n" "\"%s\"\n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Kopierar paketlistor..." -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Skriver ny kllista\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Poster i kllistan fr denna skiva:\n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "Avmonterar cd-rom..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Skrev %i poster.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Skrev %i poster med %i saknade filer.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Skrev %i poster med %i filer som inte stmmer\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i saknade filer och %i filer som inte stmmer\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Frbereder %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Packar upp %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Frbereder konfigurering av %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Konfigurerar %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "Installerade %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Frbereder fr borttagning av %s" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "Tog bort %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Frbereder att ta bort hela %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "Tog bort hela %s" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "Kunde inte lgga p programfix p filen" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Frbindelsen stngdes i frtid" @@ -2788,9 +2894,6 @@ msgstr "F #~ msgid "File date has changed %s" #~ msgstr "Fildatumet har ndrats %s" -#~ msgid "Could not patch file" -#~ msgstr "Kunde inte lgga p programfix p filen" - #~ msgid "Reading file list" #~ msgstr "Lser fillista" diff --git a/po/tl.po b/po/tl.po index 07b1702fa..1b5a6f37b 100644 --- a/po/tl.po +++ b/po/tl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" @@ -19,145 +19,155 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Paketeng %s bersyon %s ay may kulang na dep:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Hindi mahanap ang paketeng %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "Kabuuan ng mga Pakete : " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Normal na Pakete: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Purong Birtwual na Pakete: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Nag-iisang Birtwal na Pakete: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Halong Birtwal na Pakete: " -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Kulang/Nawawala: " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Kabuuan ng Natatanging mga Bersyon: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Kabuuan ng Natatanging mga Bersyon: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Kabuuan ng mga Dependensiya: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Kabuuan ng ugnayang Ber/Talaksan: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Kabuuan ng ugnayang Ber/Talaksan: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Kabuuan ng Mapping ng Provides: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Kabuuan ng Globbed String: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Kabuuan ng gamit na puwang ng Dependensiyang Bersyon: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Kabuuan ng Hindi Nagamit na puwang: " -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Kabuuan ng puwang na napag-tuosan: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Wala sa sync ang talaksan ng paketeng %s." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Kailangan niyong magbigay ng isa lamang na pattern" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Walang nahanap na mga pakete" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Talaksang Pakete:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Wala sa sync ang cache, hindi ma-x-ref ang talaksang pakete" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Mga naka-Pin na Pakete:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(hindi nahanap)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Nakaluklok: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(wala)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Kandidato: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Naka-Pin na Pakete: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Talaang Bersyon:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s para sa %s %s kinompile noong %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -307,7 +317,7 @@ msgstr "" " -c=? Basahin ang talaksang pagkaayos na ito\n" " -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "Hindi makapagsulat sa %s" @@ -316,31 +326,31 @@ msgstr "Hindi makapagsulat sa %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Hindi makuha ang bersyon ng debconf. Nakaluklok ba ang debconf?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Mahaba masyado ang talaan ng extensyon ng mga pakete" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "Error sa pagproseso ng directory %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Mahaba masyado ang talaan ng extensyon ng pagkukunan (source)" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Error sa pagsulat ng panimula sa talaksang nilalaman (contents)" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Error sa pagproseso ng Contents %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -425,26 +435,26 @@ msgstr "" " -c=? Basahin itong talaksang pagkaayos\n" " -o=? Itakda ang isang option na pagkaayos" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Walang mga pinili na tugma" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "May mga talaksang kulang sa grupo ng talaksang pakete `%s'" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Nasira ang DB, pinalitan ng pangalan ang talaksan sa %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Luma ang DB, sinusubukang maupgrade ang %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." @@ -452,106 +462,106 @@ msgstr "" "Hindi tanggap ang anyo ng DB. Kung kayo ay nagsariwa mula sa nakaraang " "bersiyon ng apt, tanggalin at likhain muli ang database." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Hindi mabuksan ang talaksang DB %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "Bigo ang pag-stat ng %s" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Walang kontrol rekord ang arkibo" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Hindi makakuha ng cursor" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Hindi mabasa ang directory %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Hindi ma-stat %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "E: Mga error ay tumutukoy sa talaksang " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "Bigo sa pag-resolba ng %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "Bigo ang paglakad sa puno" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "Bigo ang pagbukas ng %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "Bigo ang pagbasa ng link %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "Bigo ang pag-unlink ng %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Bigo ang pag-link ng %s sa %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " DeLink limit na %sB tinamaan.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Walang field ng pakete ang arkibo" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s ay walang override entry\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Tagapangalaga ng %s ay %s hindi %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr " %s ay walang override entry para sa pinagmulan\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s ay wala ring override entry na binary\n" @@ -565,165 +575,165 @@ msgstr "Internal error, hindi mahanap ang miyembrong %s" msgid "realloc - Failed to allocate memory" msgstr "realloc - Bigo ang pagreserba ng memory" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Hindi mabuksan %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Maling anyo ng override %s linya %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Maling anyo ng override %s linya %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Maling anyo ng override %s linya %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Bigo ang pagbasa ng talaksang override %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Hindi kilalang algorithmong compression '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Kailangan ng compression set ang compressed output %s" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Bigo sa paglikha ng IPC pipe sa subprocess" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "Bigo ang paglikha ng FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "Bigo ang pag-fork" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "Anak para sa pag-Compress" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "Error na internal, bigo ang paglikha ng %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "Bigo ang paglikha ng subprocess IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "Bigo ang pag-exec ng taga-compress" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "taga-decompress" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "Bigo ang IO sa subprocess/talaksan" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "Bigo ang pagbasa habang tinutuos ang MD5" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "Problema sa pag-unlink ng %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Bigo ang pagpangalan muli ng %s tungong %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "O" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "Error sa pag-compile ng regex - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "ngunit ang %s ay nakaluklok" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "ngunit ang %s ay iluluklok" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "ngunit hindi ito maaaring iluklok" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "ngunit ito ay birtwal na pakete" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "ngunit ito ay hindi nakaluklok" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "ngunit ito ay hindi iluluklok" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " o" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "Ang susunod na mga pakete ay iu-upgrade:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (dahil sa %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -731,150 +741,150 @@ msgstr "" "BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin.\n" "HINDI ito dapat gawin kung hindi niyo alam ng husto ang inyong ginagawa!" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu na nai-upgrade, %lu na bagong luklok, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu iniluklok muli, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu nai-downgrade, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu na tatanggalin at %lu na hindi inupgrade\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Inaayos ang mga dependensiya..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " ay bigo." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Hindi maayos ang mga dependensiya" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Hindi mai-minimize ang upgrade set" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Tapos" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Maaari ninyong patakbuhin ang `apt-get -f install' upang ayusin ito." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "May mga kulang na dependensiya. Subukan niyong gamitin ang -f." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" "BABALA: Ang susunod na mga pakete ay hindi matiyak ang pagka-awtentiko!" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "" "Ipina-walang-bisa ang babala tungkol sa pagka-awtentiko ng mga pakete.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Iluklok ang mga paketeng ito na walang beripikasyon [o/H]? " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "May mga paketeng hindi matiyak ang pagka-awtentiko" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "May mga problema at -y ay ginamit na walang --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" "Error na internal, tinawagan ang InstallPackages na may sirang mga pakete!" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "" "May mga paketeng kailangang tanggalin ngunit naka-disable ang Tanggal/Remove." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "Hindi maaldaba ang directory ng download" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Nakapagtataka.. Hindi magkatugma ang laki, mag-email sa apt@packages.debian." "org" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Kailangang kumuha ng %sB/%sB ng arkibo.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibo.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" "Matapos magbuklat ay %sB na karagdagang puwang sa disk ang magagamit.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "Hindi matantsa ang libreng puwang sa %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Kulang kayo ng libreng puwang sa %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Tinakdang Trivial Only ngunit hindi ito operasyong trivial." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Oo, gawin ang sinasabi ko!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -885,28 +895,28 @@ msgstr "" "Upang magpatuloy, ibigay ang pariralang '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "Abort." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Nais niyo bang magpatuloy [O/h]? " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Bigo sa pagkuha ng %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "May mga talaksang hindi nakuha" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -914,48 +924,48 @@ msgstr "" "Hindi nakuha ang ilang mga arkibo, maaaring patakbuhin ang apt-get update o " "subukang may --fix-missing?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing at pagpalit ng media ay kasalukuyang hindi suportado" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Hindi maayos ang mga kulang na pakete." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Ina-abort ang pag-instol." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Paunawa, pinili ang %s imbes na %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Ang paketeng %s ay paketeng birtwal na bigay ng:\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Nakaluklok]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Dapat kayong mamili ng isa na iluluklok." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -966,49 +976,49 @@ msgstr "" "Maaaring nawawala ang pakete, ito'y laos na, o ito'y makukuha lamang\n" "sa ibang pinagmulan.\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Gayunpaman, ang sumusunod na mga pakete ay humahalili sa kanya:" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Ang paketeng %s ay walang kandidatong maaaring instolahin" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Ang pagluklok muli ng %s ay hindi maaari, hindi ito makuha.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ay pinakabagong bersyon na.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' para sa '%s' ay hindi nahanap" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Ang napiling bersyon %s (%s) para sa %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Hindi maaldaba ang directory ng talaan" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1016,26 +1026,67 @@ msgstr "" "May mga talaksang index na hindi nakuha, sila'y di pinansin, o ginamit ang " "mga luma na lamang." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "" +"Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Error na internal, may nasira ang problem resolver" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Hindi mahanap ang paketeng %s" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "Hindi mahanap ang paketeng %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Paunawa, pinili ang %s para sa regex '%s'\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "ngunit ang %s ay iluluklok" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Maaaring patakbuhin niyo ang `apt-get -f install' upang ayusin ang mga ito:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1043,7 +1094,7 @@ msgstr "" "May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang " "mga pakete (o magtakda ng solusyon)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1054,7 +1105,7 @@ msgstr "" "o kung kayo'y gumagamit ng pamudmod na unstable ay may ilang mga paketeng\n" "kailangan na hindi pa nalikha o linipat mula sa Incoming." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1064,120 +1115,130 @@ msgstr "" "hindi talaga mailuklok at kailangang magpadala ng bug report tungkol sa\n" "pakete na ito." -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "" -"Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "Sirang mga pakete" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "Mga paketeng mungkahi:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "Mga paketeng rekomendado:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "Sinusuri ang pag-upgrade... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Bigo" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "Tapos" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "Error na internal, may nasira ang problem resolver" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "Hindi mahanap ang paketeng source para sa %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Linaktawan ang nakuha na na talaksan '%s'\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "Kulang kayo ng libreng puwang sa %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibong source.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "Kunin ang Source %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "Bigo sa pagkuha ng ilang mga arkibo." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Bigo ang utos ng pagbuklat '%s'.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "Utos na build '%s' ay bigo.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "Bigo ang prosesong anak" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "Kailangang magtakda ng kahit isang pakete na susuriin ang builddeps" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Hindi makuha ang impormasyong build-dependency para sa %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "Walang build depends ang %s.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1186,7 +1247,7 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1195,32 +1256,33 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil walang magamit na bersyon " "ng paketeng %s na tumutugon sa kinakailangang bersyon" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %" "s ay bagong-bago pa lamang." -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Hindi mabuo ang build-dependencies para sa %s." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "Bigo sa pagproseso ng build dependencies" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "Suportadong mga Module:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1235,6 +1297,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1399,188 +1462,188 @@ msgstr "" msgid "Merging available information" msgstr "Pinagsasama ang magagamit na impormasyon" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Bigo sa paglikha ng mga pipe" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Bigo sa pagtakbo ng gzip " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Sirang arkibo" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Bigo ang checksum ng tar, sira ang arkibo" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Hindi kilalang uri ng TAR header %u, miyembrong %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Hindi tanggap na signature ng arkibo" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Error sa pagbasa ng header ng miyembro ng arkibo" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Hindi tanggap na header ng miyembro ng arkibo" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Bitin ang arkibo. Sobrang iksi." -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Bigo ang pagbasa ng header ng arkibo" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "Tinawagan ang DropNode sa naka-link pa na node" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Bigo sa paghanap ng elemento ng hash!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Bigo ang pagreserba ng diversion" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Internal error sa AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Sinusubukang patungan ang diversion, %s -> %s at %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Dobleng pagdagdag ng diversion %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Nadobleng talaksang conf %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Bigo sa pagsulat ng talaksang %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Bigo sa pagsara ng talaksang %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Sobrang haba ang path na %s" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Binubuklat ang %s ng labis sa isang beses" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Ang directory %s ay divertado" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Ang pakete ay sumusubok na magsulat sa target na diversion %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Sobrang haba ng path na diversion" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Ang directory %s ay papalitan ng hindi-directory" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Bigo ang paghanap ng node sa kanyang hash bucket" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Sobrang haba ng path" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Patungan ng paketeng nag-match na walang bersion para sa %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Ang talaksang %s/%s ay pumapatong sa isang talaksan sa paketeng %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Hindi mabasa ang %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Hindi ma-stat ang %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Bigo sa pagtanggal ng %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Hindi malikha ang %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Bigo sa pag-stat ng %sinfo" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "Ang info at temp directory ay kailangang nasa parehong filesystem" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "Binabasa ang Listahan ng mga Pakete" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Bigo sa paglipat sa admin dir %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "Internal error sa pagkuha ng pangalan ng pakete" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Binabasa ang Talaksang Listahan" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1591,78 +1654,78 @@ msgstr "" "ang talaksang ito, gawin itong walang laman at muling instolahin kaagad ang " "parehong bersyon ng pakete!" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Bigo sa pagbasa ng talaksang listahan %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Internal error sa pagkuha ng Node" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Bigo sa pagbukas ng talaksang diversions %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Ang talaksang diversion ay sira" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "Di tanggap na linya sa talaksang diversion: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Internal error sa pagdagdag ng diversion" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Ang cache ng pkg ay dapat ma-initialize muna" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Bigo sa paghanap ng Pakete: Header, offset %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "Maling ConfFile section sa talaksang status. Offset %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Error sa pag-parse ng MD5. Offset %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Hindi ito tanggap na arkibong DEB, may kulang na miyembrong '%s'" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "" "Hindi ito tanggap na arkibong DEB, may kulang na miyembrong '%s' o '%s'" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "Hindi makalipat sa %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "Internal error, hindi mahanap ang miyembro" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "Bigo sa paghanap ng tanggap na talaksang control" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "Di maintindihang talaksang control" @@ -1697,11 +1760,12 @@ msgid "File not found" msgstr "Hindi Nahanap ang Talaksan" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Bigo ang pag-stat" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Bigo ang pagtakda ng oras ng pagbago" @@ -1763,7 +1827,7 @@ msgstr "Lumipas ang koneksyon" msgid "Server closed the connection" msgstr "Sinarhan ng server ang koneksyon" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "Error sa pagbasa" @@ -1775,7 +1839,7 @@ msgstr "May sagot na bumubo sa buffer." msgid "Protocol corruption" msgstr "Sira ang protocol" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "Error sa pagsulat" @@ -1829,7 +1893,7 @@ msgstr "Nag-timeout ang socket ng datos" msgid "Unable to accept connection" msgstr "Hindi makatanggap ng koneksyon" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema sa pag-hash ng talaksan" @@ -1856,39 +1920,39 @@ msgstr "Tanong" msgid "Unable to invoke " msgstr "Hindi ma-invoke " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Kumokonekta sa %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Hindi makalikha ng socket para sa %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Hindi maumpisahan ang koneksyon sa %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Hindi maka-konekta sa %s:%s (%s), nag-timeout ang koneksyon" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Hindi maka-konekta sa %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Kumokonekta sa %s" @@ -1967,433 +2031,453 @@ msgstr "Hindi makapag-bukas ng pipe para sa %s" msgid "Read error from %s process" msgstr "Error sa pagbasa mula sa prosesong %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Naghihintay ng panimula" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Nakatanggap ng isang linyang panimula mula %u na mga karakter" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Maling linyang panimula" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Nagpadala ang HTTP server ng di tanggap na reply header" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Length header" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Range header" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Sira ang range support ng HTTP server na ito" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Di kilalang anyo ng petsa" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Bigo ang pagpili" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Nag-timeout ang koneksyon" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Error sa pagsulat ng talaksang output" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Error sa pagsulat sa talaksan" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Error sa pagsusulat sa talaksan" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Error sa pagbasa mula sa server" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Maling datos sa panimula" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Bigo ang koneksyon" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Internal na error" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "Hindi mai-mmap ang talaksang walang laman" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Hindi makagawa ng mmap ng %lu na byte" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "Piniling %s ay hindi nahanap" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Hindi kilalang katagang uri: '%c'" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "Binubuksan ang talaksang pagsasaayos %s" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "Labis ang haba ng linyang %d (max %d)" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntax error %s:%u: Nag-umpisa ang block na walang pangalan." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntax error %s:%u: Maling anyo ng Tag" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntax error %s:%u: May basura matapos ng halaga" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Syntax error %s:%u: Maaari lamang gawin ang mga direktiba sa tuktok na antas" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntax error %s:%u: Labis ang pagkaka-nest ng mga include" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntax error %s:%u: Sinama mula dito" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntax error %s:%u: Di suportadong direktiba '%s'" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntax error %s:%u: May basura sa dulo ng talaksan" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Error!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... Tapos" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Opsyon sa command line '%c' [mula %s] ay di kilala." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "Opsyon sa command line %s ay di naintindihan." -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Opsyon sa command line %s ay hindi boolean" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Opsyon %s ay nangangailangan ng argumento" -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" "Opsyon %s: Ang pagtakda ng aytem sa pagkaayos ay nangangailangan ng " "=." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Opsyon %s ay nangangailangan ng argumentong integer, hindi '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Opsyon '%s' ay labis ang haba" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Hindi naintindihan ang %s, subukan ang true o false." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Di tanggap na operasyon %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Di mai-stat ang mount point %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Di makalipat sa %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "Bigo sa pag-stat ng cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Hindi ginagamit ang pagaldaba para sa basa-lamang na talaksang aldaba %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "Hindi mabuksan ang talaksang aldaba %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Hindi gumagamit ng pag-aldaba para sa talaksang aldaba %s na naka-mount sa " "nfs" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "hindi makuha ang aldaba %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Naghintay, para sa %s ngunit wala nito doon" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Nakatanggap ang sub-process %s ng segmentation fault." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Naghudyat ang sub-process %s ng error code (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Ang sub-process %s ay lumabas ng di inaasahan" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "Hindi mabuksan ang talaksang %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "pagbasa, mayroong %lu na babasahin ngunit walang natira" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "pagsulat, mayroon pang %lu na isusulat ngunit hindi makasulat" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "Problema sa pagsara ng talaksan" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "Problema sa pag-unlink ng talaksan" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "Problema sa pag-sync ng talaksan" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Walang laman ang cache ng pakete" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Sira ang talaksan ng cache ng pakete" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Ang talaksan ng cache ng pakete ay hindi magamit na bersyon" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Ang APT na ito ay hindi nagsusuporta ng versioning system '%s'" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Ang cache ng pakete ay binuo para sa ibang arkitektura" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Dependensiya" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "PreDepends" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Mungkahi" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Rekomendado" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Tunggali" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Pumapalit" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Linalaos" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "kailangan" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "optional" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "Ginagawa ang puno ng mga dependensiya" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "Bersyong Kandidato" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "Pagbuo ng Dependensiya" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "Pinagsasama ang magagamit na impormasyon" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Bigo ang pagbukas ng %s" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Bigo sa pagsulat ng talaksang %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Hindi ma-parse ang talaksang pakete %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Hindi ma-parse ang talaksang pakete %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (absolute dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Binubuksan %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Labis ang haba ng linyang %u sa talaksang pagkukunan %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (vendor id)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2405,12 +2489,12 @@ msgstr "" "loop. Madalas ay masama ito, ngunit kung nais niyo talagang gawin ito, i-" "activate ang APT::Force-LoopBreak na option." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Hindi suportado ang uri ng talaksang index na '%s'" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2418,7 +2502,7 @@ msgstr "" "Kailangan ma-instol muli ang paketeng %s, ngunit hindi ko mahanap ang arkibo " "para dito." -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2426,186 +2510,202 @@ msgstr "" "Error, pkgProblemResolver::Resolve ay naghudyat ng mga break, maaaring dulot " "ito ng mga paketeng naka-hold." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Hindi maayos ang mga problema, mayroon kayong sirang mga pakete na naka-hold." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Nawawala ang directory ng talaan %spartial." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Nawawala ang directory ng arkibo %spartial." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Kinukuha ang talaksang %li ng %li (%s ang natitira)" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "Kinukuha ang talaksang %li ng %li" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Ang driver ng paraang %s ay hindi mahanap." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Hindi umandar ng tama ang paraang %s" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Ikasa ang disk na may pangalang: '%s' sa drive '%s' at pindutin ang enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Hindi suportado ang sistema ng paketeng '%s'" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "Hindi matuklasan ang akmang uri ng sistema ng pakete " -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Hindi ma-stat ang %s" -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "Kailangan niyong maglagay ng 'source' URIs sa inyong sources.list" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Hindi ma-parse o mabuksan ang talaan ng mga pakete o ng talaksang estado." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Maaaring patakbuhin niyo ang apt-get update upang ayusin ang mga problemang " "ito" -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "Di tanggap na record sa talaksang pagtatangi, walang Package header" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Hindi naintindihan ang uri ng pin %s" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Walang prioridad (o sero) na nakatakda para sa pin" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Hindi akma ang versioning system ng cache" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "May naganap na error habang prinoseso ang %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "May naganap na error habang prinoseso ang %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "May naganap na error habang prinoseso ang %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "May naganap na error habang prinoseso ang %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "May naganap na error habang prinoseso ang %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "May naganap na error habang prinoseso ang %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Wow, nalagpasan niyo ang bilang ng pangalan ng pakete na kaya ng APT na ito." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Wow, nalagpasan niyo ang bilang ng bersyon na kaya ng APT na ito." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Wow, nalagpasan niyo ang bilang ng bersyon na kaya ng APT na ito." + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Wow, nalagpasan niyo ang bilang ng dependensiya na kaya ng APT na ito." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "May naganap na error habang prinoseso ang %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "May naganap na Error habang prinoseso ang %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Hindi nahanap ang paketeng %s %s habang prinoseso ang mga dependensiya." -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "Kinukuha ang Talaksang Provides" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "IO Error sa pag-imbak ng source cache" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "Di tugmang MD5Sum" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "Walang public key na magamit para sa sumusunod na key ID:\n" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2614,7 +2714,7 @@ msgstr "" "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)" -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2623,7 +2723,7 @@ msgstr "" "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito." -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2631,7 +2731,7 @@ msgstr "" "Sira ang talaksang index ng mga pakete. Walang Filename: field para sa " "paketeng %s." -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Di tugmang laki" @@ -2640,7 +2740,7 @@ msgstr "Di tugmang laki" msgid "Vendor block %s contains no fingerprint" msgstr "Block ng nagbebenta %s ay walang fingerprint" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2649,54 +2749,56 @@ msgstr "" "Ginagamit ang %s bilang mount point ng CD-ROM\n" "Sinasalang ang CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "Kinikilala..." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "Naka-imbak na Label: %s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Ginagamit ang %s bilang mount point ng CD-ROM\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "Ina-unmount ang CD-ROM\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "Hinihintay ang disc...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "Sinasalang ang CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "Sinisiyasat ang Disc para sa talaksang index...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "" "Nakahanap ng %i na index ng mga pakete, %i na index ng source at %i na " "signature\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "Naka-imbak na Label: %s \n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "Hindi yan tanggap na pangalan, subukan muli.\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2705,102 +2807,103 @@ msgstr "" "Ang Disc na ito ay nagngangalang: \n" "'%s'\n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Kinokopya ang Listahan ng mga Pakete" -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Sinusulat ang bagong listahan ng pagkukunan\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Mga nakatala sa Listahan ng Source para sa Disc na ito ay:\n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "Ina-unmount ang CD-ROM..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Nagsulat ng %i na record.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Nagsulat ng %i na record na may %i na talaksang kulang.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Nagsulat ng %i na record na may %i na talaksang mismatch\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "Nagsulat ng %i na record na may %i na talaksang kulang at %i na talaksang " "mismatch\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Hinahanda ang %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Binubuklat ang %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Hinahanda ang %s upang isaayos" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Isasaayos ang %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "Iniluklok ang %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Naghahanda para sa pagtanggal ng %s" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Tinatanggal ang %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "Tinanggal ang %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Naghahanda upang tanggalin ng lubusan ang %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "Natanggal ng lubusan ang %s" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "Hindi mai-patch ang talaksan" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Nagsara ng maaga ang koneksyon" -#~ msgid "Could not patch file" -#~ msgstr "Hindi mai-patch ang talaksan" - #~ msgid "File date has changed %s" #~ msgstr "Nagbago ang petsa ng talaksang %s" diff --git a/po/vi.po b/po/vi.po index a107b0397..094920e6d 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:09+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2007-06-01 15:00+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -16,148 +16,158 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: LocFactoryEditor 1.6.3b1\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Gói %s phiên bản %s phụ thuộc vào phần mềm chưa có :\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "Không thể định vị gói %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "Tổng số tên gói: " -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " Gói chuẩn: " -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " Gói ảo nguyên chất: " -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " Gói ảo đơn: " -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " Gói ảo hỗn hợp:" -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " Thiếu : " -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "Tổng số phiên bản riêng: " -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Tổng số phiên bản riêng: " + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "Tổng số phụ thuộc: " -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "Tổng số liên quan phiên bản và tập tin: " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Tổng số liên quan phiên bản và tập tin: " + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "Tổng số ảnh xạ Miễn là: " -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Tổng số chuỗi mở rộng mẫu tìm kiếm: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "Tổng chỗ phiên bản phụ thuộc:" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Tổng chỗ nghỉ:" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "Tổng chỗ đã tính: " -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "Tập tin gói %s không đồng bộ được." -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "Bạn phải đưa ra đúng một mẫu" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "Không tìm thấy gói" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "Tập tin gói:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" "Bộ nhớ tạm không đồng bộ được nên không thể tham chiếu chéo tập tin gói" # Variable: do not translate/ biến: đừng dịch -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "Các gói đã ghim:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(không tìm thấy)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Đã cài đặt: " -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(không có)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " Ứng cử: " -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " Ghim gói: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " Bảng phiên bản:" # Variable: do not translate/ biến: đừng dịch -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s cho %s %s được biên dịch vào %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -317,7 +327,7 @@ msgstr "" " -c=? \t\tĐọc tập tin cấu hình này\n" " -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "Không thể ghi vào %s" @@ -326,31 +336,31 @@ msgstr "Không thể ghi vào %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Không thể lấy phiên bản debconf. Debconf có được cài đặt chưa?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "Danh sách mở rộng gói quá dài" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "Gặp lỗi khi xử lý thư mục %s" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "Danh sách mở rộng nguồn quá dài" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "Gặp lỗi khi ghi phần đầu vào tập tin nộị dung" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "Gặp lỗi khi xử lý nội dung %s" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -446,26 +456,26 @@ msgstr "" " -c=? \t\tĐọc tập tin cấu hình này\n" " -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "Không có điều đã chọn khớp được" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Thiếu một số tập tin trong nhóm tập tin gói « %s »." -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Cơ sở dữ liệu bị hỏng nên đã đổi tên tâp tin thành %s.old (old: cũ)." -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Cơ sở dữ liệu cũ nên đang cố nâng cấp lên %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." @@ -473,106 +483,106 @@ msgstr "" "Dạng thức co sở dữ liệu không hợp lệ. Nếu bạn đã nâng cấp từ một phiên bản " "apt cũ, hãy gỡ bỏ rồi tạo lại co sở dữ liệu này." -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Không thể mở tập tin cơ sở dữ liệu %s: %s." -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "Việc lấy thông tin toàn bộ cho %s bị lỗi" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "Kho không có mục ghi điều khiển" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Không thể lấy con chạy" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: Không thể đọc thư mục %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "W: Không thể lấy thông tin toàn bộ cho %s\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "E: có lỗi áp dụng vào tập tin " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "Việc quyết định %s bị lỗi" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "Việc di chuyển qua cây bị lỗi" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "Việc mở %s bị lỗi" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr " Bỏ liên kết %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "Việc tạo liên kết lại %s bị lỗi" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "Việc bỏ liên kết %s bị lỗi" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Việc liên kết %s đến %s bị lỗi" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Hết hạn bỏ liên kết của %sB.\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "Kho không có trường gói" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s không có mục ghi đè\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " người bảo quản %s là %s không phải %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr " %s không có mục ghi đè nguồn\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s cũng không có mục ghi đè nhị phân\n" @@ -586,165 +596,165 @@ msgstr "Gặp lỗi nội bộ, không thể định vị bộ phạn %s" msgid "realloc - Failed to allocate memory" msgstr "realloc (cấp phát lại) - việc cấp phát bộ nhớ bị lỗi" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Không thể mở %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Điều đè dạng sai %s dòng %lu #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Điều đè dạng sai %s dòng %lu #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Điều đè dạng sai %s dòng %lu #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "Việc đọc tập tin đè %s bị lỗi" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "Không biết thuật toán nén « %s »" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Dữ liệu xuất đã nén %s cần một bộ nén" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Việc tạo ống IPC đến tiến trình con bị lỗi" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "Việc tạo TẬP_TIN* bị lỗi" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "Việc tạo tiến trình con bị lỗi" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "Nén điều con" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "Lỗi nội bộ, việc tạo %s bị lỗi" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "Việc tạo tiến trình con IPC bị lỗi" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "Việc thực hiện bô nén bị lỗi " -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "bộ giải nén" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "việc nhập/xuất vào tiến trình con/tập tin bị lỗi" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "Việc đọc khi tính MD5 bị lỗi" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "Gặp lỗi khi bỏ liên kết %s" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "Việc đổi tên %s thành %s bị lỗi" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "C" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "Lỗi biên dich biểu thức chính quy - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "Những gói theo đây phụ thuộc vào phần mềm chưa có :" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "nhưng mà %s đã được cài đặt" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "nhưng mà %s sẽ được cài đặt" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "nhưng mà nó không có khả năng cài đặt" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "nhưng mà nó là gói ảo" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "nhưng mà nó chưa được cài đặt" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "nhưng mà nó sẽ không được cài đặt" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " hay" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "Theo đây có những gói MỚI sẽ được cài đặt:" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "Theo đây có những gói sẽ bị GỠ BỎ :" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "Theo đây có những gói đã được giữ lại:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "Theo đây có những gói sẽ được nâng cấp:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "Theo đây có những gói sẽ được HẠ CẤP:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "Theo đây có những gói sẽ được thay đổi:" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (do %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -752,147 +762,147 @@ msgstr "" "CẢNH BÁO : theo đây có những gói chủ yếu sẽ bị gỡ bỏ.\n" "ĐỪNG làm như thế trừ khi bạn biết làm gì ở đây nó một cách chính xác." -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu đã nâng cấp, %lu mới được cài đặt, " -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu được cài đặt lại, " -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu được hạ cấp, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu cần gỡ bỏ, và %lu chưa được nâng cấp.\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ bỏ.\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "Đang sửa cách phụ thuộc..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " đã thất bại." -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "Không thể sửa cách phụ thuộc" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "Không thể cực tiểu hóa bộ nâng cấp" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " Đã xong" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Có lẽ bạn hãy chay lệnh « apt-get -f install » để sửa hết." -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "" "Còn có cách phụ thuộc vào phần mềm chưa có. Như thế thì bạn hãy cố dùng tùy " "chọn « -f »." -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "CẢNH BÁO : không thể xác thực những gói theo đây." -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "Cảnh báo xác thực bị đè.\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "Cài đặt những gói này mà không kiểm chứng không? [y/N] [c/K] " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "Một số gói không thể được xác thực" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "Gập lỗi và đã dùng tùy chọn « -y » mà không có « --force-yes »" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Lỗi nội bộ: InstallPackages (cài đặt gói) được gọi với gói bị hỏng." -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "Cần phải gỡ bỏ một số gói, nhưng mà khả năng Gỡ bỏ (Remove) đã bị tắt." -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "Gặp lỗi nội bộ: tiến trình Sắp xếp chưa xong" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "Không thể khóa thư mục tải về" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "Không thể đọc danh sách nguồn." -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Lạ... Hai kích cỡ không khớp được. Hãy gởi thư cho " -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Cần phải lấy %sB/%sB kho.\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Cần phải lấy %sB kho.\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "Sau khi đã giải nén, sẻ chiếm %sB sức chứa đĩa thêm.\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "Sau khi đã giải nén, sẽ giải phóng %sB sức chữa đĩa thêm.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "Không thể quyết định chỗ rảnh trong %s" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "Bạn chưa có đủ sức chức còn rảnh trong %s." -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Xác đinh « Chỉ không đáng kể » (Trivial Only) nhưng mà thao tác này đáng kể." -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Có, làm đi." -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -903,28 +913,28 @@ msgstr "" "Để tiếp tục thì hãy gõ cụm từ « %s »\n" "?]" -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "Hủy bỏ." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "Bạn có muốn tiếp tục không? [Y/n] [C/k] " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Việc gói %s bị lỗi %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "Một số tập tin không tải về được" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "Mới tải về xong và trong chế độ chỉ tải về" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -932,49 +942,49 @@ msgstr "" "Không thể lấy một số kho, có lẽ hãy chạy lệnh « apt-get update » (apt lấy " "cập nhật) hay cố với « --fix-missing » (sửa các điều còn thiếu) không?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "Chưa hô trợ tùy chọn « --fix-missing » (sửa khi thiếu điều) và trao đổi " "phương tiện." -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "Không thể sửa những gói còn thiếu." -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "Đang hủy bỏ cài đặt." -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Ghi chú : đang chọn %s thay vì %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Đang bỏ qua %s vì nó đã được cài đặt và chưa lập tùy chọn Nâng cấp.\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Chưa cài đặt gói %s nên không thể gỡ bỏ nó\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Gói %s là gói ảo được cung cấp do :\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [Đã cài đặt]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "Bạn nên chọn một cách dứt khoát gói cần cài." -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -985,49 +995,49 @@ msgstr "" "đã tham chiếu đến nó. Có lẽ có nghĩa là gói còn thiếu,\n" "đã trở thành cũ, hay chỉ sẵn sàng từ nguồn khác.\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "Tuy nhiên, những gói theo đây thay thế nó :" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "Gói %s không có ứng cử cài đặt" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Không thể cài đặt lại %s vì không thể tải về nó.\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s là phiên bản mơi nhất.\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Không tìm thấy bản phát hành « %s » cho « %s »" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Không tìm thấy phiên bản « %s » cho « %s »" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Đã chọn phiên bản %s (%s) cho %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "Lệnh cập nhật không chấp nhật đối số" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "Không thể khóa thư mục danh sách" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -1035,25 +1045,65 @@ msgstr "" "Một số tập tin chỉ mục không tải về được, đã bỏ qua chúng, hoặc điều cũ được " "dùng thay thế." -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Theo đây có những gói MỚI sẽ được cài đặt:" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ quyết định trường hợp:" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã ngắt gì" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Không tìm thấy gói %s" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "Không tìm thấy gói %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Ghi chú : đang chọn %s cho biểu thức chính quy « %s »\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "nhưng mà %s sẽ được cài đặt" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Có lẽ bạn hãy chạy lênh « apt-get -f install » để sửa hết:" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1061,7 +1111,7 @@ msgstr "" "Gói còn phụ thuộc vào phần mềm chưa có. Hãy cố chạy lệnh « apt-get -f " "install » mà không có gói nào (hoặc ghi rõ cách quyết định)." -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1073,7 +1123,7 @@ msgstr "" "bất định, có lẽ chưa tạo một số gói cần thiết,\n" "hoặc chưa di chuyển chúng ra phần Incoming (Đến)." -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1083,127 +1133,138 @@ msgstr "" "gói này đơn giản không có khả năng cài đặt, thì bạn hay\n" "thông báo lỗi về gói này." -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ quyết định trường hợp:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "Gói bị ngắt" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "Những gói thêm theo đây sẽ được cài đặt:" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "Gói được đệ nghị:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "Gói được khuyên:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "Đang tính nâng cấp... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Bị lỗi" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "Xong" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "Phải ghi rõ ít nhất một gói cần lấy nguồn cho nó" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "Không tìm thấy gói nguồn cho %s" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Đang bỏ qua tập tin đã được tải về « %s »\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "Không đủ sức chứa còn rảnh trong %s" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Cần phải lấy %sB/%sB kho nguồn.\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Cần phải lấy %sB kho nguồn.\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "Lấy nguồn %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "Việc lấy một số kho bị lỗi." -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Đang bỏ qua giải nén nguồn đã giải nén trong %s\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Lệnh giải nén « %s » bị lỗi.\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Hãy kiểm tra xem gói « dpkg-dev » có được cài đặt chưa.\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "Lệnh xây dụng « %s » bị lỗi.\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "Tiến trình con bị lỗi" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "" "Phải ghi rõ ít nhất một gói cần kiểm tra cách phụ thuộc khi xây dụng cho nó" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Không thể lấy thông tin về cách phụ thuộc khi xây dụng cho %s" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "%s không phụ thuộc vào gì khi xây dụng.\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "cách phụ thuộc %s cho %s không thể được thỏa vì không tìm thấy gọi %s" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1212,31 +1273,32 @@ msgstr "" "cách phụ thuộc %s cho %s không thể được thỏa vì không có phiên bản sẵn sàng " "của gói %s có thể thỏa điều kiện phiên bản." -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s quá mới" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi: %s." -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Không thể thỏa cách phụ thuộc khi xây dụng cho %s." -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "Việc xử lý cách phụ thuộc khi xây dụng bị lỗi" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "Mô-đun đã hỗ trợ :" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1251,6 +1313,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1423,190 +1486,190 @@ msgstr "" msgid "Merging available information" msgstr "Đang hợp nhất các thông tin sẵn sàng..." -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "Việc tạo những ống bị lỗi" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "Việc thực hiện gzip bị lỗi " -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "Kho bị hỏng." -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Tiến trình tar (kiểm tổng tar) thât bại: kho bị hỏng." -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Không biết kiểu phần đầu tar %u, bộ phạn %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "Chữ ký kho không hợp lệ" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "Gặp lỗi khi đọc phần đầu bộ phạn kho" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Phần đầu bộ phạn kho không hợp lê" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "Kho quá ngắn" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "Việc đọc phần đầu kho bị lỗi" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode (thả điểm nút) được gọi với điểm nút còn liên kết" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "Việc định vi phần tử băm bị lỗi" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "Việc cấp phát sự trệch đi bị lỗi" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "Lỗi nội bộ trong AddDiversion (thêm sự trệch đi)" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "Đang cố ghi đè một sự trệch đi, %s → %s và %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "Sự trệch đi được thêm hai lần %s → %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "Tập tin cấu hình trùng %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "Việc ghi tập tin %s bị lỗi" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "Việc đóng tập tin %s bị lỗi" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "Đường dẫn %s quá dài" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "Đang giải nén %s nhiều lần" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "Thư mục %s bị trệch hướng" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Gói này đang cố ghi vào đích trệch đi %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "Đường dẫn trệch đi quá dài." -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "Thư mục %s đang được thay thế do điều không phải là thư mục" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "Việc định vị điểm nút trong hộp băm nó bị lỗi" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "Đường dẫn quá dài" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Ghi đè lên gói đã khớp mà không có phiên bản cho %s" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Tập tin %s/%s ghi đè lên điều trong gói %s" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "Không thể đọc %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Không thể lấy các thông tin về %s" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "Việc gỡ bỏ %s bị lỗi" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "Không thể tạo %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "Việc lấy các thông tin về %sinfo bị lỗi" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "" "Những thư mục info (thông tin) và temp (tạm thời) cần phải trong cùng một hệ " "thống tập tin" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "Đang đọc các danh sách gói..." -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "Việc chuyển đổi sang thư mục quản lý %sinfo bị lỗi" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "Gặp lỗi nội bộ khi lấy tên gói" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "Đang đọc danh sách tập tin..." -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1616,79 +1679,79 @@ msgstr "" "Việc mở tập tin danh sách « %sinfo/%s » bị lỗi. Nếu bạn không thể phục hồi " "tập tin này, bạn hãy làm cho nó rỗng và ngay cài đặt lại cùng phiên bản gói." -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Việc đọc tập tin danh sách %sinfo/%s bị lỗi" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "Gặp lỗi nội bộ khi lấy nút điểm..." -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "Việc mở tập tin trệch đi %sdiversions bị lỗi" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "Tập tin trệch đi bị hỏng" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "Gặp dòng không hợp lệ trong tập tin trệch đi: %s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "Gặp lỗi nội bộ khi thêm một sự trệch đi" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "Phải khởi động bộ nhớ tạm gói trước hết" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "Lỗi tìm thấy Gói: phần đầu, hiệu số %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "" "Có phần cấu hình tập tin (ConfFile) sai trong tập tin trạng thái. Hiệu số %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "Gặp lỗi khi phân tách MD5. Hiệu số %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "Đây không phải là môt kho DEB hợp lệ vì còn thiếu bộ phạn « %s »" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "" "Đây không phải là môt kho DEB hợp lệ vì không có bộ phạn « %s » hay « %s »" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "Không thể chuyển đổi sang %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "Gặp lỗi nội bộ, không thể định vị bộ phạn" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "Việc định vị tập tin điều khiển hợp lệ bị lỗi" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "Tập tin điều khiển không có khả năng phân tách" @@ -1723,11 +1786,12 @@ msgid "File not found" msgstr "Không tìm thấy tập tin" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "Việc lấy các thông tin bị lỗi" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "Việc lập giờ sửa đổi bị lỗi" @@ -1789,7 +1853,7 @@ msgstr "Thời hạn kết nối" msgid "Server closed the connection" msgstr "Máy phục vụ đã đóng kết nối" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "Lỗi đọc" @@ -1801,7 +1865,7 @@ msgstr "Một trả lời đã tràn bộ đệm." msgid "Protocol corruption" msgstr "Giao thức bị hỏng" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "Lỗi ghi" @@ -1855,7 +1919,7 @@ msgstr "Kết nối ổ cắm dữ liệu đã quá giờ" msgid "Unable to accept connection" msgstr "Không thể chấp nhận kết nối" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Gặp khó khăn băm tập tin" @@ -1882,39 +1946,39 @@ msgstr "Truy vấn" msgid "Unable to invoke " msgstr "Không thể gọi " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Đang kết nối đến %s (%s)..." -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[Địa chỉ IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Không thể tạo ổ cắm cho %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Không thể sở khởi kết nối đến %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Không thể kết nối đến %s:%s (%s), kết nối đã quá giờ" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Không thể kết nối đến %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Đang kết nối đến %s..." @@ -1988,434 +2052,454 @@ msgstr "Không thể mở ống dẫn cho %s" msgid "Read error from %s process" msgstr "Gặp lỗi đọc từ tiến trình %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Đang đợi những phần đầu..." -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Đã lấy một dòng đầu riêng lẻ chứa hơn %u ky tự" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Dòng đầu sai" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Máy phục vụ HTTP đã gởi một dòng đầu trả lời không hợp lệ" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" "Máy phục vụ HTTP đã gởi một dòng đầu Content-Length (độ dài nội dụng) không " "hợp lệ" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" "Máy phục vụ HTTP đã gởi một dòng đầu Content-Range (phạm vị nội dụng) không " "hợp lệ" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Máy phục vụ HTTP đã ngắt cách hỗ trợ phạm vị" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Không biết dạng ngày" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Việc chọn bị lỗi" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Kết nối đã quá giờ" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Gặp lỗi khi ghi vào tập tin xuất" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Gặp lỗi khi ghi vào tập tin" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Gặp lỗi khi ghi vào tập tin đó" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Gặp lỗi khi đọc từ máy phục vụ : cuối ở xa đã đóng kết nối" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Gặp lỗi khi đọc từ máy phục vụ" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "Dữ liệu dòng đầu sai" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "Kết nối bị ngắt" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "Gặp lỗi nội bộ" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "Không thể mmap (ảnh xạ bộ nhớ) tâp tin rỗng" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Không thể tạo mmap (ảnh xạ bộ nhớ) kích cỡ %lu byte" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "Không tìm thấy vùng chọn %s" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Không nhận biết viết tắt kiểu: « %c »" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "Đang mở tập tin cấu hình %s..." -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "Dòng %d quá dài (tối đa %d)" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Gặp lỗi cú pháp %s:%u: khối bắt đầu không có tên." -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Gặp lỗi cú pháp %s:%u: thẻ dạng sai" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Gặp lỗi cú pháp %s:%u: có rác thêm sau giá trị" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Gặp lỗi cú pháp %s:%u: có thể thực hiện chỉ thị chỉ tại mức đầu" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Gặp lỗi cú pháp %s:%u: quá nhiều điều bao gồm lồng nhau" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Gặp lỗi cú pháp %s:%u: đã bao gồm từ đây" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Gặp lỗi cú pháp %s:%u: chưa hỗ trợ chỉ thị « %s »" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Gặp lỗi cú pháp %s:%u: rác thêm tại kết thúc tập tin" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Lỗi." -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... Xong" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Không biết tùy chọn dòng lệnh « %c » [từ %s]." -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "Không hiểu tùy chọn dòng lệnh %s" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "Tùy chọn dòng lệnh %s không phải bun (đúng/không đúng)" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Tùy chọn %s cần đến một đối số." -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Tùy chọn %s: đặc tả mục cấu hình phải có một « = »." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Tùy chọn %s cần đến một đối số số nguyên, không phải « %s »" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "Tùy chọn « %s » quá dài" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Không hiểu %s: hãy cố dùng true (đúng) hay false (không đúng)." -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "Thao tác không hợp lệ %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "Không thể lấy các thông tin cho điểm gắn kết %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "Không thể chuyển đổi sang %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "Việc lấy cac thông tin cho đĩa CD-ROM bị lỗi" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Không dùng khả năng khóa cho tập tin khóa chỉ đọc %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "Không thể mở tập tin khóa %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Không dùng khả năng khóa cho tập tin khóa đã lắp kiểu NFS %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "Không thể lấy khóa %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Đã đợi %s nhưng mà chưa gặp nó" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Tiến trình con %s đã nhận một lỗi chia ra từng đoạn." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Tiến trình con %s đã trả lời mã lỗi (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Tiến trình con %s đã thoát bất ngờ" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "Không thể mở tập tin %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "đọc, còn cần đọc %lu nhưng mà không có điều còn lại" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "ghi, còn cần ghi %lu nhưng mà không thể" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "Gặp lỗi khi đóng tập tin đó" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "Gặp lỗi khi bỏ liên kết tập tin đó" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "Gặp lỗi khi đồng bộ hóa tập tin đó" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "Bộ nhớ tạm gói rỗng" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "Tập tin bộ nhớ tạm gói bị hỏng" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "Tập tin bộ nhớ tạm gói là một phiên bản không tương thích" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Trình APT này không hỗ trợ hệ thống điều khiển phiên bản « %s »" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "Bộ nhớ tạm gói được xây dụng cho kiến trức khác" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "Phụ thuộc" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "Phụ thuộc trước" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "Đệ nghị" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "Khuyên" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "Xung đột" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "Thay thế" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "Làm cũ" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "quan trọng" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "cần" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "chuẩn" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "tùy chọn" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "thêm" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "Đang xây dụng cây cách phụ thuộc..." -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "Phiên bản ứng cử" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "Tạo ra cách phụ thuộc" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "Đang hợp nhất các thông tin sẵn sàng..." + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Việc mở %s bị lỗi" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Việc ghi tập tin %s bị lỗi" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Không thể phân tách tập tin gói %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Không thể phân tách tập tin gói %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Gặp dòng dạng sai %lu trong danh sách nguồn %s (địa chỉ Mạng)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Gặp dòng dạng sai %lu trong danh sách nguồn %s (bản phân phối)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" "Gặp dòng dạng sai %lu trong danh sách nguồn %s (phân tách địa chỉ Mạng)." -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" "Gặp dòng dạng sai %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Gặp dòng dạng sai %lu trong danh sách nguồn %s (phân tách bản phân phối)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Đang mở %s..." -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "Dòng %u quá dài trong danh sách nguồn %s." -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Gặp dòng dạng sai %u trong danh sách nguồn %s (kiểu)." -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Không biết kiểu « %s » trên dòng %u trong danh sách nguồn %s." -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Gặp dòng dạng sai %u trong danh sách nguồn %s (mã nhận biết nhà bán)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2427,18 +2511,18 @@ msgstr "" "bạn thật sự muốn tiếp tục, có thể hoạt hóa tuy chọn « APT::Force-LoopBreak " "» (buộc ngắt vòng lặp)." -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Không hỗ trợ kiểu tập tin chỉ mục « %s »" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "Cần phải cài đặt lại gói %s, nhưng mà không thể tìm kho cho nó." -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2446,186 +2530,202 @@ msgstr "" "Lỗi: « pkgProblemResolver::Resolve » (bộ tháo gỡ vấn đề gọi::tháo gỡ) đã tạo " "ra nhiều chỗ ngắt, có lẽ một số gói đã giữ lại đã gây ra trường hợp này." -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "Không thể sửa vấn đề, bạn đã giữ lại một số gói bị ngắt." -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "Thiếu thư mục danh sách « %spartial »." -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "Thiếu thư mục kho « %spartial »." #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Đang lấy tập tin %li trên %li (%s còn lại)..." -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "Đang lấy tập tin %li trên %li..." -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "Không tìm thấy trình điều khiển phương pháp %s." -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "Phương pháp %s đã không bắt đầu cho đúng." -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Hãy nạp đĩa có nhãn « %s » vào ổ « %s » và bấm nút Enter." -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Không hỗ trợ hệ thống đóng gói « %s »" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "Không thể quyết định kiểu hệ thống đóng gói thích hợp" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Không thể lấy các thông tin về %s." -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "" "Bạn phải để một số địa chỉ Mạng « nguồn » vào « sources.list » (danh sách " "nguồn)" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "Không thể phân tách hay mở danh sách gói hay tâp tin trạng thái." -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Có lẽ bạn muốn chạy « apt-get update » (lấy cập nhật) để sửa các vấn đề này" -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "" "Gặp mục ghi không hợp lệ trong tập tin tùy thích: không có phần đầu Package " "(Gói)." -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "Không hiểu kiểu ghim %s" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "Bộ nhớ tạm có hệ thống điêu khiển phiên bản không tương thích" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Gặp lỗi khi xử lý %s (NewPackage - gói mới)" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Gặp lỗi khi xử lý %s (UsePackage1 - dùng gói 1)" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "Gặp lỗi khi xử lý %s (NewFileVer1 - tập tin mới, phiên bản 1)" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Gặp lỗi khi xử lý %s (UsePackage2 - dùng gói 2)" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Gặp lỗi khi xử lý %s (NewFileVer1 - tập tin mới, phiên bản 1)" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Gặp lỗi khi xử lý %s (NewVersion1 - phiên bản mới 1)" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Gặp lỗi khi xử lý %s (UsePackage3 - dùng gói 3)" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Gặp lỗi khi xử lý %s (NewVersion2 - phiên ban mới 2)" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "Gặp lỗi khi xử lý %s (NewFileVer1 - tập tin mới, phiên bản 1)" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Ồ, bạn đã vượt quá số tên gói mà trình APT này có thể quản lý." -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Ồ, bạn đã vượt quá số phiên bản mà trình APT này có thể quản lý." -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Ồ, bạn đã vượt quá số phiên bản mà trình APT này có thể quản lý." + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Ồ, bạn đã vượt quá số cách phụ thuộc mà trình APT này có thể quản lý." -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Gặp lỗi khi xử lý %s (FindPkg - tìm gói)" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" "Gặp lỗi khi xử lý %s (CollectFileProvides - tập hợp các trường hợp miễn là " "một tập tin)" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Không tìm thấy gói %s %s khi xử lý cách phụ thuộc của/vào tập tin" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "Không thể lấy các thông tin về danh sách gói nguồn %s" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "Đang tập hợp các trường hợp « tập tin miễn là »" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "việc thay đổi tên bị lỗi, %s (%s → %s)." -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "MD5Sum (tổng kiểm) không khớp được" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "Không có khóa công sẵn sàng cho những ID khóa theo đây:\n" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2634,7 +2734,7 @@ msgstr "" "Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói " "này, do thiếu kiến trúc." -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2643,7 +2743,7 @@ msgstr "" "Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói " "này." -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2651,7 +2751,7 @@ msgstr "" "Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập " "tin:) cho gói %s." -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "Kích cỡ không khớp được" @@ -2660,7 +2760,7 @@ msgstr "Kích cỡ không khớp được" msgid "Vendor block %s contains no fingerprint" msgstr "Khối nhà bán %s không chứa vân tay" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2669,52 +2769,54 @@ msgstr "" "Đang dùng điểm lắp đĩa CD-ROM %s\n" "Đang lắp đĩa CD-ROM...\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "Đang nhận diện... " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "Nhãn đã lưu : %s\n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "Đang dùng điểm lắp đĩa CD-ROM %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "Đang tháo lắp đĩa CD-ROM...\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "Đang đợi đĩa...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "Đang lắp đĩa CD-ROM...\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "Đang quét đĩa tìm tập tin chỉ mục...\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "Mới tìm %i chỉ mục gói, %i chỉ mục nguồn và %i chữ ký\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, c-format msgid "Found label '%s'\n" msgstr "Nhãn đã lưu : « %s »\n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "Nó không phải là một tên hợp lệ: hãy thử lại.\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2723,94 +2825,99 @@ msgstr "" "Tên đĩa này:\n" "%s\n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "Đang sao chép các danh sách gói..." -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "Đang ghi danh sách nguồn mới...\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "Các mục nhập danh sách nguồn cho đĩa này:\n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 msgid "Unmounting CD-ROM...\n" msgstr "Đang tháo lắp đĩa CD-ROM...\n" -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "Mới ghi %i mục ghi.\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "Mới ghi %i mục ghi với %i tập tin còn thiếu.\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "Mới ghi %i mục ghi với %i tập tin không khớp với nhau\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "Mới ghi %i mục ghi với %i tập tin còn thiếu và %i tập tin không khớp với " "nhau\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "Đang chuẩn bị %s..." -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "Đang mở gói %s..." -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "Đang chuẩn bị cấu hình %s..." -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "Đang cấu hình %s..." -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "Đã cài đặt %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "Đang chuẩn bị gỡ bỏ %s..." -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "Đang gỡ bỏ %s..." -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "Đã gỡ bỏ %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s..." -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "Mới gỡ bỏ hoàn toàn %s" +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Không thể mở tập tin %s" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Kết nối bị đóng quá sớm." diff --git a/po/zh_CN.po b/po/zh_CN.po index 439e058a9..858cdda9e 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.23\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2007-03-29 17:14+0800\n" "Last-Translator: Kov Chai \n" "Language-Team: Debian Chinese [GB] \n" @@ -15,145 +15,155 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系：\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "未发现软件包 %s" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "软件包总数(按名称计)：" -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " 普通软件包：" -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " 完全虚拟软件包：" -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " 单虚拟软件包：" -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " 混合虚拟软件包：" -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " 缺漏的：" -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "按版本共计：" -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "按版本共计：" + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "按依赖关系共计：" -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "按版本/文件关系共计：" -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "按版本/文件关系共计：" + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "提供映射共计：" -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Glob 字串共计：" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "依赖关系版本名所占空间共计：" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Slack 空间共计：" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "总占用空间：" -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "软件包文件 %s 尚未同步(sync)。" -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "您必须明确地给出一个表达式" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "没有发现吻合的软件包" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "软件包文件：" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "缓存尚未同步(sync)，无法交差引证(x-ref)一个软件包文件" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "被锁定(pinned)的软件包：" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(没有找到)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " 已安装：" -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(无)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " 候选的软件包：" -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " 软件包锁(Pin)：" #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " 版本列表：" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s for %s %s ，编译于 %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -300,7 +310,7 @@ msgstr "" " -c=? 读指定的配置文件\n" " -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "无法写入 %s" @@ -309,31 +319,31 @@ msgstr "无法写入 %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "无法获得 debconf 的版本。您安装了 debconf 吗?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "软件包的扩展列表超长" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "处理目录 %s 时出错" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "源扩展列表超长" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "将 header 写到 contents 文件时出错" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "处理 Contents %s 时出错" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -413,132 +423,132 @@ msgstr "" " -c=? 读取指定配置文件\n" " -o=? 设置任意指定的配置选项" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "没有任何选定项是匹配的" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "软件包文件组“%s”中缺少一些文件" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "缓存数据库被损坏了，该数据库文件的文件名已改成 %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB 已过时，现试图进行升级 %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." msgstr "" "DB 格式是无效的。如果你是从一个老版本的 apt 升级而来，请删除数据库并重建它。" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "无法打开 DB 文件 %s：%s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "无法读取 %s 的状态" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "存档没有包含控制字段" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "无法获得游标(cursor)" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "警告：无法读取目录 %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "警告：无法对 %s 进行统计\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "错误：" -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "警告：" -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "错误：处理文件时出错 " -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "无法解析路径 %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "无法遍历目录树" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "无法打开 %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "无法读取符号链接 %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "无法 unlink %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** 无法将 %s 链接到 %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " 达到了 DeLink 的上限 %sB。\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "存档没有包含软件包(package)字段" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s 中没有 override 项\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 的维护者 %s 并非 %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr " %s 没有源代码的 override 项\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s 中没有二进制文件的 override 项\n" @@ -552,165 +562,165 @@ msgstr "内部错误，无法定位包内文件 %s" msgid "realloc - Failed to allocate memory" msgstr "realloc - 无法再分配内存" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "无法打开 %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "override 文件 %s 第 %lu 行的格式有误 #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "override 文件 %s 第 %lu 行的格式有误 #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "override 文件 %s 第 %lu 行的格式有误 #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "无法读取 override 文件 %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "未知的压缩算法“%s”" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "压缩后的输出文件 %s 要求有一个压缩文件集合" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "无法为子进程创建 IPC 管道" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "无法创建 FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "无法 fork" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "压缩子进程" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "内部错误，无法建立 %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "无法建立子进程的 IPC 管道" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "无法执行压缩程序" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "解压程序" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "无法对子进程或文件进行读写" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "在计算 MD5 校验和时，无法读取数据" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "在 unlink %s 时出错" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "无法将 %s 重命名为 %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "编译正则表达式时出错 - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "下列的软件包有不能满足的依赖关系：" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "但是 %s 已经安装了" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "但是 %s 正要被安装" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "但却无法安装它" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "但是它只是个虚拟软件包" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "但是它还没有被安装" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "但是它将不会被安装" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " 或" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "下列【新】软件包将被安装：" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "下列软件包将被【卸载】：" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "下列的软件包的版本将保持不变：" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "下列的软件包将被升级：" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "下列软件包将被【降级】：" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "下列被要求保持版本不变的软件包将被改变：" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (是由于 %s) " -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -718,143 +728,143 @@ msgstr "" "【警告】：下列的重要软件包将被卸载 \n" "请勿尝试，除非您确实知道您在做什么！" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "共升级了 %lu 个软件包，新安装了 %lu 个软件包，" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "共重新安装了 %lu 个软件包，" -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "降级了 %lu 个软件包，" -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "要卸载 %lu 个软件包，有 %lu 个软件未被升级。\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "有 %lu 个软件包没有被完全安装或卸载。\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "正在更正依赖关系..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " 失败。" -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "无法更正依赖关系" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "无法最小化要升级的软件包集合" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " 完成" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "您也许需要运行“apt-get -f install”来纠正上面的错误。" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "不能满足依赖关系。不妨试一下 -f 选项。" -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "【警告】：下列的软件包不能通过验证！" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "忽略了认证警告。\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "不经验证就安装这些软件包么？[y/N] " -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "有些软件包不能通过验证" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "内部错误，InstallPackages 被用在了无法安装的软件包上！" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止。" -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "内部错误，Ordering 未能完成" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "无法对下载目录加锁" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "无法读取安装源列表。" -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "怪了……文件大小不符，发信给 apt@packages.debian.org 吧" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "需要下载 %sB/%sB 的软件包。\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "需要下载 %sB 的软件包。\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "解压缩后会消耗掉 %sB 的额外空间。\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "解压缩后将会空出 %sB 的空间。\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "无法获知您在 %s 上的空余空间" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "您在 %s 中没有足够的空余空间。" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "虽然您指定了 Trivial Only，但这不是个日常(trivial)操作。" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -865,28 +875,28 @@ msgstr "" "若还想继续的话，就输入下面的短句“%s”\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "中止执行。" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "您希望继续执行吗？[Y/n]" -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "有一些文件下载失败" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "下载完毕，目前是“仅下载”模式" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -894,47 +904,47 @@ msgstr "" "有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项" "再试试？" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "目前还不支持 --fix-missing 和介质交换(media swapping)" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "无法更正缺少的软件包。" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "放弃安装。" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "注意，我选了 %s 而非 %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "软件包 %s 还未安装，因而不会被卸载\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包：\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [已安装]" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "请您明确地选择一个来进行安装。" -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -945,74 +955,114 @@ msgstr "" "这可能意味着这个缺失的软件包可能已被废弃，\n" "或者只能在其他发布源中找到\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "可是下列的软件包取代了它：" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "软件包 %s 还没有可供安装的候选者" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "不能重新安装 %s，因为无法下载它。\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s 已经是最新的版本了。\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”发布版本" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”版本" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "选定了版本为 %s (%s) 的 %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr " update 命令是不需任何参数的" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "无法对状态列表目录加锁" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" "有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "下列【新】软件包将被安装：" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "下列的信息可能会对解决问题有所帮助：" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "内部错误，problem resolver 坏事了" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "内部错误，AllUpgrade 坏事了" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "无法找到软件包 %s" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "无法找到软件包 %s" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "但是 %s 正要被安装" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "您可能需要运行“apt-get -f install”来纠正下列错误：" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1020,7 +1070,7 @@ msgstr "" "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可" "以指定一个解决办法)。" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1031,7 +1081,7 @@ msgstr "" "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n" "包尚未被创建或是它们还在新到(incoming)目录中。" -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1040,126 +1090,137 @@ msgstr "" "您仅要求对单一软件包进行操作，这极有可能是因为该软件包安装不上，同时，\n" "您最好提交一个针对这个软件包的故障报告。" -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "下列的信息可能会对解决问题有所帮助：" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "无法安装的软件包" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "将会安装下列额外的软件包：" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "建议安装的软件包：" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "推荐安装的软件包：" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "正在筹划升级... " -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "失败" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "内部错误，problem resolver 坏事了" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "要下载源代码，必须指定至少一个对应的软件包" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "无法找到与 %s 对应的源代码包" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "忽略已下载过的文件“%s”\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "您在 %s 上没有足够的空余空间" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下载 %sB/%sB 的源代码包。\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下载 %sB 的源代码包。\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "下载源代码 %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "有一些包文件无法下载。" -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "运行解包的命令“%s”出错。\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "请检查是否安装了“dpkg-dev”软件包。\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造软件包命令“%s”失败。\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "子进程出错" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr " %s 没有构建依赖关系信息。\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1168,30 +1229,31 @@ msgstr "" "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1" "$s 依赖关系" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新了" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "不能满足软件包 %s 所要求的构建依赖关系。" -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "无法处理构建依赖关系" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "被支持模块：" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1206,6 +1268,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1364,188 +1427,188 @@ msgstr "这个提示之前的错误消息才值得您注意。请更正它们， msgid "Merging available information" msgstr "正在合并现有信息" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "无法创建管道" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "无法执行 gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "包文件已被损坏" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "tar 的校验码不符，包文件已被损坏" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "未知的 TAR 数据头类型 %u，成员 %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "无效的打包文件特征号(signature)" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "读取打包文件中的成员文件头出错" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "打包文件中成员文件头无效" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "存档太短了" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "无法读取打包文件的数据头" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "把 DropNode 用在了仍在链表中的节点上" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "无法分配散列表项！" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "无法分配转移项(diversion)" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "内部错误，出现在 AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "试图覆盖一个转移项(diversion)，%s -> %s 即 %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "添加了两个转移项(diversion) %s-> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "重复的配置文件 %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "无法写入文件 %s" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "无法关闭文件 %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "路径名 %s 过长" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "%s 被解包了不只一次" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "目录 %s 已被转移(diverted)" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "该软件包正尝试写入转移对象(diversion target) %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "该转移路径(diversion path)过长" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "目录 %s 要被一个非目录的文件替换" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "无法在其散列桶(hash bucket)中分配节点" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "路径名过长" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "用来覆盖的软件包不属于 %s 的任何版本" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "无法读取 %s" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "无法读取 %s 的状态" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "无法删除 %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "无法创建 %s " -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "无法读取 %sinfo 的状态" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "info 和 temp 目录要求处于同一文件系统之下" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "正在读取软件包列表" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "无法切换工作目录到 admin 目录 %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "在获取软件包名字时出现内部错误" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "正在读取文件列表" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1555,77 +1618,77 @@ msgstr "" "无法打开列表文件“%sinfo/%s”。如果您不能恢复这个文件，那么就清空该文件，再马上" "重新安装相同版本的这个软件包！" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "无法读取列表文件 %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "获得一个节点时出现内部错误" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "无法打开转移配置文件(diversions file) %sdiversions" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "该转移配置文件(diversion file)被损坏了" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "转移配置文件中有一行是无效的：%s" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "添加 diversion 时出现内部错误" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "必须首先初始化软件包缓存" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "无法找到某个软件包：包头，于偏移位置 %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "状态文件中有错误的 ConfFile 段。位于偏移位置 %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "无法解析 MD5 码。文件内偏移量为 %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”或者“%s”" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "无法切换工作目录到 %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "内部错误，无法定位包内文件" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "无法在打包文件中找到有效的主控文件" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "不能解析的主控文件" @@ -1660,11 +1723,12 @@ msgid "File not found" msgstr "无法找到该文件" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "无法读取状态" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "无法设置文件的修改日期" @@ -1725,7 +1789,7 @@ msgstr "连接超时" msgid "Server closed the connection" msgstr "服务器关闭了连接" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "读错误" @@ -1737,7 +1801,7 @@ msgstr "回应超出了缓存区大小。" msgid "Protocol corruption" msgstr "协议有误" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "写文件出错" @@ -1791,7 +1855,7 @@ msgstr "数据套接字连接超时" msgid "Unable to accept connection" msgstr "无法接受连接" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "把文件加入散列表时出错" @@ -1818,39 +1882,39 @@ msgstr "查询" msgid "Unable to invoke " msgstr "无法调用 " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "正在连接 %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "无法为 %s 创建套接字(f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "无法发起与 %s:%s (%s) 的连接" -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "无法连接上 %s:%s (%s)，连接超时" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "无法连接上 %s:%s (%s)。" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "正在连接 %s" @@ -1922,427 +1986,447 @@ msgstr "无法为 %s 开启管道" msgid "Read error from %s process" msgstr "从 %s 进程读取数据出错" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "正在等待报头" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "受到了一行报头条目，它的长度超过了 %u 个字符" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "错误的报头条目" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "该 http 服务器发送了一个无效的应答报头" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "该 http 服务器发送了一个无效的 Content-Length 报头" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "该 http 服务器发送了一个无效的 Content-Range 报头" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "该 http 服务器的 range 支持不正常" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "无法识别的日期格式" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "select 调用出错" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "连接服务器超时" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "写输出文件时出错" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "写文件时出错" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "写文件时出错" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "从服务器读取数据时出错，对方关闭了连接" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "从服务器读取数据出错" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "错误的报头数据" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "连接失败" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "内部错误" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "无法 mmap 一个空文件" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "无法 mmap %lu 字节的数据" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "没有发现您的所选 %s" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "无法识别的类型缩写：“%c”" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "正在打开配置文件 %s" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "软件包来源档的第 %d 行超长了(长度限制为 %d)。" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "语法错误 %s:%u：配置小节没有以名字开头" -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "语法错误 %s:%u：标签格式有误" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "语法错误 %s:%u: 配置值后有多余的无意义数据" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "语法错误 %s:%u: 只能在顶层配置文件中使用指示" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "语法错误 %s:%u：太多的嵌套 include 命令" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "语法错误 %s:%u: Included from here" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "语法错误 %s:%u: 不支持的指令“%s”" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "语法错误 %s:%u: 文件尾部有多余的无意义的数据" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... 有错误!" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... 完成" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "未知的命令行选项“%c”[来自 %s]" -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "无法识别命令行选项 %s" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "命令行选项 %s 不是个布尔值" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "选项 %s 要求有一个参数" -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "选项 %s：配置项后必须包含有形如“=<变量>”的具体指定" -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "选项 %s 要求有一个整数作为参数，而不是“%s”" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "选项“%s”超长" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "不能识别参数 %s，请用 true 或 false" -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "无效的操作 %s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "无法读取文件系统挂载点 %s 的状态" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "无法切换工作目录到 %s" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "无法读取光盘的状态" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "由于文件系统为只读，因而无法使用文件锁%s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "无法打开锁文件 %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "无法在 nfs 文件系统上使用文件锁 %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "无法获得锁 %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "等待子进程 %s 的退出，但是它并不存在" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "子进程 %s 发生了段错误" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "子进程 %s 返回了一个错误号 (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "子进程 %s 异常退出了" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "无法打开文件 %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "读文件时出错，还剩 %lu 字节没有读出" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "写文件时出错，还剩 %lu 字节没有保存" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "关闭文件时出错" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "用 unlink 删除文件时出错" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "同步文件时出错" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "软件包缓存区是空的" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "软件包缓存区文件损坏了" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "软件包缓存区文件的版本不兼容" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "本程序目前不支持“%s”这个版本控制系统" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "软件包缓存区是为其它架构的主机构造的" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "依赖" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "预依赖" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "建议" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "推荐" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "冲突" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "替换" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "废弃" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "重要" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "必要" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "标准" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "可选" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "额外" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "正在分析软件包的依赖关系树" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "候选版本" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "生成依赖关系" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "正在合并现有信息" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "无法打开 %s" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "无法写入文件 %s" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "无法解析软件包文件 %s (1)" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "无法解析软件包文件 %s (2)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误 (URI)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist)" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (URI parse)" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (Ablolute dist)" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist parse)" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "正在打开 %s" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "软件包来源档 %2$s 的第 %1$u 行超长了。" -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (type)" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "无法识别在安装源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (vendor id)" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2353,18 +2437,18 @@ msgstr "" "少的软件包 %s。通常并不建议这样做，但是如果您确实希望如此，可以打开 APT::" "Force-LoopBreak 选项。" -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "不支持索引文件类型“%s”" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。" -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2372,181 +2456,197 @@ msgstr "" "错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的" "缘故。" -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "" "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关" "系。" -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "软件包列表的目录 %spartial 不见了。" -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "找不到“%spartial”这个目录。" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "正在下载 %li 个文件中的第 %li 个(还有 %s 个)" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "正在下载 %2$li 个文件中的 %1$li 个" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。" -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "请把标有 “%s” 的碟片插入驱动器“%s”再按回车键。" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "不支持“%s”打包系统" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "无法确定适合的打包系统类型" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "无法读取 %s 的状态。" -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "您必须在您的 sources.list 写入一些“软件包源”的 URI" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "无法解析或打开软件包的列表或是状态文件。" -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "您可能需要运行 apt-get update 来解决这些问题" -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "偏好设定(preferences)文件中发现有无效的记录，无 Package 字段头" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "无法识别锁定的类型(pin type) %s" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "没有为版本锁定指定优先级(或为零)" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "软件包暂存区使用的是不兼容的版本控制系统" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "处理 %s (NewPackage)时出错" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "处理 %s (UsePackage1)时出错" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "处理 %s (NewFileVer1)时出错" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "处理 %s (UsePackage2)时出错" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "处理 %s (NewFileVer1)时出错" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "处理 %s (NewVersion1)时出错" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "处理 %s (UsePackage3)时出错" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "处理 %s (NewVersion2)时出错" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "处理 %s (NewFileVer1)时出错" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "糟了，软件包的数量了超出本程序的处理能力。" -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "糟了，软件包版本的数量了超出本程序的处理能力。" -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "糟了，软件包版本的数量了超出本程序的处理能力。" + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "糟了，依赖关系的数量超出了本程序的处理能力。" -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "处理 %s (FindPkg)时出错" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "处理 %s (CollectFileProvides)时出错" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "当处理文件依赖关系时，无法找到软件包 %s %s" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "无法获取源软件包列表 %s 的状态" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "正在收集文件所提供的软件包" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "无法写入来源缓存文件" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "无法重命名文件，%s (%s -> %s)。" -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "MD5 校验和不符" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "以下 key ID 没有可用的公钥：\n" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2555,7 +2655,7 @@ msgstr "" "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件" "包。(缘于架构缺失)" -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2563,13 +2663,13 @@ msgid "" msgstr "" "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。" -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。" -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "大小不符" @@ -2578,7 +2678,7 @@ msgstr "大小不符" msgid "Vendor block %s contains no fingerprint" msgstr "软件提供者数据块内 %s 没有包含指纹信息" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2587,52 +2687,54 @@ msgstr "" "现把 %s 作为了 CD-ROM 的挂载点\n" "正在挂载 CD-ROM\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "正在鉴别.. " -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "存档标签：%s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "现把 %s 作为了 CD-ROM 的挂载点\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "正在卸载 CD-ROM 文件系统\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "等待插入盘片……\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "正在挂载 CD-ROM 文件系统……\n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "正在光盘中查找索引文件..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "找到了 %i 个软件包索引、%i 个源代码包索引，和 %i 个数字签名\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "存档标签：%s \n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "这不是一个有效的名字，请再次命名。\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2641,100 +2743,101 @@ msgstr "" "这张光盘现在的名字是：\n" "“%s”\n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "正在复制软件包列表……" -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "正在写入新的软件包源列表\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "对应于该光盘的软件包源设置项是：\n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "正在卸载 CD-ROM 文件系统……" -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "已写入 %i 条记录。\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "已写入 %i 条记录，并有 %i 个文件不吻合\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不吻合\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "正在准备 %s" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "正在解压缩 %s" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "正在准备配置 %s" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "正在配置 %s" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "已安装 %s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "正在准备 %s 的删除操作" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "正在删除 %s" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "已删除 %s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "正在准备完全删除 %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "完全删除了 %s" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "无法打开补丁文件" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "连接被永久关闭" -#~ msgid "Could not patch file" -#~ msgstr "无法打开补丁文件" - #~ msgid "File date has changed %s" #~ msgstr "文件 %s 的时间已被改动" diff --git a/po/zh_TW.po b/po/zh_TW.po index 3b1329fab..0de882d8f 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:03+0200\n" +"POT-Creation-Date: 2007-07-06 17:45+1000\n" "PO-Revision-Date: 2006-10-21 16:58+0800\n" "Last-Translator: Asho Yeh \n" "Language-Team: Chinese/Traditional \n" @@ -16,145 +16,155 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "套件 %s 版本 %s 有未解決的相依問題:\n" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" msgstr "無法找出套件 %s 的位置" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:247 msgid "Total package names : " msgstr "所有套件的名稱" -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:287 msgid " Normal packages: " msgstr " 普通套件：" -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " msgstr " 虛擬套件：" -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " msgstr " 單虛擬套件：" -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " msgstr " 混合虛擬套件：" -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:291 msgid " Missing: " msgstr " 失蹤：" -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " msgstr "所有不同版本" -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "所有不同版本" + +#: cmdline/apt-cache.cc:297 msgid "Total dependencies: " msgstr "所有依存關係：" -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " msgstr "所有版本/檔案關聯：" -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "所有版本/檔案關聯：" + +#: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " msgstr "所有提供套件對應：" -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " msgstr "Glob 字串共計:" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " msgstr "所有相依版本空間:" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:335 msgid "Total slack space: " msgstr "Slack 空間共計:" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " msgstr "所有統計後的空間:" -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." msgstr "套件檔案 %s 已失去同步。" -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" msgstr "您必須給定一完整的樣式" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1447 msgid "No packages found" msgstr "未找到套件" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1524 msgid "Package files:" msgstr "套件檔案:" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "快取資料同步過時,無法 x-ref 套件檔案" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1532 #, c-format msgid "%4i %s\n" msgstr "%4i %s\n" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" msgstr "鎖定的套件:" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" msgstr "(未找到)" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr "已安裝:" -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" msgstr "(沒有)" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1584 msgid " Candidate: " msgstr " 候選:" -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1594 msgid " Package pin: " msgstr " 套件鎖定: " #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1603 msgid " Version table:" msgstr " 版本表格:" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1618 #, c-format msgid " %4i %s\n" msgstr " %4i %s\n" -#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2613 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s 是針對於 %s %s 並編譯在 %s %s\n" -#: cmdline/apt-cache.cc:1659 +#: cmdline/apt-cache.cc:1721 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -301,7 +311,7 @@ msgstr "" " -c=? 讀取指定的設定檔案\n" " -o=? 設定任意指定的設定選項,例如:-o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "無法寫入『%s』。" @@ -310,31 +320,31 @@ msgstr "無法寫入『%s』。" msgid "Cannot get debconf version. Is debconf installed?" msgstr "無法取得 debconf 版本。debconf 是否安裝?" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" msgstr "套件延伸列表過長" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" msgstr "處理目錄 %s 時錯誤" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" msgstr "原碼的延伸列表太長" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" msgstr "寫入標頭資訊到目錄檔案時出錯" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" msgstr "處理目錄 %s 時出錯" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:553 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -414,131 +424,131 @@ msgstr "" " -c=? 讀取指定的設定檔\n" " -o=? 設定任意指定的設定選項" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" msgstr "找不到符合的選項" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "套件檔案組 `%s' 缺少部份檔案" -#: ftparchive/cachedb.cc:47 +#: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "DB 已損毀,檔案被更名成 %s.old" -#: ftparchive/cachedb.cc:65 +#: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "DB 過舊,嘗試更新 %s" -#: ftparchive/cachedb.cc:76 +#: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." msgstr "資料庫格式錯誤。如果您升級舊版的 apt，請移除並重建資料庫。" -#: ftparchive/cachedb.cc:81 +#: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" msgstr "無法開啟 DB 檔案 %s:%s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 methods/gpgv.cc:272 #, c-format msgid "Failed to stat %s" msgstr "無法取得 %s 的狀態" -#: ftparchive/cachedb.cc:242 +#: ftparchive/cachedb.cc:238 msgid "Archive has no control record" msgstr "檔案沒有 control 記錄" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "無法取得游標" -#: ftparchive/writer.cc:79 +#: ftparchive/writer.cc:75 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W:無法讀取目錄 %s\n" -#: ftparchive/writer.cc:84 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to stat %s\n" msgstr "W:無法取得 %s 狀態\n" -#: ftparchive/writer.cc:135 +#: ftparchive/writer.cc:131 msgid "E: " msgstr "錯誤：" -#: ftparchive/writer.cc:137 +#: ftparchive/writer.cc:133 msgid "W: " msgstr "警告：" -#: ftparchive/writer.cc:144 +#: ftparchive/writer.cc:140 msgid "E: Errors apply to file " msgstr "E:套用到檔案時出錯" -#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 +#: ftparchive/writer.cc:157 ftparchive/writer.cc:187 #, c-format msgid "Failed to resolve %s" msgstr "無法解析路徑 %s" -#: ftparchive/writer.cc:173 +#: ftparchive/writer.cc:169 msgid "Tree walking failed" msgstr "無法走訪目錄樹" -#: ftparchive/writer.cc:198 +#: ftparchive/writer.cc:194 #, c-format msgid "Failed to open %s" msgstr "無法開啟 %s" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:253 #, c-format msgid " DeLink %s [%s]\n" msgstr " 移除連結 %s [%s]\n" -#: ftparchive/writer.cc:265 +#: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" msgstr "無法讀取符號鏈接 %s" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to unlink %s" msgstr "無法 unlink %s" -#: ftparchive/writer.cc:276 +#: ftparchive/writer.cc:272 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** 無法將 %s 鏈接到 %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " 達到了 DeLink 的上限 %sB。\n" -#: ftparchive/writer.cc:390 +#: ftparchive/writer.cc:386 msgid "Archive had no package field" msgstr "檔案無套件字符" -#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:609 #, c-format msgid " %s has no override entry\n" msgstr " %s 無 override 項目\n" -#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 套件維護者是 %s 非 %s\n" -#: ftparchive/writer.cc:623 +#: ftparchive/writer.cc:619 #, c-format msgid " %s has no source override entry\n" msgstr " %s 無原始碼 override 項目\n" -#: ftparchive/writer.cc:627 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s 無二元碼 override 項目\n" @@ -552,165 +562,165 @@ msgstr "內部錯誤：無法找到成員 %s" msgid "realloc - Failed to allocate memory" msgstr "realloc - 無法配置記憶體空間" -#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "無法開啟 %s" -#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" msgstr "override 文件 %s 第 %lu 行的格式有誤 #1" -#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" msgstr "override 文件 %s 第 %lu 行的格式有誤 #2" -#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" msgstr "override 文件 %s 第 %lu 行的格式有誤 #3" -#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" msgstr "無法讀取 override 檔案 %s" -#: ftparchive/multicompress.cc:75 +#: ftparchive/multicompress.cc:71 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "未知的壓縮演算法 '%s'" -#: ftparchive/multicompress.cc:105 +#: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" msgstr "壓縮輸出 %s 需要一壓縮檔案集合" -#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "無法建立 IPC 管線到子程序" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:194 msgid "Failed to create FILE*" msgstr "無法建立 FILE*" -#: ftparchive/multicompress.cc:201 +#: ftparchive/multicompress.cc:197 msgid "Failed to fork" msgstr "fork 時失敗" -#: ftparchive/multicompress.cc:215 +#: ftparchive/multicompress.cc:211 msgid "Compress child" msgstr "壓縮子程序" -#: ftparchive/multicompress.cc:238 +#: ftparchive/multicompress.cc:234 #, c-format msgid "Internal error, failed to create %s" msgstr "內部錯誤,無法建立 %s" -#: ftparchive/multicompress.cc:289 +#: ftparchive/multicompress.cc:285 msgid "Failed to create subprocess IPC" msgstr "無法建立子程序 IPC" -#: ftparchive/multicompress.cc:324 +#: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " msgstr "無法執行壓縮程序" -#: ftparchive/multicompress.cc:363 +#: ftparchive/multicompress.cc:359 msgid "decompressor" msgstr "解壓縮程序" -#: ftparchive/multicompress.cc:406 +#: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" msgstr "IO 到子程序/檔案失效" -#: ftparchive/multicompress.cc:458 +#: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" msgstr "在計算 MD5 時無法讀取資料" -#: ftparchive/multicompress.cc:475 +#: ftparchive/multicompress.cc:471 #, c-format msgid "Problem unlinking %s" msgstr "在 unlink %s 時出錯" -#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" msgstr "無法將 %s 更名為 %s" -#: cmdline/apt-get.cc:120 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671 #, c-format msgid "Regex compilation error - %s" msgstr "編譯正規表示法出錯 - %s" -#: cmdline/apt-get.cc:237 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "下列的套件有無法滿足的依存關係：" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "但是『%s』卻已經安裝好了。" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "但是『%s』卻將被安裝。" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "但是它卻無法安裝。" -#: cmdline/apt-get.cc:338 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "但是它只是虛擬的套件" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "但是『』卻還沒有安裝。" -#: cmdline/apt-get.cc:341 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "但是它卻不會被安裝。" -#: cmdline/apt-get.cc:346 +#: cmdline/apt-get.cc:347 msgid " or" msgstr "或" -#: cmdline/apt-get.cc:375 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "下列的【新】套件都將被安裝：" -#: cmdline/apt-get.cc:401 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "下列的套件都將被【刪除】：" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "下列的套件都將維持舊版本:" -#: cmdline/apt-get.cc:444 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "下列的套件都將更新:" -#: cmdline/apt-get.cc:465 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "下列的套件都將被「降級」:" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "下列押後的套件都將被更改：" -#: cmdline/apt-get.cc:538 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s（因為 %s）" -#: cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -718,143 +728,143 @@ msgstr "" "警告：下列的基本套件都將被移除。\n" "除非您很清楚在做什麼，請勿輕易嘗試。" -#: cmdline/apt-get.cc:577 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "更新 %lu 個套件，新安裝 %lu 個套件，" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "重新安裝 %lu 個套件，" -#: cmdline/apt-get.cc:583 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "降 %lu 個套件的版，" -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "刪除 %lu 個套件，另不更新 %lu 個套件。\n" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu 個套件沒有完全安裝或刪除完畢。\n" -#: cmdline/apt-get.cc:649 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "更正依存關係中..." -#: cmdline/apt-get.cc:652 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr "失敗" -#: cmdline/apt-get.cc:655 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "無法更正依存關係。" -#: cmdline/apt-get.cc:658 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "無法最小化升級的套件集合" -#: cmdline/apt-get.cc:660 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " 完成" -#: cmdline/apt-get.cc:664 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "用『apt-get -f install』指令或許能修正這些問題。" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "無法滿足相依關係。試試看 -f 選項。" -#: cmdline/apt-get.cc:689 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "警告：下列的套件驗證失敗！" -#: cmdline/apt-get.cc:693 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "忽略了認證警告。\n" -#: cmdline/apt-get.cc:700 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "不驗證這些套件就直接安裝？[y/N]" -#: cmdline/apt-get.cc:702 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "部份套件無法驗證" -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "出現一些問題,您使用了 -y 選項但是沒有用 --force-yes" -#: cmdline/apt-get.cc:755 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "內部錯誤，InstallPackages 被用在了無法安裝的套上！" -#: cmdline/apt-get.cc:764 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "有套件需要被移除,但移除動作被禁止。" -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "內部錯誤，Ordering didn't finish" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042 msgid "Unable to lock the download directory" msgstr "無法鎖定下載的目錄" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 -#: apt-pkg/cachefile.cc:67 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2361 +#: apt-pkg/cachefile.cc:63 msgid "The list of sources could not be read." msgstr "無法讀取來源單。" -#: cmdline/apt-get.cc:816 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "怪了……檔案大小不符，發信給 apt@packages.debian.org 吧" -#: cmdline/apt-get.cc:821 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "需要下載 %2$sB 中 %1$sB 的檔案。\n" -#: cmdline/apt-get.cc:824 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "需要下載 %sB 的檔案。\n" -#: cmdline/apt-get.cc:829 +#: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "解壓縮後將消耗 %sB 的空間。\n" -#: cmdline/apt-get.cc:832 +#: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" msgstr "解壓縮後將空出 %sB 的空間。\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2215 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s 無法足夠的空間。" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "『%s』內沒有足夠的空間。" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "雖然您指定了 Trivial Only,但這不是個顯而易懂的(trivial)操作。" -#: cmdline/apt-get.cc:866 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "是的,請執行我所指定的" -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -865,28 +875,28 @@ msgstr "" "若要繼續的話,就輸入下面的句子“%s”\n" " ?] " -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2142 msgid "Abort." msgstr "放棄執行。" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "繼續執行嗎？ 是按 [Y] 鍵，否按 [n] 鍵 " -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2258 #, c-format msgid "Failed to fetch %s %s\n" msgstr "無法下載『%s』檔案。%s\n" -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "部份檔案無法下載" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2267 msgid "Download complete and in download only mode" msgstr "下載完畢,目前是“僅下載”模式" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -894,47 +904,47 @@ msgstr "" "有幾個檔案無法下載,您可以執行 apt-get update 或者嘗試加上--fix-missing \n" "選項?" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "目前還不支援 --fix-missing 和媒體置換(media swapping)" -#: cmdline/apt-get.cc:995 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "無法更正遺失的套件。" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "放棄安裝。" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "注意,選擇了 %s 而非 %s\n" -#: cmdline/apt-get.cc:1040 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "忽略 %s,它已經被安裝而且沒有指定要升級。\n" -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "套件『%s』沒有安裝，所以無法刪除。\n" -#: cmdline/apt-get.cc:1069 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "虛擬套件『%s』的提供者是：\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr "【已安裝】" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "請您明確地選擇一個來進行安裝。" -#: cmdline/apt-get.cc:1091 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -945,73 +955,113 @@ msgstr "" "這可能意味著這個套件已經消失或捨棄,\n" "或者只能在其他原碼中找到\n" -#: cmdline/apt-get.cc:1110 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "但是下列的套件將取代它：" -#: cmdline/apt-get.cc:1113 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "套件 %s 還沒有可供安裝的候選版本" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "不能重新安裝 %s,因為無法下載它。\n" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "『%s』已經是最新版本了。\n" -#: cmdline/apt-get.cc:1168 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”發布版本" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "未找到“%2$s”的“%1$s”版本" -#: cmdline/apt-get.cc:1176 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "選定的版本為 %s (%s) 的 %s\n" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "update 指令不需任何參數" -#: cmdline/apt-get.cc:1326 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "無法鎖定列表目錄" -#: cmdline/apt-get.cc:1384 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "有一些索引檔案不能下載,它們可能被忽略了,也可能轉而使用了舊的索引檔案。" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1433 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: cmdline/apt-get.cc:1465 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "下列的【新】套件都將被安裝：" + +#: cmdline/apt-get.cc:1467 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" + +#: cmdline/apt-get.cc:1472 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752 +msgid "The following information may help to resolve the situation:" +msgstr "底下的資訊有助於解決現在的情況:" + +#: cmdline/apt-get.cc:1479 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "內部錯誤，problem resolver 處理失敗" + +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "內部錯誤,AllUpgrade 造成錯誤" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1543 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "無法找到 %s 套件。" + +#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694 #, c-format msgid "Couldn't find package %s" msgstr "無法找到 %s 套件。" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1681 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意,根據正規表示法“%2$s”選擇了 %1$s\n" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1711 +#, fuzzy, c-format +msgid "%s set to manual installed.\n" +msgstr "但是『%s』卻將被安裝。" + +#: cmdline/apt-get.cc:1724 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "用『apt-get -f install』指令或許能修正這些問題。" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1727 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1019,7 +1069,7 @@ msgstr "" "無法滿足的相依關係。請嘗試不指定套件明成來執行“apt-get -f install”(或指>\n" "定一個解決辦法)。" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1739 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1030,7 +1080,7 @@ msgstr "" "或是您使用不穩定(unstable)發行版而這些需要的套件尚未完成\n" "或從 Incoming 目錄移除。" -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1747 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1040,126 +1090,137 @@ msgstr "" "該套件無法安裝,您最好提交一個針對這個套件\n" "的臭蟲報告。" -#: cmdline/apt-get.cc:1574 -msgid "The following information may help to resolve the situation:" -msgstr "底下的資訊有助於解決現在的情況:" - -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1755 msgid "Broken packages" msgstr "損毀的套件" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1784 msgid "The following extra packages will be installed:" msgstr "下列的【新】套件都將被安裝：" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1873 msgid "Suggested packages:" msgstr "建議(Suggested)的套件:" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1874 msgid "Recommended packages:" msgstr "推薦(Recommended)的套件:" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1902 msgid "Calculating upgrade... " msgstr "籌畫升級套件中..." -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "失敗" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1910 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985 msgid "Internal error, problem resolver broke stuff" msgstr "內部錯誤，problem resolver 處理失敗" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:2085 msgid "Must specify at least one package to fetch source for" msgstr "必須指定至少一個對應的套件才能下載源碼" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2379 #, c-format msgid "Unable to find a source package for %s" msgstr "無法找到 %s 套件的源碼" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:2131 +#, c-format +msgid "" +"WARNING: '%s' is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2136 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to modify the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2194 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "略過已被下載的檔案“%s”\n" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2218 #, c-format msgid "You don't have enough free space in %s" msgstr "『%s』內沒有足夠的空間。" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2223 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下載 %2$sB 中 %1$sB 的原始檔案。\n" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2226 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下載 %sB 的原始檔案。\n" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Fetch source %s\n" msgstr "下載源碼 %s\n" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2263 msgid "Failed to fetch some archives." msgstr "無法下載某些檔案。" -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "略過已經被解開到 %s 目錄的源碼檔案\n" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2303 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "執行解開套件指令 '%s' 時失敗。\n" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2304 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "請檢查是否安裝了“dpkg-dev”套件。\n" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Build command '%s' failed.\n" msgstr "執行建立套件指令 '%s' 時失敗。\n" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2340 msgid "Child process failed" msgstr "子程序失敗" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2356 msgid "Must specify at least one package to check builddeps for" msgstr "必須指定至少一個套件才能檢查其建立相依關係(builddeps)" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2384 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "無法取得 %s 的建構相依關係。" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2404 #, c-format msgid "%s has no build depends.\n" msgstr "%s 無建立相依關係訊息。\n" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2456 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "由於無法找到套件 %3$s ,因此不能滿足 %2$s 所要求的 %1$s 相依關係" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1168,30 +1229,31 @@ msgstr "" "由於無法找到符合要求的套件 %3$s 的可用版本,因此不能滿足 %2$s 所要求的 %1$s 的" "相依關係" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:已安裝的套件 %3$s 太新了" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2568 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:%3$s" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2582 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "無法滿足套件 %s 所要求的建構相依關係。" -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2586 msgid "Failed to process build dependencies" msgstr "無法處理建構相依關係" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2618 msgid "Supported modules:" msgstr "支援模組:" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2659 +#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1206,6 +1268,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1366,188 +1429,188 @@ msgstr "以上的訊息相當重要。請修正它們並重新執行安裝[I]" msgid "Merging available information" msgstr "結合現有資料中" -#: apt-inst/contrib/extracttar.cc:117 +#: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" msgstr "無法建立管線" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " msgstr "無法執行 gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" msgstr "損毀的檔案" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" msgstr "Tar checksum 失敗,檔案已損毀" -#: apt-inst/contrib/extracttar.cc:299 +#: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "未知的 TAR 標頭型別 %u, member 訊息 %s" -#: apt-inst/contrib/arfile.cc:73 +#: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" msgstr "無效的檔案籤章" -#: apt-inst/contrib/arfile.cc:81 +#: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" msgstr "讀取檔案 member 標頭訊息時出錯" -#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "無效的檔案 member 標頭" -#: apt-inst/contrib/arfile.cc:131 +#: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" msgstr "檔案過短" -#: apt-inst/contrib/arfile.cc:135 +#: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" msgstr "讀取檔案標頭失敗" -#: apt-inst/filelist.cc:384 +#: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "DropNode 在還有 linked node 時被呼叫" -#: apt-inst/filelist.cc:416 +#: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" msgstr "尋找雜湊元件失敗!" -#: apt-inst/filelist.cc:463 +#: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" msgstr "分配轉移(diversion)失敗" -#: apt-inst/filelist.cc:468 +#: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" msgstr "內部錯誤於 AddDiversion" -#: apt-inst/filelist.cc:481 +#: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "試圖改寫一個轉移(diversion)，%s -> %s 和 %s/%s" -#: apt-inst/filelist.cc:510 +#: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" msgstr "重複加入轉移(diversion) %s -> %s" -#: apt-inst/filelist.cc:553 +#: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" msgstr "重複的設定檔 %s/%s" -#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" msgstr "寫入檔案 %s 失敗" -#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" msgstr "關閉檔案 %s 失敗" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" msgstr "路徑 %s 過長" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" msgstr "解開 %s 超過一次" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" msgstr "路徑 %s 已被轉向(diverted)" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "此套件試圖寫入改變過的目標 %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" msgstr "轉移(diversion)路徑過長" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "目錄 %s 已經被非目錄檔案取代" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" msgstr "在雜湊表中找不到節點" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:284 msgid "The path is too long" msgstr "路徑過長" -#: apt-inst/extract.cc:417 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "複寫套件 %s 無符合版本" -#: apt-inst/extract.cc:434 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "檔案 %s/%s 複寫套件 %s 中的相同檔案" -#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 -#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82 #, c-format msgid "Unable to read %s" msgstr "無法讀取『%s』。" -#: apt-inst/extract.cc:494 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "無法讀取 %s 的資料" -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" msgstr "無法移除 %s" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" msgstr "無法創造 %s" -#: apt-inst/deb/dpkgdb.cc:118 +#: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" msgstr "無法讀取 %s 的資料" -#: apt-inst/deb/dpkgdb.cc:123 +#: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" msgstr "資料目錄與暫存目錄需在同一檔案系統" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 -#: apt-pkg/pkgcachegen.cc:840 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "讀取套件清單中" -#: apt-inst/deb/dpkgdb.cc:180 +#: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "無法變換 admin 目錄至 %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" msgstr "內部錯誤，無法取得套件名稱" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" msgstr "讀取軟件表中" -#: apt-inst/deb/dpkgdb.cc:216 +#: apt-inst/deb/dpkgdb.cc:212 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1557,77 +1620,77 @@ msgstr "" "讀取清單檔案「%sinfo/%s」失敗。如果您無法還原此檔案\n" "請使檔案空白並馬上重新安裝相同版本的套件。" -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "讀取清單檔案「%sinfo/%s」失敗" -#: apt-inst/deb/dpkgdb.cc:266 +#: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" msgstr "內部錯誤，無法取得節點" -#: apt-inst/deb/dpkgdb.cc:309 +#: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "讀取轉移檔案 %sdiversions 失敗" -#: apt-inst/deb/dpkgdb.cc:324 +#: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" msgstr "套件轉移檔損壞" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "無效的行於轉移檔案 %s 中" -#: apt-inst/deb/dpkgdb.cc:362 +#: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" msgstr "內部錯誤：新增轉移(diversion)失敗" -#: apt-inst/deb/dpkgdb.cc:383 +#: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" msgstr "套件快取必須先初始化" -#: apt-inst/deb/dpkgdb.cc:443 +#: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "開啟套件失敗：檔案標頭，位移(offset) %lu" -#: apt-inst/deb/dpkgdb.cc:465 +#: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "壞的 ConfFile 區段於 status 檔案。位移(offset) %lu" -#: apt-inst/deb/dpkgdb.cc:470 +#: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "解析 MD5 錯誤。位移(offset) %lu" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "無效的 DEB 檔案，遺失 %s 成員" -#: apt-inst/deb/debfile.cc:52 +#: apt-inst/deb/debfile.cc:48 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "無效的 DEB 檔案，遺失 '%s' 或 '%s' 成員" -#: apt-inst/deb/debfile.cc:112 +#: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" msgstr "無法變換目錄至 %s" -#: apt-inst/deb/debfile.cc:138 +#: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" msgstr "內部錯誤：無法找到成員" -#: apt-inst/deb/debfile.cc:171 +#: apt-inst/deb/debfile.cc:167 msgid "Failed to locate a valid control file" msgstr "找不到有效的 control 檔案" -#: apt-inst/deb/debfile.cc:256 +#: apt-inst/deb/debfile.cc:252 msgid "Unparsable control file" msgstr "無法分析的 control 檔案" @@ -1662,11 +1725,12 @@ msgid "File not found" msgstr "找不到檔案" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 +#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "無法讀取資料" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "日期更新失敗" @@ -1726,7 +1790,7 @@ msgstr "連線逾時" msgid "Server closed the connection" msgstr "伺服器關閉聯線。" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190 msgid "Read error" msgstr "讀取失敗。" @@ -1738,7 +1802,7 @@ msgstr "答覆超過緩衝區長度。" msgid "Protocol corruption" msgstr "協定失敗。" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" msgstr "寫入失敗。" @@ -1792,7 +1856,7 @@ msgstr "Data socket 連線逾時" msgid "Unable to accept connection" msgstr "無法允許連線" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "問題雜湊表" @@ -1819,39 +1883,39 @@ msgstr "查詢" msgid "Unable to invoke " msgstr "無法讀取 " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "連絡『%s (%s)』中" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "無法建立到『%s』的 socket (族=%u 型=%u 協定=%u)。" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "無法聯絡到主機『%s:%s (%s)』。" -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "無法聯絡到主機『%s:%s (%s)』。" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "無法聯絡到主機『%s:%s (%s)』。" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "聯絡主機『%s』中" @@ -1923,427 +1987,447 @@ msgstr "無法開啟管線給 %s 使用" msgid "Read error from %s process" msgstr "從 %s 進程讀取錯誤" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "等待標頭" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "取得一個單行超過 %u 字元的標頭" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "壞的標頭" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "http 伺服器傳送一個無效的回覆標頭" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "http 伺服器傳送一個無效的 Content-Length 標頭" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "http 伺服器傳送一個無效的 Content-Range 標頭" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "http 伺服器有損毀的範圍支援" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "未知的資料格式" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Select 失敗" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "連線逾時" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "寫入輸出檔時發生錯誤" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "寫入檔案時發生錯誤" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "寫入檔案時發生錯誤" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "從遠端主機讀取錯誤，關閉連線" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "從伺服器讀取發生錯誤" -#: methods/http.cc:1108 +#: methods/http.cc:1110 msgid "Bad header data" msgstr "壞的標頭資料" -#: methods/http.cc:1125 +#: methods/http.cc:1127 msgid "Connection failed" msgstr "連線失敗" -#: methods/http.cc:1216 +#: methods/http.cc:1218 msgid "Internal error" msgstr "內部錯誤" -#: apt-pkg/contrib/mmap.cc:82 +#: apt-pkg/contrib/mmap.cc:78 msgid "Can't mmap an empty file" msgstr "不能將空白檔案讀入記憶體" -#: apt-pkg/contrib/mmap.cc:87 +#: apt-pkg/contrib/mmap.cc:83 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "無法讀入檔案 %lu 位元組至記憶體" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" msgstr "選項『%s』找不到。" -#: apt-pkg/contrib/configuration.cc:436 +#: apt-pkg/contrib/configuration.cc:433 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "不認識的簡寫類型：%c" -#: apt-pkg/contrib/configuration.cc:494 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Opening configuration file %s" msgstr "開啟組態檔 %s" -#: apt-pkg/contrib/configuration.cc:512 +#: apt-pkg/contrib/configuration.cc:509 #, c-format msgid "Line %d too long (max %d)" msgstr "第 %d 行太長（最長 %d）" -#: apt-pkg/contrib/configuration.cc:608 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "語法錯誤 %s:%u: 區塊沒有名稱" -#: apt-pkg/contrib/configuration.cc:627 +#: apt-pkg/contrib/configuration.cc:624 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "語法錯誤 %s:%u: 無效的標籤" -#: apt-pkg/contrib/configuration.cc:644 +#: apt-pkg/contrib/configuration.cc:641 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "語法錯誤 %s:%u: 值後有多餘的垃圾" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "語法錯誤： %s:%u： 指令只能於最高層級執行" -#: apt-pkg/contrib/configuration.cc:691 +#: apt-pkg/contrib/configuration.cc:688 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "語法錯誤 %s:%u: 太多重複引入檔案" -#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "語法錯誤 %s:%u: 從此引入" -#: apt-pkg/contrib/configuration.cc:704 +#: apt-pkg/contrib/configuration.cc:701 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "語法錯誤 %s:%u: 不支援的指令 '%s'" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:735 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "語法錯誤 %s:%u: 檔案後有多餘的垃圾" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:152 #, c-format msgid "%c%s... Error!" msgstr "%c%s... 錯誤！" -#: apt-pkg/contrib/progress.cc:157 +#: apt-pkg/contrib/progress.cc:154 #, c-format msgid "%c%s... Done" msgstr "%c%s... 完成" -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "未知的命令列選項「%c」從 %s" -#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" msgstr "無法理解的命令列選項 %s" -#: apt-pkg/contrib/cmndline.cc:127 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" msgstr "命令列選項 %s 不是布林(boolean)變數" -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "選項 %s 需要更多的參數" -#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "選項 %s： 組態元件描述應該有 =" -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "選項 %s 需要整數參數，不是 %s" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" msgstr "選項 %s 太長" -#: apt-pkg/contrib/cmndline.cc:301 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "偵測器 %s 無法理解，試試 true 或 false" -#: apt-pkg/contrib/cmndline.cc:351 +#: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" msgstr "無效的操作：%s" -#: apt-pkg/contrib/cdromutl.cc:55 +#: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" msgstr "無法讀取掛載點 %s" -#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:88 #, c-format msgid "Unable to change to %s" msgstr "無法進入『%s』目錄。" -#: apt-pkg/contrib/cdromutl.cc:190 +#: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" msgstr "CD-ROM 狀況讀取失敗" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" msgstr "不使用檔案鎖定於唯獨檔案 %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:85 #, c-format msgid "Could not open lock file %s" msgstr "無法開啟『%s』鎖定檔。" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "不使用檔案鎖定於 nfs 掛載點上得檔案 %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:107 #, c-format msgid "Could not get lock %s" msgstr "無法取得『%s』鎖。" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" msgstr "等待 %s 但是它不存在" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:385 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "子程序 %s 收到一個記憶體錯誤" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "子程序 %s 回傳錯誤碼(%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "子程序 %s 不預期的結束" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:434 #, c-format msgid "Could not open file %s" msgstr "無法開啟『%s』檔案。" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" msgstr "讀取，仍有 %lu 未讀" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "寫入，仍有 %lu 待寫入但無法寫入" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" msgstr "程式關閉檔案" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" msgstr "程式刪除檔案" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" msgstr "程式同步檔案" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" msgstr "套件暫存檔是空的。" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" msgstr "套件暫存檔損壞。" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" msgstr "套件暫存檔版本不符合。" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "本軟體不支持『%s』版本系統。" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "套件暫存檔是在另一種系統上產生的。" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Depends" msgstr "依存關係" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "PreDepends" msgstr "特別依存關係" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:224 msgid "Suggests" msgstr "建議" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Recommends" msgstr "推薦" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Conflicts" msgstr "衝突" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:225 msgid "Replaces" msgstr "取代" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" msgstr "淘汰" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:237 msgid "important" msgstr "重要" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "required" msgstr "必要" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:237 msgid "standard" msgstr "標準" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "optional" msgstr "次要" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:238 msgid "extra" msgstr "添加" -#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129 msgid "Building dependency tree" msgstr "了解套件依存關係中" -#: apt-pkg/depcache.cc:62 +#: apt-pkg/depcache.cc:101 msgid "Candidate versions" msgstr "候選版本" -#: apt-pkg/depcache.cc:91 +#: apt-pkg/depcache.cc:130 msgid "Dependency generation" msgstr "產生套件依存關係" -#: apt-pkg/tagfile.cc:106 +#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 +#, fuzzy +msgid "Reading state information" +msgstr "結合現有資料中" + +#: apt-pkg/depcache.cc:198 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "無法開啟 %s" + +#: apt-pkg/depcache.cc:204 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "寫入檔案 %s 失敗" + +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" msgstr "無法辨識套件『%s』(1)。" -#: apt-pkg/tagfile.cc:193 +#: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" msgstr "無法辨識套件『%s』(1)。" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (通用資源識別號)。" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (版本)。" -#: apt-pkg/sourcelist.cc:99 +#: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (通用資源識別號分辨)。" -#: apt-pkg/sourcelist.cc:105 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (特定版本)。" -#: apt-pkg/sourcelist.cc:112 +#: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (版本分辨)。" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "開啟『%s』中" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." msgstr "來源檔『%2$s』第 %1$u 行太長。" -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "來源檔『%2$s』第 %1$u 行有錯誤 (類別)。" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "未知的類別 %1$s 於來源檔 %3$s 第 %2$u 行" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "來源檔『%2$s』第 %1$u 行有錯誤 (商家名稱)。" -#: apt-pkg/packagemanager.cc:402 +#: apt-pkg/packagemanager.cc:399 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2353,216 +2437,232 @@ msgstr "" "此安裝因衝突或特別依存關係，需暫時刪除『%s』這個重要套件。這種情形通常有問" "題，但您確定的話請啟動『APT::Force-LoopBreak』選項。" -#: apt-pkg/pkgrecords.cc:37 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "本軟體不支持『%s』型的索引檔。" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:247 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "套件『%s』需要重新安裝，但找不到軟件檔案。" -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1103 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "無法解決依存關係。可能原因是某些套件被押後。" -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." msgstr "無法解決問題，因為某些損毀的套件被押後。" -#: apt-pkg/acquire.cc:62 +#: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." msgstr "找不到『%spartial』清單目錄。" -#: apt-pkg/acquire.cc:66 +#: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." msgstr "找不到『%spartial』檔案目錄。" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "正在下載第 %li 個文件(共 %li 個，尚需 %s)" -#: apt-pkg/acquire.cc:832 +#: apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li" msgstr "正在下載第%li個檔案(共有%li)" -#: apt-pkg/acquire-worker.cc:113 +#: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." msgstr "找不到安裝方式『%s』的驅動程式。" -#: apt-pkg/acquire-worker.cc:162 +#: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" msgstr "安裝方式『%s』沒有正確啟動。" -#: apt-pkg/acquire-worker.cc:377 +#: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "更換媒體：請把名為 '%s' 的光碟置入 '%s' 碟機,然後按 [Enter] 鍵。" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:126 #, c-format msgid "Packaging system '%s' is not supported" msgstr "本軟體不支持『%s』包裝法。" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" msgstr "無法明白系統類別。" -#: apt-pkg/clean.cc:61 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "無法讀取『%s』的目錄資料。" -#: apt-pkg/srcrecords.cc:48 +#: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "『sources.list』檔中必須有一些『source』指令。" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:69 msgid "The package lists or status file could not be parsed or opened." msgstr "無法讀取套件清單或狀況檔。" -#: apt-pkg/cachefile.cc:77 +#: apt-pkg/cachefile.cc:73 msgid "You may want to run apt-get update to correct these problems" msgstr "用『apt-get -f install』指令或許能修正這些問題。" -#: apt-pkg/policy.cc:270 +#: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" msgstr "喜好檔有錯誤—缺少套件前置檔。" -#: apt-pkg/policy.cc:292 +#: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" msgstr "本軟體不支持『%s』型的版本釘子。" -#: apt-pkg/policy.cc:300 +#: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" msgstr "對於釘住的檔案無優先順序" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" msgstr "套件暫存檔使用的是不相容的版本系統。" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "處理『%s』時發生錯誤 (NewPackage)。" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "處理『%s』時發生錯誤 (UsePackage1)。" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "處理『%s』時發生錯誤 (NewFileVer1)。" + +#: apt-pkg/pkgcachegen.cc:178 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "處理『%s』時發生錯誤 (UsePackage2)。" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:182 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "處理『%s』時發生錯誤 (NewFileVer1)。" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:213 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "處理『%s』時發生錯誤 (NewVersion1)。" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:217 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "處理『%s』時發生錯誤 (UsePackage3)。" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:221 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "處理『%s』時發生錯誤 (NewVersion2)。" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "處理『%s』時發生錯誤 (NewFileVer1)。" + +#: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "套件數量超過本程式的能力。" -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "套件版本數量超過本程式的能力。" -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:257 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "套件版本數量超過本程式的能力。" + +#: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "依存關係數量超過本程式的能力。" -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:288 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "處理『%s』時發生錯誤 (FindPkg)。" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "處理『%s』時發生錯誤 (CollectFileProvides)。" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:307 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "當計算相依性時找不到套件 %s %s " -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:678 #, c-format msgid "Couldn't stat source package list %s" msgstr "無法讀取來源檔『%s』的目錄資料。" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "收集檔案供應" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "無法寫入來源暫存檔。" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "檔名因『%s』更換失敗 (%s → %s)。" -#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952 +#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710 +#: apt-pkg/acquire-item.cc:1462 msgid "MD5Sum mismatch" msgstr "MD5 檢查碼不符合。" -#: apt-pkg/acquire-item.cc:647 +#: apt-pkg/acquire-item.cc:1156 msgid "There is no public key available for the following key IDs:\n" msgstr "以下 key ID 沒有可用的公鑰：\n" -#: apt-pkg/acquire-item.cc:760 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。" -#: apt-pkg/acquire-item.cc:819 +#: apt-pkg/acquire-item.cc:1329 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。" -#: apt-pkg/acquire-item.cc:855 +#: apt-pkg/acquire-item.cc:1365 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "套件『%s』索引檔損壞—缺少『Filename:』欄。" -#: apt-pkg/acquire-item.cc:942 +#: apt-pkg/acquire-item.cc:1452 msgid "Size mismatch" msgstr "檔案大小不符合。" @@ -2571,7 +2671,7 @@ msgstr "檔案大小不符合。" msgid "Vendor block %s contains no fingerprint" msgstr "廠商區段%s有錯誤。" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:529 #, c-format msgid "" "Using CD-ROM mount point %s\n" @@ -2580,52 +2680,54 @@ msgstr "" "使用光碟機掛載點 %s\n" "掛載光碟機中\n" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 msgid "Identifying.. " msgstr "標識中.." -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" msgstr "保存標誌：%s \n" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "使用光碟機掛載點 %s\n" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" msgstr "卸載光碟機中\n" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:605 msgid "Waiting for disc...\n" msgstr "等待磁碟中...\n" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:613 msgid "Mounting CD-ROM...\n" msgstr "掛載光碟機中... \n" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" msgstr "掃描碟片中的索引檔案..\n" -#: apt-pkg/cdrom.cc:647 -#, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +#: apt-pkg/cdrom.cc:671 +#, fuzzy, c-format +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "找到 %i 個套件索引，%i 源碼索引和 %i 簽名\n" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:708 #, fuzzy, c-format msgid "Found label '%s'\n" msgstr "保存標誌：%s \n" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "這不是合法名稱，重試一下。\n" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" @@ -2634,93 +2736,97 @@ msgstr "" "這個碟片名為：\n" "'%s'\n" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "複製套件清單中" -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "寫入新的來源列表中\n" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "該碟片的來源列表項目為：\n" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:834 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "卸載光碟機中..." -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "寫入 %i 筆紀錄。\n" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "寫入 %i 筆遺失 %i 個檔案的紀錄。\n" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "寫入 %i 筆 %i 個不匹配檔案的紀錄。\n" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "寫入 %i 筆遺失 %i 個檔案和 %i 個不匹配檔案的紀錄。\n" -#: apt-pkg/deb/dpkgpm.cc:358 +#: apt-pkg/deb/dpkgpm.cc:357 #, c-format msgid "Preparing %s" msgstr "準備配置%s中" -#: apt-pkg/deb/dpkgpm.cc:359 +#: apt-pkg/deb/dpkgpm.cc:358 #, c-format msgid "Unpacking %s" msgstr "解開%s中" -#: apt-pkg/deb/dpkgpm.cc:364 +#: apt-pkg/deb/dpkgpm.cc:363 #, c-format msgid "Preparing to configure %s" msgstr "準備設定%s檔" -#: apt-pkg/deb/dpkgpm.cc:365 +#: apt-pkg/deb/dpkgpm.cc:364 #, c-format msgid "Configuring %s" msgstr "設定%s中" -#: apt-pkg/deb/dpkgpm.cc:366 +#: apt-pkg/deb/dpkgpm.cc:365 #, c-format msgid "Installed %s" msgstr "已安裝%s" -#: apt-pkg/deb/dpkgpm.cc:371 +#: apt-pkg/deb/dpkgpm.cc:370 #, c-format msgid "Preparing for removal of %s" msgstr "正在準備 %s 的刪除操作" -#: apt-pkg/deb/dpkgpm.cc:372 +#: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Removing %s" msgstr "移除%s中" -#: apt-pkg/deb/dpkgpm.cc:373 +#: apt-pkg/deb/dpkgpm.cc:372 #, c-format msgid "Removed %s" msgstr "已移除%s" -#: apt-pkg/deb/dpkgpm.cc:378 +#: apt-pkg/deb/dpkgpm.cc:377 #, c-format msgid "Preparing to completely remove %s" msgstr "準備完整移除 %s" -#: apt-pkg/deb/dpkgpm.cc:379 +#: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Completely removed %s" msgstr "已完整移除%s" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "無法開啟『%s』檔案。" + #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "連線不預期的結束" @@ -2728,9 +2834,6 @@ msgstr "連線不預期的結束" #~ msgid "File date has changed %s" #~ msgstr "檔案資料已更改 %s" -#~ msgid "Could not patch file" -#~ msgstr "無法開啟『%s』檔案。" - #~ msgid "Reading file list" #~ msgstr "讀取軟件表中" -- cgit v1.2.3 From 260666c017cbf4674b14891277647f19416bc868 Mon Sep 17 00:00:00 2001 From: Sarah Hobbs Date: Mon, 9 Jul 2007 01:39:52 +1000 Subject: More fixes, this actually builds now --- configure.in | 2 +- debian/changelog | 15 ++++++++++++--- debian/control | 4 ++-- po/apt-all.pot | 2 +- po/bg.po | 2 +- po/bs.po | 2 +- po/ca.po | 2 +- po/cs.po | 2 +- po/cy.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/el.po | 2 +- po/en_GB.po | 2 +- po/es.po | 2 +- po/eu.po | 2 +- po/fi.po | 2 +- po/fr.po | 2 +- po/gl.po | 2 +- po/he.po | 2 +- po/hu.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/ko.po | 2 +- po/nb.po | 2 +- po/nl.po | 2 +- po/nn.po | 2 +- po/pl.po | 2 +- po/pt.po | 2 +- po/pt_BR.po | 2 +- po/ro.po | 2 +- po/ru.po | 2 +- po/sk.po | 2 +- po/sl.po | 2 +- po/sv.po | 2 +- po/tl.po | 2 +- po/vi.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- 38 files changed, 50 insertions(+), 41 deletions(-) diff --git a/configure.in b/configure.in index 89586a4ee..ef05ca0cb 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.2ubuntu5") +AC_DEFINE_UNQUOTED(VERSION,"0.7.2ubuntu6") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index c3afcf403..c0226a4c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.7.2ubuntu5) UNRELEASED; urgency=low +apt (0.7.2ubuntu6) gutsy; urgency=low [ Michael Vogt] * cmdline/apt-get.cc: @@ -14,9 +14,18 @@ apt (0.7.2ubuntu5) UNRELEASED; urgency=low the Recommends of metapackages in universe and multiverse will get installed. * Also make this change in doc/examples/configure-index. - * Added a Build Dependancies of autoconf, xsltproc, docbook-xsl to fix FTBFS + * Added a Build Dependancies of automake, docbook-xsl, xsltproc, xmlto, + docbook to fix FTBFS. + * Added in previous changelog entries, as those who uploaded did not + actually commit to Bzr. - -- Sarah Hobbs Fri, 06 Jul 2007 17:44:45 +1000 + -- Sarah Hobbs Mon, 09 Jul 2007 01:15:57 +1000 + +pt (0.7.2ubuntu5) gutsy; urgency=low + + * Rerun autoconf to fix the FTBFS. + + -- Michael Bienia Fri, 06 Jul 2007 19:17:33 +0200 apt (0.7.2ubuntu4) gutsy; urgency=low diff --git a/debian/control b/debian/control index f0503f746..ee4c6fed8 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,8 @@ Maintainer: Ubuntu Core Developers XSBC-Original-Maintainer: APT Development Team Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt Standards-Version: 3.7.2.2 -Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.15.5), autoconf, xsltproc, docbook-xsl -Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) +Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.15.5), automake, docbook-xsl, xsltproc, xmlto, docbook +Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1), docbook-xsl, xsltproc XS-Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/apt/ubuntu Package: apt diff --git a/po/apt-all.pot b/po/apt-all.pot index b308fb316..9bf93eb54 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/bg.po b/po/bg.po index 9c759de25..ada661c76 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2006-10-12 20:14+0300\n" "Last-Translator: Yavor Doganov \n" "Language-Team: Bulgarian \n" diff --git a/po/bs.po b/po/bs.po index 0a7907f99..114494b50 100644 --- a/po/bs.po +++ b/po/bs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Šećerović \n" "Language-Team: Bosnian \n" diff --git a/po/ca.po b/po/ca.po index 3ad8d8b80..a5539ddd7 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2006-02-05 22:00+0100\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" diff --git a/po/cs.po b/po/cs.po index 0222c9fcd..b1b0318d1 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2006-10-04 18:53+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" diff --git a/po/cy.po b/po/cy.po index 90916af31..b1042a21b 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" diff --git a/po/da.po b/po/da.po index c12fa6862..04ae3a00f 100644 --- a/po/da.po +++ b/po/da.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-da\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2007-02-03 15:50+0100\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish\n" diff --git a/po/de.po b/po/de.po index b4d22625e..511cea271 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6.46.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2006-10-24 11:45+0200\n" "Last-Translator: Michael Piefel \n" "Language-Team: \n" diff --git a/po/el.po b/po/el.po index 74b99867e..2d6d9069f 100644 --- a/po/el.po +++ b/po/el.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_el_new\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2006-01-18 15:16+0200\n" "Last-Translator: Konstantinos Margaritis \n" "Language-Team: Greek \n" diff --git a/po/en_GB.po b/po/en_GB.po index 803313cfb..b8c284b7b 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6.46.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2006-10-12 11:07+0100\n" "Last-Translator: Neil Williams \n" "Language-Team: en_GB \n" diff --git a/po/es.po b/po/es.po index 0877ef346..1b8a778cd 100644 --- a/po/es.po +++ b/po/es.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6.42.3exp1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2006-10-08 00:23+0200\n" "Last-Translator: Javier Fernandez-Sanguino \n" "Language-Team: Debian Spanish \n" diff --git a/po/eu.po b/po/eu.po index e6cb07e0b..a6740195b 100644 --- a/po/eu.po +++ b/po/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_eu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2006-09-27 13:59+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: librezale \n" diff --git a/po/fi.po b/po/fi.po index 901dbf96d..f89621fd0 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2006-09-29 16:06+0300\n" "Last-Translator: Tapio Lehtonen \n" "Language-Team: Finnish \n" diff --git a/po/fr.po b/po/fr.po index 4362dc2c2..d422100e3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2007-05-08 11:30+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" diff --git a/po/gl.po b/po/gl.po index 7cde396c2..877916be7 100644 --- a/po/gl.po +++ b/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2007-02-28 13:14+0100\n" "Last-Translator: Jacobo Tarrío \n" "Language-Team: Galician \n" diff --git a/po/he.po b/po/he.po index 2275c47ae..f4029b9c6 100644 --- a/po/he.po +++ b/po/he.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.25\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2004-06-10 19:58+0300\n" "Last-Translator: Lior Kaplan \n" "Language-Team: Hebrew\n" diff --git a/po/hu.po b/po/hu.po index 05b3d6fbf..b92385488 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2006-10-21 11:04+0100\n" "Last-Translator: SZERVÁC Attila \n" "Language-Team: Hungarian \n" diff --git a/po/it.po b/po/it.po index b05a97d82..d0cb1a760 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2006-10-12 09:27+0200\n" "Last-Translator: Samuele Giovanni Tonon \n" "Language-Team: Italian \n" diff --git a/po/ja.po b/po/ja.po index 8b6d30218..4e5055a6c 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2006-09-08 19:57+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian Japanese List \n" diff --git a/po/ko.po b/po/ko.po index d22a98e9f..f07a22ee0 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2006-10-12 21:22-0400\n" "Last-Translator: Sunjae Park \n" "Language-Team: Korean \n" diff --git a/po/nb.po b/po/nb.po index 4ae254629..69a3ee44b 100644 --- a/po/nb.po +++ b/po/nb.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2006-10-16 00:35+0100\n" "Last-Translator: Hans Fredrik Nordhaug \n" "Language-Team: Norwegian Bokmal \n" diff --git a/po/nl.po b/po/nl.po index db40abd2d..6cd713905 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2006-10-17 22:35+0100\n" "Last-Translator: Bart Cornelis \n" "Language-Team: debian-l10n-dutch \n" diff --git a/po/nn.po b/po/nn.po index e33da4203..d161f0a26 100644 --- a/po/nn.po +++ b/po/nn.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_nn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" diff --git a/po/pl.po b/po/pl.po index 0eceb3cb8..23d392ed9 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2006-01-23 15:32+0100\n" "Last-Translator: Bartosz Fenski \n" "Language-Team: Polish \n" diff --git a/po/pt.po b/po/pt.po index f88df0de3..d936d7ba2 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2007-05-09 22:14+0100\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" diff --git a/po/pt_BR.po b/po/pt_BR.po index aab540c40..e48c9d30f 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2006-08-21 00:40-0300\n" "Last-Translator: Felipe Augusto van de Wiel (faw) \n" "Language-Team: l10n portuguese \n" diff --git a/po/ro.po b/po/ro.po index 66b75e2fa..9841b3c06 100644 --- a/po/ro.po +++ b/po/ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_ro\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2006-09-19 01:35+0300\n" "Last-Translator: Sorin Batariuc \n" "Language-Team: Romanian \n" diff --git a/po/ru.po b/po/ru.po index c90b2b191..6ab5d829d 100644 --- a/po/ru.po +++ b/po/ru.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.6.46.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2007-01-03 23:33+0300\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" diff --git a/po/sk.po b/po/sk.po index 92e8bcad4..33255af91 100644 --- a/po/sk.po +++ b/po/sk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2006-09-10 18:50+0200\n" "Last-Translator: Peter Mann \n" "Language-Team: Slovak \n" diff --git a/po/sl.po b/po/sl.po index 337609474..7461a1c92 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2005-02-16 22:18+0100\n" "Last-Translator: Jure Cuhalev \n" "Language-Team: Slovenian \n" diff --git a/po/sv.po b/po/sv.po index 21c325289..753510edb 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2006-08-18 15:45+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" diff --git a/po/tl.po b/po/tl.po index 1b5a6f37b..f25adab9b 100644 --- a/po/tl.po +++ b/po/tl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" diff --git a/po/vi.po b/po/vi.po index 094920e6d..042f5f8a4 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2007-06-01 15:00+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 858cdda9e..204f78276 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.23\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2007-03-29 17:14+0800\n" "Last-Translator: Kov Chai \n" "Language-Team: Debian Chinese [GB] \n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 0de882d8f..211de9fce 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-06 17:45+1000\n" +"POT-Creation-Date: 2007-07-09 01:22+1000\n" "PO-Revision-Date: 2006-10-21 16:58+0800\n" "Last-Translator: Asho Yeh \n" "Language-Team: Chinese/Traditional \n" -- cgit v1.2.3 From d52cf756b5e14c200ba502bed546254e464799cc Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 9 Jul 2007 18:58:16 +0200 Subject: * fix build-dependencies --- debian/changelog | 6 ++++++ debian/control | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c0226a4c8..8b78201aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apt (0.7.2ubuntu7) gutsy; urgency=low + + * fix build-dependencies + + -- + apt (0.7.2ubuntu6) gutsy; urgency=low [ Michael Vogt] diff --git a/debian/control b/debian/control index ee4c6fed8..e2ab8ec4e 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,8 @@ Maintainer: Ubuntu Core Developers XSBC-Original-Maintainer: APT Development Team Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt Standards-Version: 3.7.2.2 -Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.15.5), automake, docbook-xsl, xsltproc, xmlto, docbook -Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1), docbook-xsl, xsltproc +Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5) +Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) XS-Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/apt/ubuntu Package: apt -- cgit v1.2.3 From b3aac1bb35d4f8e11ffc45462f450632de9a571f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 3 Aug 2007 15:01:18 +0200 Subject: * debian/changelog: updated credits * apt-pkg/deb/dpkgpm.cc: merged from dpkg-log branch --- apt-pkg/deb/dpkgpm.cc | 6 ++++-- debian/changelog | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index befd9124c..08c95b7a4 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -846,12 +846,14 @@ bool pkgDPkgPM::Go(int OutStatusFd) if(stopOnError) { - fclose(term_out); + if(term_out) + fclose(term_out); return false; } } } - fclose(term_out); + if(term_out) + fclose(term_out); if (RunScripts("DPkg::Post-Invoke") == false) return false; diff --git a/debian/changelog b/debian/changelog index 02b637553..a2dafbaea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,10 +9,11 @@ apt (0.7.6ubuntu1) gutsy; urgency=low - only send LastModified if we actually have one - send range request with if-range - delete failed downloads + (thanks to Thom May for his help here) * apt-pkg/deb/dpkgpm.{cc,h}: - merged dpkg-log branch, this lets you specify a Dir::Log::Terminal file to log dpkg output to - (ABI break) + (ABI break) * merged apt--sha256 branch to fully support the new sha256 checksums in the Packages and Release files (ABI break) -- cgit v1.2.3 From 8ecd1fedeace0e22f96259e250094006c673d065 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 3 Aug 2007 18:43:46 +0200 Subject: - when writting apport reports, attach the dpkg terminal log too --- apt-pkg/deb/dpkgpm.cc | 29 +++++++++++++++++++++++++---- apt-pkg/deb/dpkgpm.h | 5 +++-- debian/changelog | 2 ++ 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 08c95b7a4..6cb444ef1 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -44,7 +44,8 @@ using namespace std; // --------------------------------------------------------------------- /* */ pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) - : pkgPackageManager(Cache), dpkgbuf_pos(0), PackagesTotal(0), PackagesDone(0) + : pkgPackageManager(Cache), dpkgbuf_pos(0), PackagesTotal(0), + PackagesDone(0), term_out(NULL) { } /*}}}*/ @@ -351,7 +352,7 @@ void pkgDPkgPM::DoStdin(int master) /* * read the terminal pty and write log */ -void pkgDPkgPM::DoTerminalPty(int master, FILE *term_out) +void pkgDPkgPM::DoTerminalPty(int master) { char term_buf[1024] = {0,}; @@ -569,7 +570,6 @@ bool pkgDPkgPM::Go(int OutStatusFd) return _error->Error(_("Directory '%s' missing"), logdir.c_str()); string logfile_name = flCombine(logdir, _config->Find("Dir::Log::Terminal")); - FILE *term_out = NULL; if (!logfile_name.empty()) { term_out = fopen(logfile_name.c_str(),"a"); @@ -812,7 +812,7 @@ bool pkgDPkgPM::Go(int OutStatusFd) continue; if(FD_ISSET(master, &rfds)) - DoTerminalPty(master, term_out); + DoTerminalPty(master); if(FD_ISSET(0, &rfds)) DoStdin(master); if(FD_ISSET(_dpkgin, &rfds)) @@ -956,6 +956,27 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) fprintf(report, "Package: %s %s\n", pkgname.c_str(), pkgver.c_str()); fprintf(report, "SourcePackage: %s\n", srcpkgname.c_str()); fprintf(report, "ErrorMessage:\n %s\n", errormsg); + + // ensure that the log is flushed + if(term_out) + fflush(term_out); + + // attach terminal log it if we have it + string logfile_name = _config->FindFile("Dir::Log::Terminal"); + if (!logfile_name.empty()) + { + FILE *log = NULL; + char buf[1024]; + + fprintf(report, "DpkgTerminalLog:\n"); + log = fopen(logfile_name.c_str(),"r"); + if(log != NULL) + { + while( fgets(buf, sizeof(buf), log) != NULL) + fprintf(report, " %s", buf); + fclose(log); + } + } fclose(report); } /*}}}*/ diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index f8e9e44a8..222add98f 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -26,7 +26,8 @@ class pkgDPkgPM : public pkgPackageManager // the buffer we use for the dpkg status-fd reading char dpkgbuf[1024]; int dpkgbuf_pos; - + FILE *term_out; + protected: int pkgFailures; @@ -71,7 +72,7 @@ class pkgDPkgPM : public pkgPackageManager // input processing void DoStdin(int master); - void DoTerminalPty(int master, FILE *out); + void DoTerminalPty(int master); void DoDpkgStatusFd(int statusfd, int OutStatusFd); void ProcessDpkgStatusLine(int OutStatusFd, char *line); diff --git a/debian/changelog b/debian/changelog index a2dafbaea..1e9511875 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ apt (0.7.6ubuntu1) gutsy; urgency=low - merged dpkg-log branch, this lets you specify a Dir::Log::Terminal file to log dpkg output to (ABI break) + - when writting apport reports, attach the dpkg + terminal log too * merged apt--sha256 branch to fully support the new sha256 checksums in the Packages and Release files (ABI break) -- cgit v1.2.3 From 25ffa4e814c5e8cceae339476787291d3ee584cf Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 6 Aug 2007 16:48:55 +0200 Subject: * apt-pkg/deb/dpkgpm.cc: - fix packagename extraction when writting apport reports --- apt-pkg/deb/dpkgpm.cc | 4 ++-- debian/changelog | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index a65f6eb0a..dad8da9ed 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -895,9 +895,9 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) // get the pkgname and reportfile pkgname = flNotDir(pkgpath); - pos = pkgname.rfind('_'); + pos = pkgname.find('_'); if(pos != string::npos) - pkgname = string(pkgname, 0, pos); + pkgname = pkgname.substr(0, pos); // find the package versin and source package name pkgCache::PkgIterator Pkg = Cache.FindPkg(pkgname); diff --git a/debian/changelog b/debian/changelog index fbee91ee2..8dbe214ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.6ubuntu3) gutsy; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - fix packagename extraction when writting apport reports + + -- + apt (0.7.6ubuntu2) gutsy; urgency=low * doc/examples/sources.list: -- cgit v1.2.3 From c05b6385ee33b72927c229b5279ee2f5383ad414 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 6 Aug 2007 18:21:40 +0200 Subject: * apt-pkg/pkgcachegen.cc: - increase default mmap size (LP: #125640) --- apt-pkg/pkgcachegen.cc | 4 ++-- debian/changelog | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 4e186f466..d00cd4e64 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -781,7 +781,7 @@ static bool BuildCache(pkgCacheGenerator &Gen, bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, MMap **OutMap,bool AllowMem) { - unsigned long MapSize = _config->FindI("APT::Cache-Limit",16*1024*1024); + unsigned long MapSize = _config->FindI("APT::Cache-Limit",24*1024*1024); vector Files; for (vector::const_iterator i = List.begin(); @@ -928,7 +928,7 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, /* */ bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap) { - unsigned long MapSize = _config->FindI("APT::Cache-Limit",12*1024*1024); + unsigned long MapSize = _config->FindI("APT::Cache-Limit",20*1024*1024); vector Files; unsigned long EndOfSource = Files.size(); if (_system->AddStatusFiles(Files) == false) diff --git a/debian/changelog b/debian/changelog index 8dbe214ea..6861a1ba8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ apt (0.7.6ubuntu3) gutsy; urgency=low * apt-pkg/deb/dpkgpm.cc: - fix packagename extraction when writting apport reports + * apt-pkg/pkgcachegen.cc: + - increase default mmap size (LP: #125640) -- -- cgit v1.2.3 From b799e134fc730519cc8f0c0ea4387badffac4092 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 8 Aug 2007 12:52:56 +0200 Subject: * cmdline/apt-get.cc: - remove YnPrompt when a XS-Vcs- tag is found, improve the notice (LP: #129575) --- cmdline/apt-get.cc | 11 ++++------- configure.in | 2 +- debian/changelog | 10 +++++++++- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index ead053136..e7b7d5204 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2130,20 +2130,17 @@ bool DoSource(CommandLine &CmdL) pos += vcs.length()+2; string::size_type epos = srec.find("\n", pos); string uri = srec.substr(pos,epos-pos).c_str(); - ioprintf(c1out, _("WARNING: '%s' is maintained in " + ioprintf(c1out, _("NOTICE: '%s' packaging is maintained in " "the '%s' version control system at:\n" "%s\n"), Src.c_str(), vcs.c_str(), uri.c_str()); if(vcs == "Bzr") ioprintf(c1out,_("Please use:\n" "bzr get %s\n" - "to modify the package.\n"), + "to retrieve the latest (possible unreleased) " + "updates to the package.\n"), uri.c_str()); - ioprintf(c1out, "Are you sure you want to continue [yN]? "); - if(!YnPrompt(false)) - return _error->Error(_("Abort.")); - else - break; + break; } // Back track diff --git a/configure.in b/configure.in index b2f10baed..d1a684eb2 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.6ubuntu2") +AC_DEFINE_UNQUOTED(VERSION,"0.7.6ubuntu3") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 6861a1ba8..c4eba136f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.6ubuntu4) gutsy; urgency=low + + * cmdline/apt-get.cc: + - remove YnPrompt when a XS-Vcs- tag is found, improve the + notice (LP: #129575) + + -- + apt (0.7.6ubuntu3) gutsy; urgency=low * apt-pkg/deb/dpkgpm.cc: @@ -5,7 +13,7 @@ apt (0.7.6ubuntu3) gutsy; urgency=low * apt-pkg/pkgcachegen.cc: - increase default mmap size (LP: #125640) - -- + -- Michael Vogt Tue, 07 Aug 2007 09:52:00 +0200 apt (0.7.6ubuntu2) gutsy; urgency=low -- cgit v1.2.3 From fb7bf91ccc01c6fa16ea2eb2b714d5a1b808c1ea Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 16 Aug 2007 01:10:35 +0100 Subject: dpkg-triggers: deal properly with new package states; 0.7.6ubuntu6 --- apt-pkg/algorithms.cc | 2 ++ apt-pkg/deb/deblistparser.cc | 2 ++ apt-pkg/deb/dpkgpm.cc | 7 ++++++- apt-pkg/pkgcache.cc | 6 ++++-- apt-pkg/pkgcache.h | 3 ++- debian/changelog | 6 ++++++ doc/cache.sgml | 2 ++ 7 files changed, 24 insertions(+), 4 deletions(-) diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index b21fcbb2f..62727a852 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -257,6 +257,8 @@ bool pkgApplyStatus(pkgDepCache &Cache) re-unpacked (probably) */ case pkgCache::State::UnPacked: case pkgCache::State::HalfConfigured: + case pkgCache::State::TriggersAwaited: + case pkgCache::State::TriggersPending: if ((I->CurrentVer != 0 && I.CurrentVer().Downloadable() == true) || I.State() != pkgCache::PkgIterator::NeedsUnpack) Cache.MarkKeep(I, false, false); diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 074abea6d..896d4d6d8 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -293,6 +293,8 @@ bool debListParser::ParseStatus(pkgCache::PkgIterator Pkg, {"installed",pkgCache::State::Installed}, {"half-installed",pkgCache::State::HalfInstalled}, {"config-files",pkgCache::State::ConfigFiles}, + {"triggers-awaited",pkgCache::State::TriggersAwaited}, + {"triggers-pending",pkgCache::State::TriggersPending}, {"post-inst-failed",pkgCache::State::HalfConfigured}, {"removal-failed",pkgCache::State::HalfInstalled}, {}}; diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index dad8da9ed..c386e4b24 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -521,7 +521,7 @@ bool pkgDPkgPM::Go(int OutStatusFd) // map the dpkg states to the operations that are performed // (this is sorted in the same way as Item::Ops) - static const struct DpkgState DpkgStatesOpMap[][5] = { + static const struct DpkgState DpkgStatesOpMap[][7] = { // Install operation { {"half-installed", N_("Preparing %s")}, @@ -532,12 +532,17 @@ bool pkgDPkgPM::Go(int OutStatusFd) { {"unpacked",N_("Preparing to configure %s") }, {"half-configured", N_("Configuring %s") }, + {"triggers-awaited", N_("Processing triggers for %s") }, + {"triggers-pending", N_("Processing triggers for %s") }, + {"half-configured", N_("Configuring %s") }, { "installed", N_("Installed %s")}, {NULL, NULL} }, // Remove operation { {"half-configured", N_("Preparing for removal of %s")}, + {"triggers-awaited", N_("Preparing for removal of %s")}, + {"triggers-pending", N_("Preparing for removal of %s")}, {"half-installed", N_("Removing %s")}, {"config-files", N_("Removed %s")}, {NULL, NULL} diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 7e3b9d78c..133899a27 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -49,7 +49,7 @@ pkgCache::Header::Header() /* Whenever the structures change the major version should be bumped, whenever the generator changes the minor version should be bumped. */ - MajorVersion = 6; + MajorVersion = 7; MinorVersion = 0; Dirty = false; @@ -274,7 +274,9 @@ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const return NeedsUnpack; if (Pkg->CurrentState == pkgCache::State::UnPacked || - Pkg->CurrentState == pkgCache::State::HalfConfigured) + Pkg->CurrentState == pkgCache::State::HalfConfigured || + Pkg->CurrentState == pkgCache::State::TriggersPending || + Pkg->CurrentState == pkgCache::State::TriggersAwaited) return NeedsConfigure; if (Pkg->CurrentState == pkgCache::State::HalfInstalled || diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 83b7548a3..59d5003bb 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -81,7 +81,8 @@ class pkgCache enum PkgSelectedState {Unknown=0,Install=1,Hold=2,DeInstall=3,Purge=4}; enum PkgInstState {Ok=0,ReInstReq=1,HoldInst=2,HoldReInstReq=3}; enum PkgCurrentState {NotInstalled=0,UnPacked=1,HalfConfigured=2, - HalfInstalled=4,ConfigFiles=5,Installed=6}; + HalfInstalled=4,ConfigFiles=5,Installed=6, + TriggersAwaited=7,TriggersPending=8}; }; struct Flag diff --git a/debian/changelog b/debian/changelog index 7b71c3608..e526bc756 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apt (0.7.6ubuntu6) gutsy; urgency=low + + * dpkg-triggers: Deal properly with new package states. + + -- Ian Jackson Wed, 15 Aug 2007 20:44:37 +0100 + apt (0.7.6ubuntu5) UNRELEASED; urgency=low * apt-pkg/acquire-item.cc: diff --git a/doc/cache.sgml b/doc/cache.sgml index e257dcd81..aea5a45c3 100644 --- a/doc/cache.sgml +++ b/doc/cache.sgml @@ -721,6 +721,8 @@ or'd with the current package. #define pkgSTATE_HalfInstalled 4 #define pkgSTATE_ConfigFiles 5 #define pkgSTATE_Installed 6 +#define pkgSTATE_TriggersAwaited 7 +#define pkgSTATE_TriggersPending 8 -- cgit v1.2.3 From 394957744d64b13473bfeea5403a7a11284510dc Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 5 Sep 2007 14:16:45 +0200 Subject: * reupload to fix FTBFS --- configure.in | 2 +- debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index d1a684eb2..1f3ff9ef0 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.6ubuntu3") +AC_DEFINE_UNQUOTED(VERSION,"0.7.6ubuntu7") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index e526bc756..304588fab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apt (0.7.6ubuntu7) gutsy; urgency=low + + * reupload to fix FTBFS + + -- Michael Vogt Thu, 16 Aug 2007 19:44:20 +0200 + apt (0.7.6ubuntu6) gutsy; urgency=low * dpkg-triggers: Deal properly with new package states. -- cgit v1.2.3 From 5d053270a275d1c825c793151f50bf3b680f55ec Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 5 Sep 2007 15:10:55 +0200 Subject: * apt-pkg/deb/dpkgpm.{cc,h}: - fix bug in dpkg log writing when a signal is caught during select() (LP: #134858) - write end marker in the log as well --- apt-pkg/deb/dpkgpm.cc | 78 ++++++++++++++++++++++++++++++++++----------------- apt-pkg/deb/dpkgpm.h | 4 +++ debian/changelog | 9 ++++++ 3 files changed, 65 insertions(+), 26 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index c386e4b24..90ae413f4 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -498,6 +498,46 @@ void pkgDPkgPM::DoDpkgStatusFd(int statusfd, int OutStatusFd) } /*}}}*/ +bool pkgDPkgPM::OpenLog() +{ + string logdir = _config->FindDir("Dir::Log"); + if(not FileExists(logdir)) + return _error->Error(_("Directory '%s' missing"), logdir.c_str()); + string logfile_name = flCombine(logdir, + _config->Find("Dir::Log::Terminal")); + if (!logfile_name.empty()) + { + term_out = fopen(logfile_name.c_str(),"a"); + chmod(logfile_name.c_str(), 0600); + // output current time + char outstr[200]; + time_t t = time(NULL); + struct tm *tmp = localtime(&t); + strftime(outstr, sizeof(outstr), "%F %T", tmp); + fprintf(term_out, "\nLog started: "); + fprintf(term_out, outstr); + fprintf(term_out, "\n"); + } + return true; +} + +bool pkgDPkgPM::CloseLog() +{ + if(term_out) + { + char outstr[200]; + time_t t = time(NULL); + struct tm *tmp = localtime(&t); + strftime(outstr, sizeof(outstr), "%F %T", tmp); + fprintf(term_out, "Log ended: "); + fprintf(term_out, outstr); + fprintf(term_out, "\n"); + fclose(term_out); + } + term_out = NULL; + return true; +} + // DPkgPM::Go - Run the sequence /*{{{*/ // --------------------------------------------------------------------- @@ -571,24 +611,7 @@ bool pkgDPkgPM::Go(int OutStatusFd) } // create log - string logdir = _config->FindDir("Dir::Log"); - if(not FileExists(logdir)) - return _error->Error(_("Directory '%s' missing"), logdir.c_str()); - string logfile_name = flCombine(logdir, - _config->Find("Dir::Log::Terminal")); - if (!logfile_name.empty()) - { - term_out = fopen(logfile_name.c_str(),"a"); - chmod(logfile_name.c_str(), 0600); - // output current time - char outstr[200]; - time_t t = time(NULL); - struct tm *tmp = localtime(&t); - strftime(outstr, sizeof(outstr), "%F %T", tmp); - fprintf(term_out, "\nLog started: "); - fprintf(term_out, outstr); - fprintf(term_out, "\n"); - } + OpenLog(); // this loop is runs once per operation for (vector::iterator I = List.begin(); I != List.end();) @@ -818,10 +841,15 @@ bool pkgDPkgPM::Go(int OutStatusFd) tv.tv_sec = 1; tv.tv_usec = 0; select_ret = select(max(master, _dpkgin)+1, &rfds, NULL, NULL, &tv); - if (select_ret < 0) - std::cerr << "Error in select()" << std::endl; - else if (select_ret == 0) - continue; + if (select_ret == 0) + continue; + else if (select_ret < 0 && errno == EINTR) + continue; + else if (select_ret < 0) + { + perror("select() returned error"); + continue; + } if(master >= 0 && FD_ISSET(master, &rfds)) DoTerminalPty(master); @@ -859,14 +887,12 @@ bool pkgDPkgPM::Go(int OutStatusFd) if(stopOnError) { - if(term_out) - fclose(term_out); + CloseLog(); return false; } } } - if(term_out) - fclose(term_out); + CloseLog(); if (RunScripts("DPkg::Post-Invoke") == false) return false; diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index debde36a3..e5f197405 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -70,6 +70,10 @@ class pkgDPkgPM : public pkgPackageManager // apport integration void WriteApportReport(const char *pkgpath, const char *errormsg); + // dpkg log + bool OpenLog(); + bool CloseLog(); + // input processing void DoStdin(int master); void DoTerminalPty(int master); diff --git a/debian/changelog b/debian/changelog index 304588fab..b0f414126 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +apt (0.7.6ubuntu8) gutsy; urgency=low + + * apt-pkg/deb/dpkgpm.{cc,h}: + - fix bug in dpkg log writing when a signal is caught during + select() (LP: #134858) + - write end marker in the log as well + + -- Michael Vogt Wed, 05 Sep 2007 15:03:46 +0200 + apt (0.7.6ubuntu7) gutsy; urgency=low * reupload to fix FTBFS -- cgit v1.2.3 From 9d5a74688f0b11e92073cad80f5581f7dfd1a76c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 5 Sep 2007 15:51:43 +0200 Subject: * add missing 'debian/copyright' why did that got lost from the bzr tree?!?!? --- configure.in | 2 +- debian/copyright | 142 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+), 1 deletion(-) create mode 100644 debian/copyright diff --git a/configure.in b/configure.in index 1f3ff9ef0..736706c0c 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.6ubuntu7") +AC_DEFINE_UNQUOTED(VERSION,"0.7.6ubuntu8") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 000000000..9e277e57d --- /dev/null +++ b/debian/copyright @@ -0,0 +1,142 @@ +Apt is copyright 1997, 1998, 1999 Jason Gunthorpe and others. + +Apt is licened under the terms of the GNU General Public License (GPL), +version 2.0 or later, as published by the Free Software Foundation. See +the file COPYING.GPL [included], /usr/share/common-licenses/GPL, or + for the terms of the latest version +of the GNU General Public License. + +In addition, prior to November 15th, 2000, apt may be distributed under +terms identical to the above with the following addition: + +Works using apt may link against the GUI library "libqt", copyright by +Troll Tech AS, Norway, provided that: + +1. The version of "libqt" is licensed under the terms of the "Qt Free Edition + License" published by Troll Tech AS. The license terms identified as + the Qt Free Edition License below are the only such terms under which + distribution of works derived from both apt and "libqt" are permitted; + +and + +2. The source code of the version of "libqt" used is + + a) Distributed with the binary version; + + or + + b) Downloadable by anyone, without fee, using a publicly-announced + URL on the Internet, for a duration of at least three years + starting with distribution of the binary version. + +On and after November 15th, 2000, the above additional terms lose all +force, and apt will be licensed only under the terms of the GNU General +Public License, version 2.0 or later. + + _______________________________________________________________ + +The following text, up to the text of the Qt Free Edition License, is +informational and not part of the license terms on apt. + +Modifications to apt in either source or compiled form must be licensed +under the terms of the GNU General Public License, version 2.0 (or later), +but need not include the above clause permitting usage of the "libqt" +library under the Qt Free Edition License. Note that removal of this +clause will result in software which is not licensed for binary +redistribution linked against software governed by the Qt Free Edition +License. In the event that a version of "libqt" is released that is +licensed under terms that do not conflict with the GPL, the additional +clause above is not required to grant permission for distribution of works +that are derived from both apt and "libqt". + +No part of apt is licensed under the Qt Free Edition License. The terms +below are provided to help identify the circumstances under which the +"libqt" library may be used with apt (or a work derived from both). The +terms below are copied from the LICENSE file of the qt-1.44 distribution, +as of November 10th, 1999. + + _______________________________________________________________ + + QT FREE EDITION LICENSE + +Copyright (C) 1992-1999 Troll Tech AS. All rights reserved. + +This is the license for Qt Free Edition version 1.44; it covers private use, +use of third-party application programs based on Qt, and development of +free software for the free software community. + + + COPYRIGHT AND RESTRICTIONS + +The Qt toolkit is a product of Troll Tech AS. The Qt Free Edition is limited +to use with the X Window System. + +You may copy this version of the Qt Free Edition provided that the entire +archive is distributed unchanged and as a whole, including this notice. + +You may use this version of the Qt Free Edition to compile, link and run +application programs legally developed by third parties. + +You may use the Qt Free Edition to create application programs +provided that: + + You accept this license. + Your software does not require modifications to Qt Free Edition. + You satisfy ONE of the following three requirements + EITHER + Users of your software can freely obtain source code for the + software, freely modify the source code (possibly with + restrictions on copyright notices, attributions and legal + responsibility), and freely redistribute original or modified + versions of the software. + OR + Your software is distributed under the GNU GENERAL + PUBLIC LICENSE, version 2 or later, as defined by the + Free Software Foundation. + OR + Your software is distributed under the GNU LIBRARY + GENERAL PUBLIC LICENSE, version 2 or later, as + defined by the Free Software Foundation. + +If you are paid to develop something with Qt Free Edition or it is a part of +your job the following conditions also apply: + + Your software must not require libraries, programs, data or + documentation that are not available outside your organization in + order to compile or use. + If and when your organization starts using the software, you must + notify Troll Tech AS of the following: + Your organization's name and purpose. + The software's name and purpose. + The software's license. + That your organization considers the software to be free + software. + +You may also use the Qt Free Edition to create reusable components +(such as libraries) provided that you accept the terms above, and in +addition that: + + Your components' license includes the following text: + + [Your package] requires the Qt library, which is + copyright Troll Tech AS. Freely distributable + programs may generally use Qt Free Edition free of + charge, see [README.QT] for details. + + README.QT is distributed along with your components. + Qt Free Edition is not distributed as an integral part of your + components. + + LIMITATIONS OF LIABILITY + +Troll Tech AS makes no obligation under this license to support or +upgrade Qt Free Edition, or assist in the use of Qt Free Edition. + +In no event shall Troll Tech AS be liable for any lost revenue or profits or +other direct, indirect, special, incidental or consequential damages, even +if Troll Tech has been advised of the possibility of such damages. + +QT FREE EDITION IS PROVIDED AS IS WITH NO WARRANTY OF ANY KIND, +INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE. + _______________________________________________________________ -- cgit v1.2.3 From cca374a232065c48d3979a9af9bf9bdaaf4664c8 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 5 Sep 2007 18:43:34 +0200 Subject: debian/rules: - do not clean debian/copyright, soyuz checks for it now --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index a46169a7b..ef2e6b896 100755 --- a/debian/rules +++ b/debian/rules @@ -131,7 +131,7 @@ clean: rm -rf build # Add here commands to clean up after the build process. - dh_clean debian/copyright debian/shlibs.local debian/shlibs.local.apt debian/shlibs.local.apt-utils + dh_clean debian/shlibs.local debian/shlibs.local.apt debian/shlibs.local.apt-utils binary-indep: apt-doc libapt-pkg-doc # Build architecture-independent files here. -- cgit v1.2.3 From a44aeb52f0476ed56feff82b1cfd2fa84e7a1223 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 10 Sep 2007 15:09:28 +0200 Subject: * apt-pkg/deb/dpkgpm.cc: - fix progress reporting precent calculation (LP: #137798) --- apt-pkg/deb/dpkgpm.cc | 5 ++++- debian/changelog | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 90ae413f4..8b4e6701a 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -572,17 +572,20 @@ bool pkgDPkgPM::Go(int OutStatusFd) { {"unpacked",N_("Preparing to configure %s") }, {"half-configured", N_("Configuring %s") }, +#if 0 {"triggers-awaited", N_("Processing triggers for %s") }, {"triggers-pending", N_("Processing triggers for %s") }, - {"half-configured", N_("Configuring %s") }, +#endif { "installed", N_("Installed %s")}, {NULL, NULL} }, // Remove operation { {"half-configured", N_("Preparing for removal of %s")}, +#if 0 {"triggers-awaited", N_("Preparing for removal of %s")}, {"triggers-pending", N_("Preparing for removal of %s")}, +#endif {"half-installed", N_("Removing %s")}, {"config-files", N_("Removed %s")}, {NULL, NULL} diff --git a/debian/changelog b/debian/changelog index b0f414126..e34dc385b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.6ubuntu9) gutsy; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - fix progress reporting precent calculation (LP: #137798) + + -- Michael Vogt Mon, 10 Sep 2007 14:57:53 +0200 + apt (0.7.6ubuntu8) gutsy; urgency=low * apt-pkg/deb/dpkgpm.{cc,h}: -- cgit v1.2.3 From 12121baed79ed5f47020b495519b68d1c37e0123 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 14 Sep 2007 14:26:09 +0200 Subject: revert rev 1327.1.89.1.87.2.28 (bzr merge . -r 1327.1.89.1.87.2.28..1327.1.89.1.87.2.27) --- apt-pkg/acquire.cc | 2 +- debian/changelog | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 6840ae120..cbd67055d 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -619,7 +619,7 @@ bool pkgAcquire::Queue::Startup() added other source retry to have cycle maintain a pipeline depth on its own. */ if (Cnf->Pipeline == true) - MaxPipeDepth = 1000; + MaxPipeDepth = 10; else MaxPipeDepth = 1; } diff --git a/debian/changelog b/debian/changelog index 01b9dbae0..f811a4c0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,9 +2,6 @@ apt (0.7.6ubuntu9) gutsy; urgency=low * apt-pkg/deb/dpkgpm.cc: - fix progress reporting precent calculation (LP: #137798) - * apt-pkg/acquire.cc: - - increase MaxPipeDepth for the internal worker<->method - communication to 1000 for the debtorrent backend * make apt build with g++ 4.3 * fix missing SetExecClose() call when the status-fd is used (LP: #136767) @@ -97,9 +94,6 @@ apt (0.7.6ubuntu1) gutsy; urgency=low - increase default mmap size * tests/local-repo: - added local repository testcase - * apt-pkg/acquire.cc: - - increase MaxPipeDepth for the internal worker<->method - communication to 1000 for the debtorrent backend * make apt build with g++ 4.3 [ Ian Jackson ] -- cgit v1.2.3 From 296e7f4b92edd2fe13c6caf689aaa29dc56b860f Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sat, 22 Sep 2007 21:38:43 +0100 Subject: * apt-pkg/contrib/mmap.cc: - don't fail if msync() returns > 0 (LP: #144001) --- apt-pkg/contrib/mmap.cc | 4 ++-- debian/changelog | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index 7f814c2d2..abcae46fe 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -117,7 +117,7 @@ bool MMap::Sync() #ifdef _POSIX_SYNCHRONIZED_IO if ((Flags & ReadOnly) != ReadOnly) - if (msync((char *)Base,iSize,MS_SYNC) != 0) + if (msync((char *)Base,iSize,MS_SYNC) < 0) return _error->Errno("msync","Unable to write mmap"); #endif return true; @@ -134,7 +134,7 @@ bool MMap::Sync(unsigned long Start,unsigned long Stop) #ifdef _POSIX_SYNCHRONIZED_IO unsigned long PSize = sysconf(_SC_PAGESIZE); if ((Flags & ReadOnly) != ReadOnly) - if (msync((char *)Base+(int)(Start/PSize)*PSize,Stop - Start,MS_SYNC) != 0) + if (msync((char *)Base+(int)(Start/PSize)*PSize,Stop - Start,MS_SYNC) < 0) return _error->Errno("msync","Unable to write mmap"); #endif return true; diff --git a/debian/changelog b/debian/changelog index effaed1f7..60fce3015 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.6ubuntu11) UNRELEASED; urgency=low + + * apt-pkg/contrib/mmap.cc: + - don't fail if msync() returns > 0 (LP: #144001) + + -- Colin Watson Sat, 22 Sep 2007 21:21:19 +0100 + apt (0.7.6ubuntu10) gutsy; urgency=low * apt-pkg/deb/dpkgpm.cc: -- cgit v1.2.3 From d0c069e3c4a6a0860dae3a19749a39a706efead6 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sat, 22 Sep 2007 21:43:17 +0100 Subject: releasing version 0.7.6ubuntu11 --- configure.in | 2 +- debian/changelog | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 6ffc99f56..87d8a7d9f 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.6ubuntu10") +AC_DEFINE_UNQUOTED(VERSION,"0.7.6ubuntu11") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 60fce3015..e48a643fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -apt (0.7.6ubuntu11) UNRELEASED; urgency=low +apt (0.7.6ubuntu11) gutsy; urgency=low * apt-pkg/contrib/mmap.cc: - don't fail if msync() returns > 0 (LP: #144001) - -- Colin Watson Sat, 22 Sep 2007 21:21:19 +0100 + -- Colin Watson Sat, 22 Sep 2007 21:39:29 +0100 apt (0.7.6ubuntu10) gutsy; urgency=low -- cgit v1.2.3 From bf1aaa6c9d989b328c031360658a8a0d592bc755 Mon Sep 17 00:00:00 2001 From: Paul Sladen Date: Thu, 27 Sep 2007 06:05:03 +0300 Subject: * Have 'cron.daily/apt' send D-Bus doesn't exist error messages to the bit bucket. Thanks to 'dasdda'. (LP: #115397) --- debian/apt.cron.daily | 5 ++++- debian/changelog | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 34d6b164f..48714ec15 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -173,8 +173,11 @@ fi UPDATE_STAMP=/var/lib/apt/periodic/update-stamp if check_stamp $UPDATE_STAMP $UpdateInterval; then if apt-get -qq update 2>/dev/null; then + # Could possible test access to '/var/run/dbus/system_bus_socket' has well, + # but I'm not sure how stable the internal pipe location is defined as + # being; so for the moment just 2>/dev/null . --sladen 2007-09-27 if which dbus-send >/dev/null; then - dbus-send --system / app.apt.dbus.updated boolean:true + dbus-send --system / app.apt.dbus.updated boolean:true 2>/dev/null || true fi update_stamp $UPDATE_STAMP fi diff --git a/debian/changelog b/debian/changelog index abeddb4af..3f1641ee2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,12 @@ apt (0.7.6ubuntu12) gutsy; urgency=low - Fix chmoding after have renamed the extended-states file (LP: #140019) (thanks to Laurent Bigonville, LP: #140019) - -- + [Paul Sladen] + + * Have 'cron.daily/apt' send D-Bus doesn't exist error messages + to the bit bucket. Thanks to 'dasdda'. (LP: #115397) + + -- apt (0.7.6ubuntu11) gutsy; urgency=low -- cgit v1.2.3 From a60beec6cffa558221d845a05db63bdfff101e5c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 3 Oct 2007 02:19:54 +0200 Subject: * apt-pkg/deb/debmetaindex.cc: comparison with string literal results in unspecified behaviour; --- apt-pkg/deb/debmetaindex.cc | 2 +- debian/changelog | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index 94995798f..c700f8d58 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -224,7 +224,7 @@ class debSLTypeDebian : public pkgSourceList::Type // This check insures that there will be only one Release file // queued for all the Packages files and Sources files it // corresponds to. - if ((*I)->GetType() == "deb") + if (strcmp((*I)->GetType(), "deb") == 0) { debReleaseIndex *Deb = (debReleaseIndex *) (*I); // This check insures that there will be only one Release file diff --git a/debian/changelog b/debian/changelog index 3f1641ee2..87b9dd024 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,17 @@ apt (0.7.6ubuntu12) gutsy; urgency=low + [ Michael Vogt ] * cmdline/apt-mark: - Fix chmoding after have renamed the extended-states file (LP: #140019) (thanks to Laurent Bigonville, LP: #140019) + * apt-pkg/deb/debmetaindex.cc: comparison with string literal results + in unspecified behaviour; [Paul Sladen] - * Have 'cron.daily/apt' send D-Bus doesn't exist error messages to the bit bucket. Thanks to 'dasdda'. (LP: #115397) - -- + -- Michael Vogt Wed, 03 Oct 2007 02:17:45 +0200 apt (0.7.6ubuntu11) gutsy; urgency=low -- cgit v1.2.3 From d530b4c24fc452efc82be4b7e1ebc536a00c09b7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 3 Oct 2007 02:21:52 +0200 Subject: * Reset curl options and timestamp between downloaded files. Thanks to Ryan Murray for the patch --- debian/changelog | 2 ++ methods/https.cc | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/debian/changelog b/debian/changelog index 87b9dd024..375a6bb1e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ apt (0.7.6ubuntu12) gutsy; urgency=low (thanks to Laurent Bigonville, LP: #140019) * apt-pkg/deb/debmetaindex.cc: comparison with string literal results in unspecified behaviour; + * Reset curl options and timestamp between downloaded files. Thanks to + Ryan Murray for the patch [Paul Sladen] * Have 'cron.daily/apt' send D-Bus doesn't exist error messages diff --git a/methods/https.cc b/methods/https.cc index e6717e63a..3b2b0bb19 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -115,6 +115,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm) // - error checking/reporting // - more debug options? (CURLOPT_DEBUGFUNCTION?) + curl_easy_reset(curl); SetupProxy(); // callbacks @@ -125,6 +126,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, this); curl_easy_setopt(curl, CURLOPT_NOPROGRESS, false); curl_easy_setopt(curl, CURLOPT_FAILONERROR, true); + curl_easy_setopt(curl, CURLOPT_FILETIME, true); // FIXME: https: offer various options of verification bool peer_verify = _config->FindB("Acquire::https::Verify-Peer", false); @@ -202,6 +204,9 @@ bool HttpsMethod::Fetch(FetchItem *Itm) CURLcode success = curl_easy_perform(curl); curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &curl_responsecode); + long curl_servdate; + curl_easy_getinfo(curl, CURLINFO_FILETIME, &curl_servdate); + // cleanup if(success != 0) { @@ -215,6 +220,14 @@ bool HttpsMethod::Fetch(FetchItem *Itm) if (Res.Size == 0) Res.Size = File->Size(); + // Timestamp + struct utimbuf UBuf; + if (curl_servdate != -1) { + UBuf.actime = curl_servdate; + UBuf.modtime = curl_servdate; + utime(File->Name().c_str(),&UBuf); + } + // check the downloaded result struct stat Buf; if (stat(File->Name().c_str(),&Buf) == 0) -- cgit v1.2.3 From 1c7d52b7916b64ad52b915bfe69e8817e33ad1e7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 3 Oct 2007 02:27:08 +0200 Subject: apt-pkg/acquire-item.cc: - cherry pick from --mvo --- apt-pkg/acquire-item.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index b5c2149cc..8c7b23fcb 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -395,7 +395,7 @@ void pkgAcqDiffIndex::Done(string Message,unsigned long Size,string Md5Hash, */ pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire *Owner, string URI,string URIDesc,string ShortDesc, - HashString ExpectedMD5, + HashString ExpectedHash, vector diffs) : Item(Owner), RealURI(URI), ExpectedHash(ExpectedHash), available_patches(diffs) -- cgit v1.2.3 From 986d97bb0d62d7529a6a0328c39ddbd47be879a1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 4 Oct 2007 19:35:59 +0200 Subject: * apt-pkg/deb/dpkgpm.cc: - fix crash in WriteApportReport (LP: #144537) --- apt-pkg/deb/dpkgpm.cc | 2 +- debian/changelog | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index e1e26e903..466d3628b 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -938,9 +938,9 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) if (Pkg.end() == true) return; pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg); - pkgver = Ver.VerStr(); if (Ver.end() == true) return; + pkgver = Ver.VerStr() == NULL ? "unknown" : Ver.VerStr(); pkgRecords Recs(Cache); pkgRecords::Parser &Parse = Recs.Lookup(Ver.FileList()); srcpkgname = Parse.SourcePkg(); diff --git a/debian/changelog b/debian/changelog index 375a6bb1e..a7cc0a5dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.6ubuntu13) gutsy; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - fix crash in WriteApportReport (LP: #144537) + + -- + apt (0.7.6ubuntu12) gutsy; urgency=low [ Michael Vogt ] -- cgit v1.2.3 From 1b888622abc62d044e584cb399c0d7802c04e1aa Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 5 Oct 2007 06:58:52 +0200 Subject: * apt-pkg/acquire-item.cc - fix disappearing local Packages.gz file (LP: #131166) --- apt-pkg/acquire-item.cc | 3 --- debian/changelog | 2 ++ test/pre-upload-check.py | 21 +++++++++++++++++++-- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 8c7b23fcb..15577363e 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -743,10 +743,7 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash, // The files timestamp matches if (StringToBool(LookupTag(Message,"IMS-Hit"),false) == true) - { - unlink(FileName.c_str()); return; - } if (FileName == DestFile) Erase = true; diff --git a/debian/changelog b/debian/changelog index a7cc0a5dd..b25e75ef5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ apt (0.7.6ubuntu13) gutsy; urgency=low * apt-pkg/deb/dpkgpm.cc: - fix crash in WriteApportReport (LP: #144537) + * apt-pkg/acquire-item.cc + - fix disappearing local Packages.gz file (LP: #131166) -- diff --git a/test/pre-upload-check.py b/test/pre-upload-check.py index 2199c598a..373683360 100755 --- a/test/pre-upload-check.py +++ b/test/pre-upload-check.py @@ -72,7 +72,6 @@ class testAuthentication(unittest.TestCase): call([self.apt,"update", "-o","Dir::Etc::sourcelist=./%s" % f]+apt_args, stdout=stdout, stderr=stderr) - # then get the pkg cmd = ["install", "-y", "-d", "--reinstall", "%s=%s" % (self.pkg, self.pkgver), "-o","Dir::state::Status=./fake-status"] @@ -92,7 +91,9 @@ class testAuthentication(unittest.TestCase): stdout=stdout, stderr=stderr) self.assert_(res == expected_res, "test '%s' failed (got %s expected %s" % (f,res,expected_res)) - + if expected_res == 0: + self.assert_(len(glob.glob("/var/lib/apt/lists/partial/*")) == 0, + "partial/ dir has leftover files: %s" % glob.glob("/var/lib/apt/lists/partial/*")) class testLocalRepositories(unittest.TestCase): @@ -119,6 +120,22 @@ class testLocalRepositories(unittest.TestCase): self.assert_(os.path.exists(os.path.join(self.repo,"Packages.gz")), "Packages.gz vanished from local repo") + def testLocalRepo2(self): + repo = os.path.abspath(os.path.join(os.getcwd(), self.repo_dir+"2")) + sources = os.path.join(self.repo, "sources.list") + s = open(sources,"w") + s.write("deb file://%s/ /\n" % repo) + s.close() + + # two times to get at least one i-m-s hit + for i in range(2): + self.assert_(os.path.exists(sources)) + cmd = [self.apt,"update","-o", "Dir::Etc::sourcelist=%s" % sources]+apt_args + res = call(cmd, stdout=stdout, stderr=stderr) + self.assertEqual(res, 0, "local repo2 test failed") + self.assert_(os.path.exists(os.path.join(repo,"Packages.gz")), + "Packages.gz vanished from local repo") + def testInstallFromLocalRepo(self): apt = [self.apt,"-o", "Dir::Etc::sourcelist=%s"% self.sources]+apt_args cmd = apt+["update"] -- cgit v1.2.3 From 3de6d4585be0b8a9bd98b5fb1d62ff922537c435 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 5 Oct 2007 07:50:24 +0200 Subject: * methods/https.cc: - fix off-by-one error I-M-S handling - cleanup after I-M-S hit - only send LastModified if we actually have a file - delete zero size I-M-S hits --- debian/changelog | 6 +++++- methods/https.cc | 26 +++++++++++++------------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index b25e75ef5..30ac4e10d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ apt (0.7.6ubuntu13) gutsy; urgency=low - fix crash in WriteApportReport (LP: #144537) * apt-pkg/acquire-item.cc - fix disappearing local Packages.gz file (LP: #131166) + * methods/https.cc: + - fix off-by-one error I-M-S handling + - cleanup after I-M-S hit -- @@ -124,10 +127,11 @@ apt (0.7.6ubuntu1) gutsy; urgency=low * apt-pkg/acquire-item.cc: - remove zero size files on I-M-S hit * methods/https.cc: - - only send LastModified if we actually have one + - only send LastModified if we actually have a file - send range request with if-range - delete failed downloads (thanks to Thom May for his help here) + - delete zero size I-M-S hits * apt-pkg/deb/dpkgpm.{cc,h}: - merged dpkg-log branch, this lets you specify a Dir::Log::Terminal file to log dpkg output to diff --git a/methods/https.cc b/methods/https.cc index 3b2b0bb19..b2bbbddb1 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -161,13 +161,6 @@ bool HttpsMethod::Fetch(FetchItem *Itm) } curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers); - // set time values - if(Itm->LastModified > 0) - { - curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE); - curl_easy_setopt(curl, CURLOPT_TIMEVALUE, Itm->LastModified); - } - // speed limit int dlLimit = _config->FindI("Acquire::http::Dl-Limit",0)*1024; if (dlLimit > 0) @@ -183,7 +176,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm) // error handling curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curl_errorstr); - // In this case we send an if-range query with a range header + // if we have the file send an if-range query with a range header if (stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0) { char Buf[1000]; @@ -191,11 +184,17 @@ bool HttpsMethod::Fetch(FetchItem *Itm) (long)SBuf.st_size - 1, TimeRFC1123(SBuf.st_mtime).c_str()); headers = curl_slist_append(headers, Buf); + } + else if(Itm->LastModified > 0) + { + curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE); + curl_easy_setopt(curl, CURLOPT_TIMEVALUE, Itm->LastModified); } // go for it - if the file exists, append on it File = new FileFd(Itm->DestFile, FileFd::WriteAny); - File->Seek(File->Size()); + if (File->Size() > 0) + File->Seek(File->Size() - 1); // keep apt updated Res.Filename = Itm->DestFile; @@ -217,9 +216,6 @@ bool HttpsMethod::Fetch(FetchItem *Itm) } File->Close(); - if (Res.Size == 0) - Res.Size = File->Size(); - // Timestamp struct utimbuf UBuf; if (curl_servdate != -1) { @@ -232,15 +228,19 @@ bool HttpsMethod::Fetch(FetchItem *Itm) struct stat Buf; if (stat(File->Name().c_str(),&Buf) == 0) { - Res.Size = Buf.st_size; Res.Filename = File->Name(); Res.LastModified = Buf.st_mtime; Res.IMSHit = false; if (curl_responsecode == 304) { + unlink(File->Name().c_str()); Res.IMSHit = true; Res.LastModified = Itm->LastModified; + Res.Size = 0; + URIDone(Res); + return true; } + Res.Size = Buf.st_size; } // take hashes -- cgit v1.2.3 From adf1b8befd5b79d39386af24aff627e856ad953b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 11 Oct 2007 13:55:16 +0200 Subject: * finalze changelog --- configure.in | 2 +- debian/changelog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 87d8a7d9f..e4f0fc4a2 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.6ubuntu11") +AC_DEFINE_UNQUOTED(VERSION,"0.7.6ubuntu13") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 30ac4e10d..7213c6773 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,7 @@ apt (0.7.6ubuntu13) gutsy; urgency=low - fix off-by-one error I-M-S handling - cleanup after I-M-S hit - -- + -- Michael Vogt Fri, 05 Oct 2007 07:52:32 +0200 apt (0.7.6ubuntu12) gutsy; urgency=low -- cgit v1.2.3 From 80c965368a08f521c648f5398e954d164d859baa Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 12 Oct 2007 18:02:21 +0200 Subject: * debian/apt.cron.daily: - only run the cron job if apt-get check succeeds (LP: #131719) --- debian/apt.cron.daily | 6 ++++++ debian/changelog | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 48714ec15..4f7eff47b 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -170,6 +170,12 @@ if which on_ac_power >/dev/null; then fi fi +# check if we can lock the cache and if the cache is clean +if ! apt-get check -q -q 2>/dev/null; then + exit 1 +fi + + UPDATE_STAMP=/var/lib/apt/periodic/update-stamp if check_stamp $UPDATE_STAMP $UpdateInterval; then if apt-get -qq update 2>/dev/null; then diff --git a/debian/changelog b/debian/changelog index 7213c6773..79efaf1a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.6ubuntu14) gutsy; urgency=low + + * debian/apt.cron.daily: + - only run the cron job if apt-get check succeeds (LP: #131719) + + -- Michael Vogt Fri, 12 Oct 2007 17:56:22 +0200 + apt (0.7.6ubuntu13) gutsy; urgency=low * apt-pkg/deb/dpkgpm.cc: -- cgit v1.2.3 From 8432058667daea6a0c1c26febe6472eed917593a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 12 Oct 2007 18:08:57 +0200 Subject: debian/changelog: - fix incorrect changelog --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 79efaf1a6..066234451 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,13 +15,13 @@ apt (0.7.6ubuntu13) gutsy; urgency=low - fix off-by-one error I-M-S handling - cleanup after I-M-S hit - -- Michael Vogt Fri, 05 Oct 2007 07:52:32 +0200 + -- Michael Vogt Tue, 09 Oct 2007 01:48:26 +0200 apt (0.7.6ubuntu12) gutsy; urgency=low [ Michael Vogt ] * cmdline/apt-mark: - - Fix chmoding after have renamed the extended-states file (LP: #140019) + - Fix chmoding after have renamed the extended-states file (thanks to Laurent Bigonville, LP: #140019) * apt-pkg/deb/debmetaindex.cc: comparison with string literal results in unspecified behaviour; -- cgit v1.2.3 From c771f6d9c30f94e37050af49e887f20767822dbb Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 15 Oct 2007 21:08:06 +0200 Subject: * apt-pkg/deb/dpkgpm.cc: - fix resource leak (LP: #148806) --- apt-pkg/deb/dpkgpm.cc | 5 ++++- debian/changelog | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 466d3628b..ff0a3c443 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -867,8 +867,11 @@ bool pkgDPkgPM::Go(int OutStatusFd) signal(SIGQUIT,old_SIGQUIT); signal(SIGINT,old_SIGINT); - if(master >= 0 && slave >= 0) + if(master >= 0) + { tcsetattr(0, TCSAFLUSH, &tt); + close(master); + } // Check for an error code. if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0) diff --git a/debian/changelog b/debian/changelog index 066234451..ddcc6895d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ apt (0.7.6ubuntu14) gutsy; urgency=low + * apt-pkg/deb/dpkgpm.cc: + - fix resource leak (LP: #148806) * debian/apt.cron.daily: - only run the cron job if apt-get check succeeds (LP: #131719) -- cgit v1.2.3 From 9a3a3d1324c83206033ad275fb068867b5c58e05 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 15 Oct 2007 21:35:04 +0200 Subject: * update changelog to reflect reality --- configure.in | 2 +- debian/changelog | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in index e4f0fc4a2..8683773c8 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.6ubuntu13") +AC_DEFINE_UNQUOTED(VERSION,"0.7.6ubuntu14") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index ddcc6895d..1bf5b95af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,16 @@ +apt (0.7.6ubuntu14.1) gutsy-proposed; urgency=low + + * debian/apt.cron.daily: + - only run the cron job if apt-get check succeeds (LP: #131719) + + -- Michael Vogt Mo, 15 Oct 2007 22:56:22 +0200 + apt (0.7.6ubuntu14) gutsy; urgency=low * apt-pkg/deb/dpkgpm.cc: - fix resource leak (LP: #148806) - * debian/apt.cron.daily: - - only run the cron job if apt-get check succeeds (LP: #131719) - -- Michael Vogt Fri, 12 Oct 2007 17:56:22 +0200 + -- Michael Vogt Mon, 15 Oct 2007 20:57:44 +0200 apt (0.7.6ubuntu13) gutsy; urgency=low -- cgit v1.2.3 From 1fc825bf7be1e9842a0560261d684264c565589e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 24 Oct 2007 15:08:08 +0200 Subject: * apt-pkg/deb/dpkgpm.{cc,h}: - give up timeslice on EIO error in read from master terminal * apt-pkg/deb/dpkgpm.{cc,h}: - rewrite dpkgpm.cc to use pselect() instead of select() to block signals during select() (LP: #134858) --- apt-pkg/deb/dpkgpm.cc | 22 ++++++++++++++++++---- configure.in | 2 +- debian/changelog | 10 +++++++++- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index ff0a3c443..7a6b222f6 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -358,7 +358,15 @@ void pkgDPkgPM::DoTerminalPty(int master) char term_buf[1024] = {0,}; int len=read(master, term_buf, sizeof(term_buf)); - if(len <= 0) + if(len == -1 && errno == EIO) + { + // this happens when the child is about to exit, we + // give it time to actually exit, otherwise we run + // into a race + usleep(500000); + return; + } + if(len <= 0) return; write(1, term_buf, len); if(term_out) @@ -819,7 +827,12 @@ bool pkgDPkgPM::Go(int OutStatusFd) // setups fds fd_set rfds; - struct timeval tv; + struct timespec tv; + sigset_t sigmask; + sigset_t original_sigmask; + sigemptyset(&sigmask); + sigprocmask(SIG_BLOCK,&sigmask,&original_sigmask); + int select_ret; while ((res=waitpid(Child,&Status, WNOHANG)) != Child) { if(res < 0) { @@ -842,8 +855,9 @@ bool pkgDPkgPM::Go(int OutStatusFd) if(master >= 0) FD_SET(master, &rfds); tv.tv_sec = 1; - tv.tv_usec = 0; - select_ret = select(max(master, _dpkgin)+1, &rfds, NULL, NULL, &tv); + tv.tv_nsec = 0; + select_ret = pselect(max(master, _dpkgin)+1, &rfds, NULL, NULL, + &tv, &original_sigmask); if (select_ret == 0) continue; else if (select_ret < 0 && errno == EINTR) diff --git a/configure.in b/configure.in index 8683773c8..e6757c7a6 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.6ubuntu14") +AC_DEFINE_UNQUOTED(VERSION,"0.7.6ubuntu14.1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 1bf5b95af..572c93ee0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,17 @@ apt (0.7.6ubuntu14.1) gutsy-proposed; urgency=low + [ Michael Vogt ] + * apt-pkg/deb/dpkgpm.{cc,h}: + - give up timeslice on EIO error in read from master terminal * debian/apt.cron.daily: - only run the cron job if apt-get check succeeds (LP: #131719) + + [ Martin Emrich ] + * apt-pkg/deb/dpkgpm.{cc,h}: + - rewrite dpkgpm.cc to use pselect() instead of select() + to block signals during select() (LP: #134858) - -- Michael Vogt Mo, 15 Oct 2007 22:56:22 +0200 + -- Michael Vogt Sat, 20 Oct 2007 07:51:12 +0200 apt (0.7.6ubuntu14) gutsy; urgency=low -- cgit v1.2.3 From c040d0b5e811399359c62fde1d5916b240053bda Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 14 Nov 2007 06:08:45 +0100 Subject: debian/README.ubuntu-dev: - add some documentation how to build the package --- debian/README.ubuntu-dev | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 debian/README.ubuntu-dev diff --git a/debian/README.ubuntu-dev b/debian/README.ubuntu-dev new file mode 100644 index 000000000..9da152556 --- /dev/null +++ b/debian/README.ubuntu-dev @@ -0,0 +1,6 @@ +Build this package with: +$ debian/rules arch-build +or +$ DEB_BUILD_PROG_OPTS="-S" debian/rules arch-build + +make sure you have the pre-build-depds in README.arch installed -- cgit v1.2.3 From 38eedeb77790c106eb35940e3d7835a7e0f0297e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 28 Nov 2007 15:54:17 +0100 Subject: methods/mirror.{cc,h}: - improve the mirror method so that it only updates the mirror list from the server if we get new indexfiles - code cleanup --- methods/mirror.cc | 152 +++++++++++++++++++++++++++++++++--------------------- methods/mirror.h | 7 +-- 2 files changed, 97 insertions(+), 62 deletions(-) diff --git a/methods/mirror.cc b/methods/mirror.cc index 9a86a10c2..43e56c71a 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -48,7 +48,7 @@ using namespace std; */ MirrorMethod::MirrorMethod() - : HttpMethod(), HasMirrorFile(false) + : HttpMethod(), DownloadedMirrorFile(false) { }; @@ -73,6 +73,9 @@ bool MirrorMethod::Clean(string Dir) if(Debug) clog << "MirrorMethod::Clean(): " << Dir << endl; + if(Dir == "/") + return _error->Error("will not clean: '/'"); + // read sources.list pkgSourceList list; list.ReadMainList(); @@ -118,7 +121,71 @@ bool MirrorMethod::Clean(string Dir) } -bool MirrorMethod::GetMirrorFile(string mirror_uri_str) +bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str) +{ + + // check the file, if it is not older than RefreshInterval just use it + // otherwise try to get a new one + if(FileExists(MirrorFile)) + { + struct stat buf; + time_t t,now,refresh; + if(stat(MirrorFile.c_str(), &buf) != 0) + return false; + t = std::max(buf.st_mtime, buf.st_ctime); + now = time(NULL); + refresh = 60*_config->FindI("Acquire::Mirror::RefreshInterval",360); + if(t + refresh > now) + { + if(Debug) + clog << "Mirror file is in RefreshInterval" << endl; + DownloadedMirrorFile = true; + return true; + } + if(Debug) + clog << "Mirror file " << MirrorFile << " older than " << refresh << "min, re-download it" << endl; + } + + // not that great to use pkgAcquire here, but we do not have + // any other way right now + string fetch = BaseUri; + fetch.replace(0,strlen("mirror://"),"http://"); + + pkgAcquire Fetcher; + new pkgAcqFile(&Fetcher, fetch, "", 0, "", "", "", MirrorFile); + bool res = (Fetcher.Run() == pkgAcquire::Continue); + if(res) + DownloadedMirrorFile = true; + Fetcher.Shutdown(); + return res; +} + +bool MirrorMethod::SelectMirror() +{ + // if we do not have a MirrorFile, fallback + if(!FileExists(MirrorFile)) + { + // FIXME: fallback to a default mirror here instead + // and provide a config option to define that default + return _error->Error(_("No mirror file '%s' found "), MirrorFile.c_str()); + } + + // FIXME: make the mirror selection more clever, do not + // just use the first one! + // BUT: we can not make this random, the mirror has to be + // stable accross session, because otherwise we can + // get into sync issues (got indexfiles from mirror A, + // but packages from mirror B - one might be out of date etc) + ifstream in(MirrorFile.c_str()); + getline(in, Mirror); + if(Debug) + cerr << "Using mirror: " << Mirror << endl; + + UsedMirror = Mirror; + return true; +} + +string MirrorMethod::GetMirrorFileName(string mirror_uri_str) { /* - a mirror_uri_str looks like this: @@ -144,8 +211,9 @@ bool MirrorMethod::GetMirrorFile(string mirror_uri_str) in both cases! So we need to apply some domain knowledge here :( and check for /dists/ or /Release.gpg as suffixes */ + string name; if(Debug) - std::cerr << "GetMirrorFile: " << mirror_uri_str << std::endl; + std::cerr << "GetMirrorFileName: " << mirror_uri_str << std::endl; // read sources.list and find match vector::const_iterator I; @@ -166,62 +234,15 @@ bool MirrorMethod::GetMirrorFile(string mirror_uri_str) BaseUri = uristr.substr(0,uristr.size()-1); } } - string fetch = BaseUri; - fetch.replace(0,strlen("mirror://"),"http://"); - // get new file - MirrorFile = _config->FindDir("Dir::State::mirrors") + URItoFileName(BaseUri); + name = _config->FindDir("Dir::State::mirrors") + URItoFileName(BaseUri); if(Debug) { cerr << "base-uri: " << BaseUri << endl; - cerr << "mirror-file: " << MirrorFile << endl; - } - - // check the file, if it is not older than RefreshInterval just use it - // otherwise try to get a new one - if(FileExists(MirrorFile)) - { - struct stat buf; - time_t t,now,refresh; - if(stat(MirrorFile.c_str(), &buf) != 0) - return false; - t = std::max(buf.st_mtime, buf.st_ctime); - now = time(NULL); - refresh = 60*_config->FindI("Acquire::Mirror::RefreshInterval",360); - if(t + refresh > now) - { - if(Debug) - clog << "Mirror file is in RefreshInterval" << endl; - HasMirrorFile = true; - return true; - } - if(Debug) - clog << "Mirror file " << MirrorFile << " older than " << refresh << "min, re-download it" << endl; + cerr << "mirror-file: " << name << endl; } - - // not that great to use pkgAcquire here, but we do not have - // any other way right now - pkgAcquire Fetcher; - new pkgAcqFile(&Fetcher, fetch, "", 0, "", "", "", MirrorFile); - bool res = (Fetcher.Run() == pkgAcquire::Continue); - if(res) - HasMirrorFile = true; - Fetcher.Shutdown(); - return res; -} - -bool MirrorMethod::SelectMirror() -{ - // FIXME: make the mirror selection more clever, do not - // just use the first one! - ifstream in(MirrorFile.c_str()); - getline(in, Mirror); - if(Debug) - cerr << "Using mirror: " << Mirror << endl; - - UsedMirror = Mirror; - return true; + return name; } // MirrorMethod::Fetch - Fetch an item /*{{{*/ @@ -230,20 +251,33 @@ bool MirrorMethod::SelectMirror() depth. */ bool MirrorMethod::Fetch(FetchItem *Itm) { - // select mirror only once per session - if(!HasMirrorFile) + // the http method uses Fetch(0) as a way to update the pipeline, + // just let it do its work in this case - Fetch() with a valid + // Itm will always run before the first Fetch(0) + if(Itm == NULL) + return HttpMethod::Fetch(Itm); + + // if we don't have the name of the mirror file on disk yet, + // calculate it now (can be derived from the uri) + if(MirrorFile.empty()) + MirrorFile = GetMirrorFileName(Itm->Uri); + + // download mirror file once (if we are after index files) + if(Itm->IndexFile && !DownloadedMirrorFile) { Clean(_config->FindDir("Dir::State::mirrors")); - GetMirrorFile(Itm->Uri); - SelectMirror(); + DownloadMirrorFile(Itm->Uri); } + if(Mirror.empty()) + SelectMirror(); + for (FetchItem *I = Queue; I != 0; I = I->Next) { if(I->Uri.find("mirror://") != string::npos) - I->Uri.replace(0,BaseUri.size(),Mirror); + I->Uri.replace(0,BaseUri.size(), Mirror); } - + // now run the real fetcher return HttpMethod::Fetch(Itm); }; diff --git a/methods/mirror.h b/methods/mirror.h index 798f5a9b5..ed817806b 100644 --- a/methods/mirror.h +++ b/methods/mirror.h @@ -26,13 +26,14 @@ class MirrorMethod : public HttpMethod // we simply transform between BaseUri and Mirror string BaseUri; // the original mirror://... url string Mirror; // the selected mirror uri (http://...) - string MirrorFile; // - bool HasMirrorFile; + string MirrorFile; // the file that contains the list of mirrors + bool DownloadedMirrorFile; // already downloaded this session bool Debug; protected: - bool GetMirrorFile(string uri); + bool DownloadMirrorFile(string uri); + string GetMirrorFileName(string uri); bool SelectMirror(); bool Clean(string dir); -- cgit v1.2.3 From 0df1d3ac4312a2051b10478cf1c8b242864cb3b1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 6 Dec 2007 19:47:36 +0100 Subject: we do not break the abi --- apt-pkg/init.h | 2 +- apt-pkg/makefile | 2 +- methods/makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apt-pkg/init.h b/apt-pkg/init.h index 6d8693be9..23e951eff 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -18,7 +18,7 @@ // See the makefile #define APT_PKG_MAJOR 4 -#define APT_PKG_MINOR 6 +#define APT_PKG_MINOR 5 #define APT_PKG_RELEASE 0 extern const char *pkgVersion; diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 1b78c94f6..b327dbf64 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -13,7 +13,7 @@ include ../buildlib/defaults.mak # methods/makefile - FIXME LIBRARY=apt-pkg LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER) -MAJOR=4.6 +MAJOR=4.5 MINOR=0 SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil APT_DOMAIN:=libapt-pkg$(MAJOR) diff --git a/methods/makefile b/methods/makefile index 085b357b8..3c12bb974 100644 --- a/methods/makefile +++ b/methods/makefile @@ -7,7 +7,7 @@ include ../buildlib/defaults.mak BIN := $(BIN)/methods # FIXME.. -LIB_APT_PKG_MAJOR = 4.6 +LIB_APT_PKG_MAJOR = 4.5 APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR) # The file method -- cgit v1.2.3 From f58bf3a523236613245736b36ba5eee0fdf2a592 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 7 Dec 2007 22:46:14 +0100 Subject: do not enable install-recommends just yet --- apt-pkg/init.cc | 2 +- configure.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index c0384cd45..dc6b7e976 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -35,7 +35,7 @@ bool pkgInitConfig(Configuration &Cnf) // General APT things Cnf.Set("APT::Architecture", COMMON_ARCH); Cnf.Set("APT::Build-Essential::", "build-essential"); - Cnf.Set("APT::Install-Recommends", true); + Cnf.Set("APT::Install-Recommends", false); Cnf.Set("APT::Install-Suggests", false); Cnf.Set("Dir","/"); diff --git a/configure.in b/configure.in index 52e85fc5b..a2b554a0c 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.9ubuntu1~ppa1") +AC_DEFINE_UNQUOTED(VERSION,"0.7.9ubuntu1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) -- cgit v1.2.3 From 5148def81fb20b22fc9ec54bc212e34260fbfebb Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 7 Dec 2007 22:54:41 +0100 Subject: update ABI, the homepage change broke it --- apt-pkg/init.h | 2 +- apt-pkg/makefile | 2 +- methods/makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apt-pkg/init.h b/apt-pkg/init.h index 23e951eff..6d8693be9 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -18,7 +18,7 @@ // See the makefile #define APT_PKG_MAJOR 4 -#define APT_PKG_MINOR 5 +#define APT_PKG_MINOR 6 #define APT_PKG_RELEASE 0 extern const char *pkgVersion; diff --git a/apt-pkg/makefile b/apt-pkg/makefile index b327dbf64..1b78c94f6 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -13,7 +13,7 @@ include ../buildlib/defaults.mak # methods/makefile - FIXME LIBRARY=apt-pkg LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER) -MAJOR=4.5 +MAJOR=4.6 MINOR=0 SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil APT_DOMAIN:=libapt-pkg$(MAJOR) diff --git a/methods/makefile b/methods/makefile index 3c12bb974..085b357b8 100644 --- a/methods/makefile +++ b/methods/makefile @@ -7,7 +7,7 @@ include ../buildlib/defaults.mak BIN := $(BIN)/methods # FIXME.. -LIB_APT_PKG_MAJOR = 4.5 +LIB_APT_PKG_MAJOR = 4.6 APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR) # The file method -- cgit v1.2.3 From e0fe131836913901c8b353e38d74cc1526fcaf78 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 13 Dec 2007 14:47:10 +0100 Subject: update changelog to inlucde details about the diff with debian --- debian/changelog | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index acb025da1..9177aa826 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,21 @@ apt (0.7.9ubuntu1) hardy; urgency=low + * merged from http://bzr.debian.org/apt/apt/debian-sid/, remaining + changes: + - mirror download method (pending merge with debian) + - no pdiff download by default (unsuitable for ubuntu) + - no recommends-by-default yet + - add "Original-Maintainer" field to tagfile + - show warning on apt-get source if the package is maintained + in a VCS (pedinging merge with debian) + - use ubuntu-archive keyring instead of debians one + - support metapackages section for autoremoval + - debian maintainer field change + - send ubuntu string in user-agent + + * Changes from the debian-sid bzr branch (but not uploaded to debian + yet): + [ Otavio Salvador ] * Applied patch from Mike O'Connor to add a manpage to apt-mark, closes: #430207. @@ -34,7 +50,7 @@ apt (0.7.9ubuntu1) hardy; urgency=low * ftparchive/multicompress.cc: - support lzma output - -- Michael Vogt Thu, 06 Dec 2007 19:32:07 +0100 + -- Michael Vogt Thu, 13 Dec 2007 14:46:27 +0100 apt (0.7.9) unstable; urgency=low -- cgit v1.2.3 From fce726023f703c369ae030684e75ed03c7544d6b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 21 Dec 2007 13:56:19 +0100 Subject: implement AptAuthenticationReliabtlity spec --- apt-pkg/acquire-item.cc | 79 +++++++++--------- apt-pkg/acquire-item.h | 1 - apt-pkg/algorithms.cc | 3 +- po/apt-all.pot | 26 ++++-- ..._apt_auth-test-suit_gpg-package-broken_Packages | 25 ++++++ ...o_apt_auth-test-suit_gpg-package-broken_Release | 13 +++ ...t_auth-test-suit_gpg-package-broken_Release.gpg | 7 ++ ...emvo_apt_auth-test-suit_gpg-package-ok_Packages | 25 ++++++ ...7emvo_apt_auth-test-suit_gpg-package-ok_Release | 13 +++ ...o_apt_auth-test-suit_gpg-package-ok_Release.gpg | 7 ++ test/authReliability/sources.list.failure | 2 + test/pre-upload-check.py | 94 +++++++++++++++++++++- 12 files changed, 240 insertions(+), 55 deletions(-) create mode 100644 test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Packages create mode 100644 test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Release create mode 100644 test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Release.gpg create mode 100644 test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Packages create mode 100644 test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Release create mode 100644 test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Release.gpg create mode 100644 test/authReliability/sources.list.failure diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 7cae6c8b7..54526ab05 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -831,8 +831,9 @@ void pkgAcqMetaSig::Done(string Message,unsigned long Size,string MD5, Rename(LastGoodSig, DestFile); // queue a pkgAcqMetaIndex to be verified against the sig we just retrieved - new pkgAcqMetaIndex(Owner, MetaIndexURI, MetaIndexURIDesc, MetaIndexShortDesc, - DestFile, IndexTargets, MetaIndexParser); + new pkgAcqMetaIndex(Owner, MetaIndexURI, MetaIndexURIDesc, + MetaIndexShortDesc, DestFile, IndexTargets, + MetaIndexParser); } /*}}}*/ @@ -921,13 +922,19 @@ void pkgAcqMetaIndex::Done(string Message,unsigned long Size,string Hash, if (AuthPass == true) { AuthDone(Message); + + // all cool, move Release file into place + Complete = true; + + string FinalFile = _config->FindDir("Dir::State::lists"); + FinalFile += URItoFileName(RealURI); + Rename(DestFile,FinalFile); + chmod(FinalFile.c_str(),0644); + DestFile = FinalFile; } else { RetrievalDone(Message); - if (!Complete) - // Still more retrieving to do - return; if (SigFile == "") { @@ -972,22 +979,14 @@ void pkgAcqMetaIndex::RetrievalDone(string Message) return; } - // see if the download was a IMSHit + // make sure to verify against the right file on I-M-S hit IMSHit = StringToBool(LookupTag(Message,"IMS-Hit"),false); - Complete = true; - - string FinalFile = _config->FindDir("Dir::State::lists"); - FinalFile += URItoFileName(RealURI); - - // If we get a IMS hit we can remove the empty file in partial - // othersie we move the file in place - if (IMSHit) - unlink(DestFile.c_str()); - else - Rename(DestFile,FinalFile); - - chmod(FinalFile.c_str(),0644); - DestFile = FinalFile; + if(IMSHit) + { + string FinalFile = _config->FindDir("Dir::State::lists"); + FinalFile += URItoFileName(RealURI); + DestFile = FinalFile; + } } void pkgAcqMetaIndex::AuthDone(string Message) @@ -1017,7 +1016,6 @@ void pkgAcqMetaIndex::AuthDone(string Message) QueueIndexes(true); // Done, move signature file into position - string VerifiedSigFile = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI) + ".gpg"; Rename(SigFile,VerifiedSigFile); @@ -1162,30 +1160,27 @@ void pkgAcqMetaIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) { if (AuthPass == true) { - // if we fail the authentication but got the file via a IMS-Hit - // this means that the file wasn't downloaded and that it might be - // just stale (server problem, proxy etc). we delete what we have - // queue it again without i-m-s - // alternatively we could just unlink the file and let the user try again - if (IMSHit) + // gpgv method failed, if we have a good signature + string LastGoodSigFile = _config->FindDir("Dir::State::lists") + + "partial/" + URItoFileName(RealURI) + ".gpg.reverify"; + if(FileExists(LastGoodSigFile)) { - Complete = false; - Local = false; - AuthPass = false; - unlink(DestFile.c_str()); - - DestFile = _config->FindDir("Dir::State::lists") + "partial/"; - DestFile += URItoFileName(RealURI); - Desc.URI = RealURI; - QueueURI(Desc); + string VerifiedSigFile = _config->FindDir("Dir::State::lists") + + URItoFileName(RealURI) + ".gpg"; + Rename(LastGoodSigFile,VerifiedSigFile); + Status = StatTransientNetworkError; + _error->Warning(_("A error occurred during the signature " + "verification. The repository is not updated " + "and the previous index files will be used." + "GPG error: %s: %s\n" + Desc.Description.c_str(), + LookupTag(Message,"Message").c_str()); return; + } else { + _error->Warning(_("GPG error: %s: %s"), + Desc.Description.c_str(), + LookupTag(Message,"Message").c_str()); } - - // gpgv method failed - _error->Warning("GPG error: %s: %s", - Desc.Description.c_str(), - LookupTag(Message,"Message").c_str()); - } // No Release file was present, or verification failed, so fall diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index a48f7f7e5..7ecbf570a 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -612,7 +612,6 @@ class pkgAcqMetaSig : public pkgAcquire::Item /** \brief The last good signature file */ string LastGoodSig; - /** \brief The fetch request that is currently being processed. */ pkgAcquire::ItemDesc Desc; diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 158f9c258..c5e3c7b38 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1107,8 +1107,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) return _error->Error(_("Unable to correct problems, you have held broken packages.")); } - // set the auto-flags (mvo: I'm not sure if we _really_ need this, but - // I didn't managed + // set the auto-flags (mvo: I'm not sure if we _really_ need this) pkgCache::PkgIterator I = Cache.PkgBegin(); for (;I.end() != true; I++) { if (Cache[I].NewInstall() && !(Flags[I->ID] & PreInstalled)) { diff --git a/po/apt-all.pot b/po/apt-all.pot index a89f3490e..be99f594d 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 10:36+0530\n" +"POT-Creation-Date: 2007-12-21 13:30+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2441,35 +2441,47 @@ msgstr "" msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1401 msgid "Hash Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1098 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1172 +#, c-format +msgid "" +"GPG error: %s: %s\n" +"The last good index will be used." +msgstr "" + +#: apt-pkg/acquire-item.cc:1178 +#, c-format +msgid "GPG error: %s: %s" +msgstr "" + +#: apt-pkg/acquire-item.cc:1206 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1265 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1306 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1393 msgid "Size mismatch" msgstr "" diff --git a/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Packages b/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Packages new file mode 100644 index 000000000..3e7265438 --- /dev/null +++ b/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Packages @@ -0,0 +1,25 @@ +Package: libglib2.0-data +Priority: optional +Section: misc +Installed-Size: 2288 +Maintainer: Ubuntu Desktop Team +Original-Maintainer: Loic Minier +Architecture: all +Source: glib2.0 +Version: 2.13.6-1ubuntu1 +Replaces: libglib1.3, libglib1.3-data +Depends: libglib2.0-0 (>= 2.13.6-1ubuntu1) +Conflicts: libglib1.3-data +Filename: ./libglib2.0-data_2.13.6-1ubuntu1_all.deb +Size: 958 +MD5sum: 803fc5e2e31a4345b3e9c771e1eae49f +SHA1: 75b2c62b21bae60c58e694dd40ed6d4df946e304 +SHA256: 142d8466eac252f06bc957d76fe1bb87f86f2d3512b99c8d4b08c1ad79fbe59e +Description: Common files for GLib library + GLib is a library containing many useful C routines for things such + as trees, hashes, lists, and strings. It is a useful general-purpose + C library used by projects such as GTK+, GIMP, and GNOME. + . + This package is needed for the runtime libraries to display messages in + languages other than English. + diff --git a/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Release b/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Release new file mode 100644 index 000000000..7ecd4cd19 --- /dev/null +++ b/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Release @@ -0,0 +1,13 @@ +Date: Fri, 27 Jul 2007 14:39:41 UTC +MD5Sum: + 4672dadea6a144839f823c9f3d5fd44b 934 Packages + 82ebcf09a8d78a2b9cf7759349da4936 603 Packages.gz + d41d8cd98f00b204e9800998ecf8427e 0 Release +SHA1: + fa0f294aa30789529371066b10e9497be1284d26 934 Packages + f4032808663b2810d87b4a4dab6f5ae4a1e8fa8e 603 Packages.gz + da39a3ee5e6b4b0d3255bfef95601890afd80709 0 Release +SHA256: + 92c9b605480dc74e6be79c0ddc24738bfcbd6dd3148af531acd68717de528049 934 Packages + 659ccc0d07ff21f0247f9fa5abe149221c90d5e17da52c7afddb035b93c23d39 603 Packages.gz + e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 Release diff --git a/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Release.gpg b/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Release.gpg new file mode 100644 index 000000000..85c356e6f --- /dev/null +++ b/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Release.gpg @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQBGqgOwliSD4VZixzQRAs6jAJ9p7Aiob9gzkUNCtoW8UPrBo0E/YwCdEaz0 +CQJszU6fRYX5jGWXSWzfc5c= +=ugH0 +-----END PGP SIGNATURE----- diff --git a/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Packages b/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Packages new file mode 100644 index 000000000..3e7265438 --- /dev/null +++ b/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Packages @@ -0,0 +1,25 @@ +Package: libglib2.0-data +Priority: optional +Section: misc +Installed-Size: 2288 +Maintainer: Ubuntu Desktop Team +Original-Maintainer: Loic Minier +Architecture: all +Source: glib2.0 +Version: 2.13.6-1ubuntu1 +Replaces: libglib1.3, libglib1.3-data +Depends: libglib2.0-0 (>= 2.13.6-1ubuntu1) +Conflicts: libglib1.3-data +Filename: ./libglib2.0-data_2.13.6-1ubuntu1_all.deb +Size: 958 +MD5sum: 803fc5e2e31a4345b3e9c771e1eae49f +SHA1: 75b2c62b21bae60c58e694dd40ed6d4df946e304 +SHA256: 142d8466eac252f06bc957d76fe1bb87f86f2d3512b99c8d4b08c1ad79fbe59e +Description: Common files for GLib library + GLib is a library containing many useful C routines for things such + as trees, hashes, lists, and strings. It is a useful general-purpose + C library used by projects such as GTK+, GIMP, and GNOME. + . + This package is needed for the runtime libraries to display messages in + languages other than English. + diff --git a/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Release b/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Release new file mode 100644 index 000000000..7ecd4cd19 --- /dev/null +++ b/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Release @@ -0,0 +1,13 @@ +Date: Fri, 27 Jul 2007 14:39:41 UTC +MD5Sum: + 4672dadea6a144839f823c9f3d5fd44b 934 Packages + 82ebcf09a8d78a2b9cf7759349da4936 603 Packages.gz + d41d8cd98f00b204e9800998ecf8427e 0 Release +SHA1: + fa0f294aa30789529371066b10e9497be1284d26 934 Packages + f4032808663b2810d87b4a4dab6f5ae4a1e8fa8e 603 Packages.gz + da39a3ee5e6b4b0d3255bfef95601890afd80709 0 Release +SHA256: + 92c9b605480dc74e6be79c0ddc24738bfcbd6dd3148af531acd68717de528049 934 Packages + 659ccc0d07ff21f0247f9fa5abe149221c90d5e17da52c7afddb035b93c23d39 603 Packages.gz + e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 Release diff --git a/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Release.gpg b/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Release.gpg new file mode 100644 index 000000000..85c356e6f --- /dev/null +++ b/test/authReliability/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Release.gpg @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQBGqgOwliSD4VZixzQRAs6jAJ9p7Aiob9gzkUNCtoW8UPrBo0E/YwCdEaz0 +CQJszU6fRYX5jGWXSWzfc5c= +=ugH0 +-----END PGP SIGNATURE----- diff --git a/test/authReliability/sources.list.failure b/test/authReliability/sources.list.failure new file mode 100644 index 000000000..110f31884 --- /dev/null +++ b/test/authReliability/sources.list.failure @@ -0,0 +1,2 @@ +deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/gpg-package-broken/ / + diff --git a/test/pre-upload-check.py b/test/pre-upload-check.py index 268b3d672..75a726808 100755 --- a/test/pre-upload-check.py +++ b/test/pre-upload-check.py @@ -4,6 +4,8 @@ import sys import os import glob import os.path +import shutil +import time from subprocess import call, PIPE import unittest @@ -11,7 +13,92 @@ import unittest stdout = os.open("/dev/null",0) #sys.stdout stderr = os.open("/dev/null",0) # sys.stderr -apt_args = [] # ["-o","Debug::pkgAcquire::Auth=true"] +apt_args = [] +#apt_args = ["-o","Debug::pkgAcquire::Auth=true"] + +class testAptAuthenticationReliability(unittest.TestCase): + """ + test if the spec https://wiki.ubuntu.com/AptAuthenticationReliability + is properly implemented + """ + apt = "../bin/apt-get" + + def setUp(self): + pass + def testRepositorySigFailure(self): + """ + test if a repository that used to be authenticated and fails on + apt-get update refuses to update and uses the old state + """ + # copy valid signatures into lists (those are ok, even + # if the name is "-broken-" ... + for f in glob.glob("./authReliability/lists/*"): + shutil.copy(f,"/var/lib/apt/lists") + # ensure we do *not* get a I-M-S hit + os.utime("/var/lib/apt/lists/%s" % os.path.basename(f), (0,0)) + res = call([self.apt, + "update", + "-o","Dir::Etc::sourcelist=./authReliability/sources.list.failure" + ] + apt_args, + stdout=stdout, stderr=stderr) + self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Release.gpg"), + "The gpg file disappeared, this should not happen") + self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Packages"), + "The Packages file disappeared, this should not happen") + # the same with i-m-s hit this time + for f in glob.glob("./authReliability/lists/*"): + shutil.copy(f,"/var/lib/apt/lists") + os.utime("/var/lib/apt/lists/%s" % os.path.basename(f), (time.time(),time.time())) + res = call([self.apt, + "update", + "-o","Dir::Etc::sourcelist=./authReliability/sources.list.failure" + ] + apt_args, + stdout=stdout, stderr=stderr) + self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Release.gpg"), + "The gpg file disappeared, this should not happen") + self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Packages"), + "The Packages file disappeared, this should not happen") + def testRepositorySigGood(self): + """ + test that a regular repository with good data stays good + """ + res = call([self.apt, + "update", + "-o","Dir::Etc::sourcelist=./authReliability/sources.list.good" + ] + apt_args, + stdout=stdout, stderr=stderr) + self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Release.gpg"), + "The gpg file disappeared, this should not happen") + self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Packages"), + "The Packages file disappeared, this should not happen") + # test good is still good after non I-M-S hit and a previous files in lists/ + for f in glob.glob("./authReliability/lists/*"): + shutil.copy(f,"/var/lib/apt/lists") + # ensure we do *not* get a I-M-S hit + os.utime("/var/lib/apt/lists/%s" % os.path.basename(f), (0,0)) + res = call([self.apt, + "update", + "-o","Dir::Etc::sourcelist=./authReliability/sources.list.good" + ] + apt_args, + stdout=stdout, stderr=stderr) + self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Release.gpg"), + "The gpg file disappeared, this should not happen") + self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Packages"), + "The Packages file disappeared, this should not happen") + # test good is still good after I-M-S hit + for f in glob.glob("./authReliability/lists/*"): + shutil.copy(f,"/var/lib/apt/lists") + # ensure we do get a I-M-S hit + os.utime("/var/lib/apt/lists/%s" % os.path.basename(f), (time.time(),time.time())) + res = call([self.apt, + "update", + "-o","Dir::Etc::sourcelist=./authReliability/sources.list.good" + ] + apt_args, + stdout=stdout, stderr=stderr) + self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Release.gpg"), + "The gpg file disappeared, this should not happen") + self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Packages"), + "The Packages file disappeared, this should not happen") class testAuthentication(unittest.TestCase): @@ -149,6 +236,7 @@ if __name__ == "__main__": if len(sys.argv) > 1 and sys.argv[1] == "-v": stdout = sys.stdout stderr = sys.stderr + + # run only one for now + #unittest.main(defaultTest="testAptAuthenticationReliability") unittest.main() - - -- cgit v1.2.3 From f3224a73ec718a5f4e4404cd716e4b7c2702bb8b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 2 Jan 2008 13:50:56 +0100 Subject: test/authReliability/sources.list.good: - add missing file to make the test/pre-upload-check.py work again apt-pkg/acquire-item.cc: - fix auth-reliable code when file:// uris are used test/pre-upload-check.py: - use the standard apt, not "../bin/apt-get" by default - make the error messages more useful on test-failure --- apt-pkg/acquire-item.cc | 4 ++++ test/authReliability/sources.list.good | 2 ++ test/pre-upload-check.py | 7 ++++--- 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 test/authReliability/sources.list.good diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 54526ab05..fa48eeae9 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -935,6 +935,9 @@ void pkgAcqMetaIndex::Done(string Message,unsigned long Size,string Hash, else { RetrievalDone(Message); + if (!Complete) + // Still more retrieving to do + return; if (SigFile == "") { @@ -987,6 +990,7 @@ void pkgAcqMetaIndex::RetrievalDone(string Message) FinalFile += URItoFileName(RealURI); DestFile = FinalFile; } + Complete = true; } void pkgAcqMetaIndex::AuthDone(string Message) diff --git a/test/authReliability/sources.list.good b/test/authReliability/sources.list.good new file mode 100644 index 000000000..2e9a4458a --- /dev/null +++ b/test/authReliability/sources.list.good @@ -0,0 +1,2 @@ +deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/gpg-package-ok/ / + diff --git a/test/pre-upload-check.py b/test/pre-upload-check.py index 75a726808..ca44ec726 100755 --- a/test/pre-upload-check.py +++ b/test/pre-upload-check.py @@ -21,7 +21,8 @@ class testAptAuthenticationReliability(unittest.TestCase): test if the spec https://wiki.ubuntu.com/AptAuthenticationReliability is properly implemented """ - apt = "../bin/apt-get" + #apt = "../bin/apt-get" + apt = "apt-get" def setUp(self): pass @@ -68,7 +69,7 @@ class testAptAuthenticationReliability(unittest.TestCase): ] + apt_args, stdout=stdout, stderr=stderr) self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Release.gpg"), - "The gpg file disappeared, this should not happen") + "The gpg file disappeared after a regular download, this should not happen") self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Packages"), "The Packages file disappeared, this should not happen") # test good is still good after non I-M-S hit and a previous files in lists/ @@ -82,7 +83,7 @@ class testAptAuthenticationReliability(unittest.TestCase): ] + apt_args, stdout=stdout, stderr=stderr) self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Release.gpg"), - "The gpg file disappeared, this should not happen") + "The gpg file disappeared after a I-M-S hit, this should not happen") self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-ok_Packages"), "The Packages file disappeared, this should not happen") # test good is still good after I-M-S hit -- cgit v1.2.3 From d7bab8f1142e474ac4bafd139e93439aeddfd546 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 3 Jan 2008 15:22:44 +0100 Subject: methods/makefile: remove duplicated entry for https --- methods/makefile | 7 ------- 1 file changed, 7 deletions(-) diff --git a/methods/makefile b/methods/makefile index 085b357b8..f765a4d37 100644 --- a/methods/makefile +++ b/methods/makefile @@ -59,13 +59,6 @@ LIB_MAKES = apt-pkg/makefile SOURCE = https.cc include $(PROGRAM_H) -# The https method -PROGRAM=https -SLIBS = -lapt-pkg -lcurl -LIB_MAKES = apt-pkg/makefile -SOURCE = https.cc -include $(PROGRAM_H) - # The ftp method PROGRAM=ftp SLIBS = -lapt-pkg $(SOCKETLIBS) -- cgit v1.2.3 From b26daf93a588aeed441d5a0622b3e96ec7dffe91 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 9 Jan 2008 22:24:22 +0000 Subject: * apt-pkg/algorithms.cc: - Since APT::Get::List-Cleanup and APT::List-Cleanup both default to true, the effect of the compatibility code was to require both of them to be set to false in order to disable list cleanup; this broke the installer. Instead, disable list cleanup if either of them is set to false. --- apt-pkg/algorithms.cc | 2 +- debian/changelog | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 6e2b97557..57b85e24f 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1356,7 +1356,7 @@ bool ListUpdate(pkgAcquireStatus &Stat, // Keep "APT::Get::List-Cleanup" name for compatibility, but // this is really a global option for the APT library now if (!TransientNetworkFailure && !Failed && - (_config->FindB("APT::Get::List-Cleanup",true) == true || + (_config->FindB("APT::Get::List-Cleanup",true) == true && _config->FindB("APT::List-Cleanup",true) == true)) { if (Fetcher.Clean(_config->FindDir("Dir::State::lists")) == false || diff --git a/debian/changelog b/debian/changelog index 22555e57b..bd9061734 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +apt (0.7.9ubuntu4) UNRELEASED; urgency=low + + * apt-pkg/algorithms.cc: + - Since APT::Get::List-Cleanup and APT::List-Cleanup both default to + true, the effect of the compatibility code was to require both of them + to be set to false in order to disable list cleanup; this broke the + installer. Instead, disable list cleanup if either of them is set to + false. + + -- Colin Watson Wed, 09 Jan 2008 22:22:39 +0000 + apt (0.7.9ubuntu3) hardy; urgency=low * merged the apt--DoListUpdate branch, this provides a common interface -- cgit v1.2.3 From dbb5999c796f2b35ab4e30c5295045081de894c0 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 9 Jan 2008 22:31:09 +0000 Subject: po files from uploaded 0.7.9ubuntu3 --- po/apt-all.pot | 289 ++-- po/ar.po | 3500 +++++++++++++++++++++++------------------------ po/bg.po | 293 ++-- po/bs.po | 289 ++-- po/ca.po | 293 ++-- po/cs.po | 293 ++-- po/cy.po | 293 ++-- po/da.po | 293 ++-- po/de.po | 293 ++-- po/dz.po | 293 ++-- po/el.po | 293 ++-- po/en_GB.po | 293 ++-- po/es.po | 293 ++-- po/eu.po | 293 ++-- po/fi.po | 293 ++-- po/fr.po | 367 ++--- po/gl.po | 293 ++-- po/he.po | 289 ++-- po/hu.po | 293 ++-- po/it.po | 293 ++-- po/ja.po | 293 ++-- po/km.po | 291 ++-- po/ko.po | 293 ++-- po/ku.po | 3173 ++++++++++++++++++++++--------------------- po/mr.po | 293 ++-- po/nb.po | 293 ++-- po/ne.po | 293 ++-- po/nl.po | 293 ++-- po/nn.po | 293 ++-- po/pl.po | 293 ++-- po/pt.po | 293 ++-- po/pt_BR.po | 293 ++-- po/ro.po | 293 ++-- po/ru.po | 293 ++-- po/sk.po | 293 ++-- po/sl.po | 293 ++-- po/sv.po | 293 ++-- po/th.po | 289 ++-- po/tl.po | 293 ++-- po/uk.po | 4125 ++++++++++++++++++++++++++++---------------------------- po/vi.po | 293 ++-- po/zh_CN.po | 291 ++-- po/zh_TW.po | 289 ++-- 43 files changed, 11786 insertions(+), 10782 deletions(-) diff --git a/po/apt-all.pot b/po/apt-all.pot index a89f3490e..f593fb372 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 10:36+0530\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -156,7 +156,7 @@ msgstr "" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" @@ -554,7 +554,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -713,12 +713,12 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "" @@ -746,7 +746,7 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -780,7 +780,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -789,7 +789,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "" @@ -889,75 +889,69 @@ msgstr "" msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, c-format msgid "Couldn't find task %s" msgstr "" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, c-format msgid "%s set to manually installed.\n" msgstr "" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -965,159 +959,174 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1374,7 +1383,7 @@ msgstr "" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "" @@ -1599,7 +1608,7 @@ msgstr "" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "" @@ -1611,7 +1620,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "" @@ -1665,7 +1674,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1692,39 +1701,39 @@ msgstr "" msgid "Unable to invoke " msgstr "" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "" -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "" @@ -1796,76 +1805,76 @@ msgstr "" msgid "Read error from %s process" msgstr "" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "" @@ -2000,6 +2009,7 @@ msgid "Unable to stat the mount point %s" msgstr "" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "" @@ -2008,70 +2018,70 @@ msgstr "" msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "" @@ -2234,7 +2244,7 @@ msgstr "" msgid "Malformed line %u in source list %s (vendor id)" msgstr "" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2263,6 +2273,12 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "" +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2295,17 +2311,17 @@ msgstr "" msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "" @@ -2318,11 +2334,11 @@ msgstr "" msgid "You must put some 'source' URIs in your sources.list" msgstr "" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "" @@ -2432,44 +2448,44 @@ msgstr "" msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 msgid "Hash Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "" @@ -2575,71 +2591,78 @@ msgstr "" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, c-format msgid "Processing triggers for %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "" diff --git a/po/ar.po b/po/ar.po index 02c78e055..b4133953c 100644 --- a/po/ar.po +++ b/po/ar.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-26 07:15+0200\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2006-10-20 21:28+0300\n" "Last-Translator: Ossama M. Khayat \n" "Language-Team: Arabic \n" @@ -18,1200 +18,1257 @@ msgstr "" "X-Poedit-SourceCharset: utf-8\n" "X-Generator: KBabel 1.11.4\n" -#: methods/cdrom.cc:114 +#: cmdline/apt-cache.cc:143 #, c-format -msgid "Unable to read the cdrom database %s" -msgstr "تعذرت قراءة قاعدة بيانات القرص المدمج %s" - -#: methods/cdrom.cc:123 -msgid "" -"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " -"cannot be used to add new CD-ROMs" -msgstr "" -"الرجاء استخدام apt-cdrom لتعريف APT بهذا القرص المدمج. لا يمكن استخدام apt-" -"get update لإضافة أقراص مدمجة جديدة." - -#: methods/cdrom.cc:131 -msgid "Wrong CD-ROM" -msgstr "القرص المدمج الخطأ" +msgid "Package %s version %s has an unmet dep:\n" +msgstr "الحزمة %s النسخة %s لها معتمد غير مستوفى:\n" -#: methods/cdrom.cc:166 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format -msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "تعذر فكّ القرص المدمج من %s، إذ قد يكون لا يزال قيد الاستخدام." - -#: methods/cdrom.cc:171 -msgid "Disk not found." -msgstr "لم يُعثر على القرص." - -#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 -msgid "File not found" -msgstr "لم يُعثر على الملف" - -#: methods/copy.cc:43 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 -msgid "Failed to stat" -msgstr "فشيل تنفيذ stat" - -#: methods/copy.cc:80 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 -msgid "Failed to set modification time" -msgstr "فشل تعيين وقت التعديل" - -#: methods/file.cc:44 -msgid "Invalid URI, local URIS must not start with //" -msgstr "" - -#. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:162 -msgid "Logging in" -msgstr "تسجيل الدخول" +msgid "Unable to locate package %s" +msgstr "تعذر العثور على الحزمة %s" -#: methods/ftp.cc:168 -msgid "Unable to determine the peer name" -msgstr "" +#: cmdline/apt-cache.cc:247 +msgid "Total package names : " +msgstr "أسماء الحزم الكلية :" -#: methods/ftp.cc:173 -msgid "Unable to determine the local name" -msgstr "" +#: cmdline/apt-cache.cc:287 +msgid " Normal packages: " +msgstr " الحزم العادية:" -#: methods/ftp.cc:204 methods/ftp.cc:232 -#, c-format -msgid "The server refused the connection and said: %s" -msgstr "رفض الخادم اتصالنا بالرد: %s" +#: cmdline/apt-cache.cc:288 +msgid " Pure virtual packages: " +msgstr "الحزمة الوهمية تماماً:" -#: methods/ftp.cc:210 -#, c-format -msgid "USER failed, server said: %s" -msgstr "فشل USER، ردّ الخادم: %s" +#: cmdline/apt-cache.cc:289 +msgid " Single virtual packages: " +msgstr " الحزمة الوهمية المفردة:" -#: methods/ftp.cc:217 -#, c-format -msgid "PASS failed, server said: %s" -msgstr "فشل PASS، ردّ الخادم: %s" +#: cmdline/apt-cache.cc:290 +msgid " Mixed virtual packages: " +msgstr " الحزم الوهمية المختلطة:" -#: methods/ftp.cc:237 -msgid "" -"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " -"is empty." -msgstr "" -"تم تحديد خادم بروكسي ولكن دون نص تسجيل دخول برمجي، Acquire::ftp::ProxyLogin " -"فارغ." +#: cmdline/apt-cache.cc:291 +msgid " Missing: " +msgstr " مفقودة:" -#: methods/ftp.cc:265 -#, c-format -msgid "Login script command '%s' failed, server said: %s" -msgstr "فشل أمر نص تسجيل الدخول البرمجي '%s'، ردّ الخادم: %s" +#: cmdline/apt-cache.cc:293 +msgid "Total distinct versions: " +msgstr "مجموع النسخ الفريدة:" -#: methods/ftp.cc:291 -#, c-format -msgid "TYPE failed, server said: %s" -msgstr "فشل TYPE، ردّ الخادم: %s" +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "مجموع النسخ الفريدة:" -#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 -msgid "Connection timeout" -msgstr "انتهى وقت الاتصال" +#: cmdline/apt-cache.cc:297 +msgid "Total dependencies: " +msgstr "مجموع المعتمدات:" -#: methods/ftp.cc:335 -msgid "Server closed the connection" -msgstr "أغلق الخادم الاتصال" +#: cmdline/apt-cache.cc:300 +msgid "Total ver/file relations: " +msgstr "مجموع علاقات النسخ/الملفات:" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 -msgid "Read error" -msgstr "خطأ في القراءة" +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "مجموع علاقات النسخ/الملفات:" -#: methods/ftp.cc:345 methods/rsh.cc:197 -msgid "A response overflowed the buffer." -msgstr "" +#: cmdline/apt-cache.cc:304 +msgid "Total Provides mappings: " +msgstr "مجموع علاقات النسخ/الملفات:" -#: methods/ftp.cc:362 methods/ftp.cc:374 -msgid "Protocol corruption" +#: cmdline/apt-cache.cc:316 +msgid "Total globbed strings: " msgstr "" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 -msgid "Write error" -msgstr "خطأ في الكتابة" - -#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 -msgid "Could not create a socket" +#: cmdline/apt-cache.cc:330 +msgid "Total dependency version space: " msgstr "" -#: methods/ftp.cc:698 -msgid "Could not connect data socket, connection timed out" +#: cmdline/apt-cache.cc:335 +msgid "Total slack space: " msgstr "" -#: methods/ftp.cc:702 methods/connect.cc:101 -msgid "Failed" -msgstr "فشل" +#: cmdline/apt-cache.cc:343 +msgid "Total space accounted for: " +msgstr "مجموع المساحة المحسوب حسابها:" -#: methods/ftp.cc:704 -msgid "Could not connect passive socket." +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 +#, c-format +msgid "Package file %s is out of sync." msgstr "" -#: methods/ftp.cc:722 -msgid "getaddrinfo was unable to get a listening socket" -msgstr "" +#: cmdline/apt-cache.cc:1293 +msgid "You must give exactly one pattern" +msgstr "يجب أن تعطي صيغة واحدة بالضبط" -#: methods/ftp.cc:736 -msgid "Could not bind a socket" -msgstr "" +#: cmdline/apt-cache.cc:1447 +msgid "No packages found" +msgstr "لم يُعثر على أية حزم" -#: methods/ftp.cc:740 -msgid "Could not listen on the socket" -msgstr "" +#: cmdline/apt-cache.cc:1524 +msgid "Package files:" +msgstr "ملفات الحزم:" -#: methods/ftp.cc:747 -msgid "Could not determine the socket's name" +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 +msgid "Cache is out of sync, can't x-ref a package file" msgstr "" -#: methods/ftp.cc:779 -msgid "Unable to send PORT command" -msgstr "تعذر إرسال الأمر PORT" - -#: methods/ftp.cc:789 +#: cmdline/apt-cache.cc:1532 #, c-format -msgid "Unknown address family %u (AF_*)" -msgstr "" +msgid "%4i %s\n" +msgstr "%4i %s\n" -#: methods/ftp.cc:798 -#, c-format -msgid "EPRT failed, server said: %s" -msgstr "فشل EPRT، ردّ الخادم: %s" +#. Show any packages have explicit pins +#: cmdline/apt-cache.cc:1544 +msgid "Pinned packages:" +msgstr "الحزم المُدبّسة:" -#: methods/ftp.cc:818 -msgid "Data socket connect timed out" -msgstr "" +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 +msgid "(not found)" +msgstr "(غير موجود)" -#: methods/ftp.cc:825 -msgid "Unable to accept connection" -msgstr "تعذر قبول الاتصال" +#. Installed version +#: cmdline/apt-cache.cc:1577 +msgid " Installed: " +msgstr " مُثبّت:" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 -msgid "Problem hashing file" -msgstr "" +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 +msgid "(none)" +msgstr "(لاشيء)" -#: methods/ftp.cc:877 -#, c-format -msgid "Unable to fetch file, server said '%s'" -msgstr "تعذر إحضار الملف، ردّ الخادم '%s'" +#. Candidate Version +#: cmdline/apt-cache.cc:1584 +msgid " Candidate: " +msgstr " مرشّح: " -#: methods/ftp.cc:892 methods/rsh.cc:322 -msgid "Data socket timed out" +#: cmdline/apt-cache.cc:1594 +msgid " Package pin: " msgstr "" -#: methods/ftp.cc:922 -#, c-format -msgid "Data transfer failed, server said '%s'" -msgstr "فشل نقل البيانات، ردّ الخادم '%s'" - -#. Get the files information -#: methods/ftp.cc:997 -msgid "Query" -msgstr "استعلام" - -#: methods/ftp.cc:1109 -msgid "Unable to invoke " -msgstr "" +#. Show the priority tables +#: cmdline/apt-cache.cc:1603 +msgid " Version table:" +msgstr " جدول النسخ:" -#: methods/connect.cc:64 +#: cmdline/apt-cache.cc:1618 #, c-format -msgid "Connecting to %s (%s)" -msgstr "الاتصال بـ%s (%s)" +msgid " %4i %s\n" +msgstr " %4i %s\n" -#: methods/connect.cc:71 -#, c-format -msgid "[IP: %s %s]" -msgstr "[IP: %s %s]" +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 +#, fuzzy, c-format +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s لـ%s %s مُجمّع على %s %s\n" -#: methods/connect.cc:80 -#, c-format -msgid "Could not create a socket for %s (f=%u t=%u p=%u)" +#: cmdline/apt-cache.cc:1721 +msgid "" +"Usage: apt-cache [options] command\n" +" apt-cache [options] add file1 [file2 ...]\n" +" apt-cache [options] showpkg pkg1 [pkg2 ...]\n" +" apt-cache [options] showsrc pkg1 [pkg2 ...]\n" +"\n" +"apt-cache is a low-level tool used to manipulate APT's binary\n" +"cache files, and query information from them\n" +"\n" +"Commands:\n" +" add - Add a package file to the source cache\n" +" gencaches - Build both the package and source cache\n" +" showpkg - Show some general information for a single package\n" +" showsrc - Show source records\n" +" stats - Show some basic statistics\n" +" dump - Show the entire file in a terse form\n" +" dumpavail - Print an available file to stdout\n" +" unmet - Show unmet dependencies\n" +" search - Search the package list for a regex pattern\n" +" show - Show a readable record for the package\n" +" depends - Show raw dependency information for a package\n" +" rdepends - Show reverse dependency information for a package\n" +" pkgnames - List the names of all packages\n" +" dotty - Generate package graphs for GraphVis\n" +" xvcg - Generate package graphs for xvcg\n" +" policy - Show policy settings\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -p=? The package cache.\n" +" -s=? The source cache.\n" +" -q Disable progress indicator.\n" +" -i Show only important deps for the unmet command.\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" -#: methods/connect.cc:86 -#, c-format -msgid "Cannot initiate the connection to %s:%s (%s)." -msgstr "تعذر تمهيد الاتصال بـ%s:%s (%s)." - -#: methods/connect.cc:93 -#, c-format -msgid "Could not connect to %s:%s (%s), connection timed out" -msgstr "تعذر الاتصال بـ%s:%s (%s)، انتهى وقت الاتصال" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "الرجاء كتابة اسم لهذا القرص، مثال 'Debian 2.1r1 Disk 1'" -#: methods/connect.cc:108 -#, c-format -msgid "Could not connect to %s:%s (%s)." -msgstr "تعذر الاتصال بـ%s:%s (%s)." +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "الرجاء إدخال قرص في السواقة وضغط الزر enter" -#. We say this mainly because the pause here is for the -#. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 -#, c-format -msgid "Connecting to %s" -msgstr "الاتصال بـ%s" +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "كرر هذه العملية لباقي الأقراص المدمجة في المجموعة." -#: methods/connect.cc:167 -#, c-format -msgid "Could not resolve '%s'" +#: cmdline/apt-config.cc:41 +msgid "Arguments not in pairs" msgstr "" -#: methods/connect.cc:173 -#, c-format -msgid "Temporary failure resolving '%s'" +#: cmdline/apt-config.cc:76 +msgid "" +"Usage: apt-config [options] command\n" +"\n" +"apt-config is a simple tool to read the APT config file\n" +"\n" +"Commands:\n" +" shell - Shell mode\n" +" dump - Show the configuration\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: methods/connect.cc:176 +#: cmdline/apt-extracttemplates.cc:98 #, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +msgid "%s not a valid DEB package." +msgstr "%s ليس حزمة DEB صالحة." + +#: cmdline/apt-extracttemplates.cc:232 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: methods/connect.cc:223 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format -msgid "Unable to connect to %s %s:" -msgstr "تعذر الاتصال بـ%s %s:" +msgid "Unable to write to %s" +msgstr "تعذرت الكتابة إلى %s" -#: methods/gpgv.cc:65 +#: cmdline/apt-extracttemplates.cc:310 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "تعذر الحصول على نسخة debconf. هل هي مثبتة؟" + +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 +msgid "Package extension list is too long" +msgstr "قائمة توسيعات الحزمة طويلة جداً" + +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "" +msgid "Error processing directory %s" +msgstr "خطأ في معالجة الدليل %s" -#: methods/gpgv.cc:100 -msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "" +#: ftparchive/apt-ftparchive.cc:251 +msgid "Source extension list is too long" +msgstr "قائمة توسيعات المصدر طويلة جداً" + +#: ftparchive/apt-ftparchive.cc:368 +msgid "Error writing header to contents file" +msgstr "خطأ في كتابة الترويسة إلى ملف المحتويات" + +#: ftparchive/apt-ftparchive.cc:398 +#, c-format +msgid "Error processing contents %s" +msgstr "خطأ في معالجة المحتويات %s" -#: methods/gpgv.cc:204 +#: ftparchive/apt-ftparchive.cc:553 msgid "" -"Internal error: Good signature, but could not determine key fingerprint?!" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" msgstr "" -#: methods/gpgv.cc:209 -msgid "At least one invalid signature was encountered." -msgstr "" +#: ftparchive/apt-ftparchive.cc:759 +msgid "No selections matched" +msgstr "لم تُطابق أية تحديدات" -#: methods/gpgv.cc:213 +#: ftparchive/apt-ftparchive.cc:832 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr "" +msgid "Some files are missing in the package file group `%s'" +msgstr "بعض الملفات مفقودة في مجموعة ملف الحزمة `%s'" -#: methods/gpgv.cc:218 -msgid "Unknown error executing gpgv" -msgstr "" +#: ftparchive/cachedb.cc:43 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "قاعدة البيانات كانت فاسدة، فتم تغيير اسمها إلى %s.old" -#: methods/gpgv.cc:249 -msgid "The following signatures were invalid:\n" -msgstr "" +#: ftparchive/cachedb.cc:61 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "قاعدة البيانات قديمة، محاولة ترقية %s" -#: methods/gpgv.cc:256 +#: ftparchive/cachedb.cc:72 msgid "" -"The following signatures couldn't be verified because the public key is not " -"available:\n" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." msgstr "" -#: methods/gpgv.cc:272 +#: ftparchive/cachedb.cc:77 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "تعذر فتح ملف قاعدة البيانات %s: %s" + +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 #, c-format msgid "Failed to stat %s" msgstr "" -#: methods/gzip.cc:64 -#, c-format -msgid "Couldn't open pipe for %s" +#: ftparchive/cachedb.cc:238 +msgid "Archive has no control record" msgstr "" -#: methods/gzip.cc:109 -#, c-format -msgid "Read error from %s process" +#: ftparchive/cachedb.cc:444 +msgid "Unable to get a cursor" msgstr "" -#: methods/http.cc:377 -msgid "Waiting for headers" -msgstr "بانتظار الترويسات" +#: ftparchive/writer.cc:76 +#, c-format +msgid "W: Unable to read directory %s\n" +msgstr "W: تعذرت قراءة الدليل %s\n" -#: methods/http.cc:523 +#: ftparchive/writer.cc:81 #, c-format -msgid "Got a single header line over %u chars" +msgid "W: Unable to stat %s\n" msgstr "" -#: methods/http.cc:531 -msgid "Bad header line" -msgstr "سطر ترويسة سيء" +#: ftparchive/writer.cc:132 +msgid "E: " +msgstr "E: " -#: methods/http.cc:550 methods/http.cc:557 -msgid "The HTTP server sent an invalid reply header" -msgstr "أرسل خادم http ترويسة ردّ غير صالحة" +#: ftparchive/writer.cc:134 +msgid "W: " +msgstr "W: " -#: methods/http.cc:586 -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "أرسل خادم http ترويسة طول محتويات (ِContent-Length) غير صالحة" +#: ftparchive/writer.cc:141 +msgid "E: Errors apply to file " +msgstr "" -#: methods/http.cc:601 -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "أرسل خادم http ترويسة مدى محتويات (ِContent-Range) غير صالحة" +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 +#, c-format +msgid "Failed to resolve %s" +msgstr "" -#: methods/http.cc:603 -msgid "This HTTP server has broken range support" -msgstr "خادم http له دعم مدى معطوب" +#: ftparchive/writer.cc:170 +msgid "Tree walking failed" +msgstr "" -#: methods/http.cc:627 -msgid "Unknown date format" -msgstr "نسق تاريخ مجهول" - -#: methods/http.cc:774 -msgid "Select failed" -msgstr "فشل التحديد" - -#: methods/http.cc:779 -msgid "Connection timed out" -msgstr "انتهى وقت الاتصال" - -#: methods/http.cc:802 -msgid "Error writing to output file" -msgstr "خطأ في الكتابة إلى ملف المُخرجات" - -#: methods/http.cc:833 -msgid "Error writing to file" -msgstr "خطأ في الكتابة إلى الملف" - -#: methods/http.cc:861 -msgid "Error writing to the file" -msgstr "خطأ في الكتابة إلى الملف" - -#: methods/http.cc:875 -msgid "Error reading from server. Remote end closed connection" -msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآخر الاتصال" - -#: methods/http.cc:877 -msgid "Error reading from server" -msgstr "خطأ في القراءة من الخادم" - -#: methods/http.cc:1104 -msgid "Bad header data" -msgstr "بيانات ترويسة سيئة" - -#: methods/http.cc:1121 methods/http.cc:1176 -msgid "Connection failed" -msgstr "فشل الاتصال" - -#: methods/http.cc:1228 -msgid "Internal error" -msgstr "خطأ داخلي" - -#: apt-pkg/contrib/mmap.cc:80 -msgid "Can't mmap an empty file" -msgstr "" - -#: apt-pkg/contrib/mmap.cc:85 -#, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "" - -#: apt-pkg/contrib/strutl.cc:978 -#, c-format -msgid "Selection %s not found" -msgstr "تعذر العثور على التحديد %s" - -#: apt-pkg/contrib/configuration.cc:434 +#: ftparchive/writer.cc:195 #, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "اختصار نوع مجهول: '%c'" +msgid "Failed to open %s" +msgstr "فشل فتح %s" -#: apt-pkg/contrib/configuration.cc:492 +#: ftparchive/writer.cc:254 #, c-format -msgid "Opening configuration file %s" -msgstr "فتح ملف التهيئة %s" - -#: apt-pkg/contrib/configuration.cc:510 -#, fuzzy, c-format -#| msgid "Line %d too long (max %d)" -msgid "Line %d too long (max %u)" -msgstr "السطر %d طويل جداً (أقصاه %d)" +msgid " DeLink %s [%s]\n" +msgstr " DeLink %s [%s]\n" -#: apt-pkg/contrib/configuration.cc:606 +#: ftparchive/writer.cc:262 #, c-format -msgid "Syntax error %s:%u: Block starts with no name." +msgid "Failed to readlink %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:625 +#: ftparchive/writer.cc:266 #, c-format -msgid "Syntax error %s:%u: Malformed tag" +msgid "Failed to unlink %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:642 +#: ftparchive/writer.cc:273 #, c-format -msgid "Syntax error %s:%u: Extra junk after value" -msgstr "" +msgid "*** Failed to link %s to %s" +msgstr "*** فشل ربط %s بـ%s" -#: apt-pkg/contrib/configuration.cc:682 +#: ftparchive/writer.cc:283 #, c-format -msgid "Syntax error %s:%u: Directives can only be done at the top level" +msgid " DeLink limit of %sB hit.\n" msgstr "" -#: apt-pkg/contrib/configuration.cc:689 -#, c-format -msgid "Syntax error %s:%u: Too many nested includes" +#: ftparchive/writer.cc:387 +msgid "Archive had no package field" msgstr "" -#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format -msgid "Syntax error %s:%u: Included from here" +msgid " %s has no override entry\n" msgstr "" -#: apt-pkg/contrib/configuration.cc:702 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format -msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgid " %s maintainer is %s not %s\n" msgstr "" -#: apt-pkg/contrib/configuration.cc:736 +#: ftparchive/writer.cc:620 #, c-format -msgid "Syntax error %s:%u: Extra junk at end of file" +msgid " %s has no source override entry\n" msgstr "" -#: apt-pkg/contrib/configuration.cc:748 apt-pkg/contrib/cdromutl.cc:150 -#: apt-pkg/sourcelist.cc:320 apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 -#, c-format -msgid "Unable to read %s" -msgstr "تعذرت قراءة %s" - -#: apt-pkg/contrib/progress.cc:153 +#: ftparchive/writer.cc:624 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... خطأ!" +msgid " %s has no binary override entry either\n" +msgstr "" -#: apt-pkg/contrib/progress.cc:155 +#: ftparchive/contents.cc:321 #, c-format -msgid "%c%s... Done" -msgstr "%c%s... تمّ" +msgid "Internal error, could not locate member %s" +msgstr "خطأ داخلي، تعذر العثور على العضو %s" -#: apt-pkg/contrib/cmndline.cc:77 -#, c-format -msgid "Command line option '%c' [from %s] is not known." -msgstr "خيار سطر الأمر '%c' [من %s] مجهول." +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - فشل تعيين الذاكرة" -#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 -#: apt-pkg/contrib/cmndline.cc:119 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format -msgid "Command line option %s is not understood" -msgstr "خيار سطر الأمر %s غير مفهوم" +msgid "Unable to open %s" +msgstr "تعذر فتح %s" -#: apt-pkg/contrib/cmndline.cc:124 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format -msgid "Command line option %s is not boolean" +msgid "Malformed override %s line %lu #1" msgstr "" -#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 -#, c-format -msgid "Option %s requires an argument." -msgstr "الخيار %s يتطلّب مُعطى." - -#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format -msgid "Option %s: Configuration item specification must have an =." +msgid "Malformed override %s line %lu #2" msgstr "" -#: apt-pkg/contrib/cmndline.cc:234 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format -msgid "Option %s requires an integer argument, not '%s'" +msgid "Malformed override %s line %lu #3" msgstr "" -#: apt-pkg/contrib/cmndline.cc:265 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Option '%s' is too long" -msgstr "الخيار '%s' طويل جداً" +msgid "Failed to read the override file %s" +msgstr "" -#: apt-pkg/contrib/cmndline.cc:298 +#: ftparchive/multicompress.cc:72 #, c-format -msgid "Sense %s is not understood, try true or false." +msgid "Unknown compression algorithm '%s'" msgstr "" -#: apt-pkg/contrib/cmndline.cc:348 +#: ftparchive/multicompress.cc:102 #, c-format -msgid "Invalid operation %s" -msgstr "عمليّة غير صالحة %s" +msgid "Compressed output %s needs a compression set" +msgstr "" -#: apt-pkg/contrib/cdromutl.cc:52 -#, c-format -msgid "Unable to stat the mount point %s" +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 +msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 -#, c-format -msgid "Unable to change to %s" +#: ftparchive/multicompress.cc:195 +msgid "Failed to create FILE*" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:187 -msgid "Failed to stat the cdrom" +#: ftparchive/multicompress.cc:198 +msgid "Failed to fork" msgstr "" -#: apt-pkg/contrib/fileutl.cc:82 -#, c-format -msgid "Not using locking for read only lock file %s" +#: ftparchive/multicompress.cc:212 +msgid "Compress child" msgstr "" -#: apt-pkg/contrib/fileutl.cc:87 +#: ftparchive/multicompress.cc:235 #, c-format -msgid "Could not open lock file %s" +msgid "Internal error, failed to create %s" +msgstr "خطأ داخلي، تعذر إنشاء %s" + +#: ftparchive/multicompress.cc:286 +msgid "Failed to create subprocess IPC" msgstr "" -#: apt-pkg/contrib/fileutl.cc:105 -#, c-format -msgid "Not using locking for nfs mounted lock file %s" +#: ftparchive/multicompress.cc:321 +msgid "Failed to exec compressor " msgstr "" -#: apt-pkg/contrib/fileutl.cc:109 -#, c-format -msgid "Could not get lock %s" +#: ftparchive/multicompress.cc:360 +msgid "decompressor" msgstr "" -#: apt-pkg/contrib/fileutl.cc:377 -#, c-format -msgid "Waited for %s but it wasn't there" +#: ftparchive/multicompress.cc:403 +msgid "IO to subprocess/file failed" msgstr "" -#: apt-pkg/contrib/fileutl.cc:387 -#, c-format -msgid "Sub-process %s received a segmentation fault." +#: ftparchive/multicompress.cc:455 +msgid "Failed to read while computing MD5" msgstr "" -#: apt-pkg/contrib/fileutl.cc:390 +#: ftparchive/multicompress.cc:472 #, c-format -msgid "Sub-process %s returned an error code (%u)" +msgid "Problem unlinking %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:392 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "" +msgid "Failed to rename %s to %s" +msgstr "فشل تغيير اسم %s إلى %s" + +#: cmdline/apt-get.cc:124 +msgid "Y" +msgstr "Y" -#: apt-pkg/contrib/fileutl.cc:436 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format -msgid "Could not open file %s" +msgid "Regex compilation error - %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:492 -#, c-format -msgid "read, still have %lu to read but none left" +#: cmdline/apt-get.cc:241 +msgid "The following packages have unmet dependencies:" msgstr "" -#: apt-pkg/contrib/fileutl.cc:522 +#: cmdline/apt-get.cc:331 #, c-format -msgid "write, still have %lu to write but couldn't" -msgstr "" +msgid "but %s is installed" +msgstr "إلا أن %s مثبت" -#: apt-pkg/contrib/fileutl.cc:597 -msgid "Problem closing the file" -msgstr "مشكلة في إغلاق الملف" +#: cmdline/apt-get.cc:333 +#, c-format +msgid "but %s is to be installed" +msgstr "إلا أنه سيتم تثبيت %s" -#: apt-pkg/contrib/fileutl.cc:603 -msgid "Problem unlinking the file" -msgstr "" +#: cmdline/apt-get.cc:340 +msgid "but it is not installable" +msgstr "إلا أنه غير قابل للتثبيت" -#: apt-pkg/contrib/fileutl.cc:614 -msgid "Problem syncing the file" -msgstr "مشكلة في مزامنة الملف" +#: cmdline/apt-get.cc:342 +msgid "but it is a virtual package" +msgstr "إلا أنها حزمة وهمية" -#: apt-pkg/pkgcache.cc:132 -msgid "Empty package cache" -msgstr "" +#: cmdline/apt-get.cc:345 +msgid "but it is not installed" +msgstr "إلا أنها غير مثبتة" -#: apt-pkg/pkgcache.cc:138 -msgid "The package cache file is corrupted" -msgstr "" +#: cmdline/apt-get.cc:345 +msgid "but it is not going to be installed" +msgstr "إلا أنه لن يتم تثبيتها" -#: apt-pkg/pkgcache.cc:143 -msgid "The package cache file is an incompatible version" -msgstr "" +#: cmdline/apt-get.cc:350 +msgid " or" +msgstr " أو" -#: apt-pkg/pkgcache.cc:148 -#, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "" +#: cmdline/apt-get.cc:379 +msgid "The following NEW packages will be installed:" +msgstr "سيتم تثبيت الحزم الجديدة التالية:" -#: apt-pkg/pkgcache.cc:153 -msgid "The package cache was built for a different architecture" -msgstr "" +#: cmdline/apt-get.cc:405 +msgid "The following packages will be REMOVED:" +msgstr "سيتم إزالة الحزم التالية:" -#: apt-pkg/pkgcache.cc:224 -msgid "Depends" -msgstr "يعتمد" +#: cmdline/apt-get.cc:427 +msgid "The following packages have been kept back:" +msgstr "سيتم الإبقاء على الحزم التالية:" -#: apt-pkg/pkgcache.cc:224 -msgid "PreDepends" -msgstr "يعتمد مسبقاً" +#: cmdline/apt-get.cc:448 +msgid "The following packages will be upgraded:" +msgstr "ستتم ترقية الحزم التالية:" -#: apt-pkg/pkgcache.cc:224 -msgid "Suggests" -msgstr "يستحسن" +#: cmdline/apt-get.cc:469 +msgid "The following packages will be DOWNGRADED:" +msgstr "سيتم تثبيط الحزم التالية:" -#: apt-pkg/pkgcache.cc:225 -msgid "Recommends" -msgstr "يقترح" +#: cmdline/apt-get.cc:489 +msgid "The following held packages will be changed:" +msgstr "سيتم تغيير الحزم المبقاة التالية:" -#: apt-pkg/pkgcache.cc:225 -msgid "Conflicts" -msgstr "يعارض" +#: cmdline/apt-get.cc:542 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (بسبب %s) " -#: apt-pkg/pkgcache.cc:225 -msgid "Replaces" -msgstr "يستبدل" +#: cmdline/apt-get.cc:550 +msgid "" +"WARNING: The following essential packages will be removed.\n" +"This should NOT be done unless you know exactly what you are doing!" +msgstr "" +"تحذير: ستتم إزالة الحزم الأساسية التالية.\n" +"لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!" -#: apt-pkg/pkgcache.cc:226 -msgid "Obsoletes" -msgstr "يُلغي" +#: cmdline/apt-get.cc:581 +#, c-format +msgid "%lu upgraded, %lu newly installed, " +msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً، " -#: apt-pkg/pkgcache.cc:226 -msgid "Breaks" -msgstr "" +#: cmdline/apt-get.cc:585 +#, c-format +msgid "%lu reinstalled, " +msgstr "%lu أعيد تثبيتها، " -#: apt-pkg/pkgcache.cc:237 -msgid "important" -msgstr "مهم" +#: cmdline/apt-get.cc:587 +#, c-format +msgid "%lu downgraded, " +msgstr "%lu مثبطة، " -#: apt-pkg/pkgcache.cc:237 -msgid "required" -msgstr "مطلوب" +#: cmdline/apt-get.cc:589 +#, c-format +msgid "%lu to remove and %lu not upgraded.\n" +msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n" -#: apt-pkg/pkgcache.cc:237 -msgid "standard" -msgstr "قياسي" +#: cmdline/apt-get.cc:593 +#, c-format +msgid "%lu not fully installed or removed.\n" +msgstr "%lu غير مثبتة بالكامل أو مزالة.\n" -#: apt-pkg/pkgcache.cc:238 -msgid "optional" -msgstr "اختياري" +#: cmdline/apt-get.cc:667 +msgid "Correcting dependencies..." +msgstr "تصحيح المعتمدات..." -#: apt-pkg/pkgcache.cc:238 -msgid "extra" -msgstr "إضافي" +#: cmdline/apt-get.cc:670 +msgid " failed." +msgstr " فشل." -#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 -msgid "Building dependency tree" -msgstr "" +#: cmdline/apt-get.cc:673 +msgid "Unable to correct dependencies" +msgstr "لم يمكن تصحيح المعتمدات" -#: apt-pkg/depcache.cc:122 -msgid "Candidate versions" -msgstr "" +#: cmdline/apt-get.cc:676 +msgid "Unable to minimize the upgrade set" +msgstr "لم يمكن تقليص مجموعة الترقية" -#: apt-pkg/depcache.cc:151 -msgid "Dependency generation" -msgstr "" +#: cmdline/apt-get.cc:678 +msgid " Done" +msgstr " تم" -#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 -#, fuzzy -#| msgid "Merging available information" -msgid "Reading state information" -msgstr "دمج المعلومات المتوفرة" +#: cmdline/apt-get.cc:682 +msgid "You might want to run `apt-get -f install' to correct these." +msgstr "قد ترغب بتنفيذ الأمر `apt-get -f install' لتصحيح هذه." -#: apt-pkg/depcache.cc:219 -#, fuzzy, c-format -#| msgid "Failed to open %s" -msgid "Failed to open StateFile %s" -msgstr "فشل فتح %s" +#: cmdline/apt-get.cc:685 +msgid "Unmet dependencies. Try using -f." +msgstr "مُعتمدات غير مستوفاة. حاول استخدام -f." -#: apt-pkg/depcache.cc:225 -#, fuzzy, c-format -#| msgid "Failed to write file %s" -msgid "Failed to write temporary StateFile %s" -msgstr "فشلت كتابة الملف %s" +#: cmdline/apt-get.cc:707 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "تحذير: تعذرت المصادقة على الحزم التالية!" -#: apt-pkg/tagfile.cc:102 -#, c-format -msgid "Unable to parse package file %s (1)" -msgstr "" +#: cmdline/apt-get.cc:711 +msgid "Authentication warning overridden.\n" +msgstr "تم غض النظر عن تحذير المصادقة.\n" -#: apt-pkg/tagfile.cc:189 -#, c-format -msgid "Unable to parse package file %s (2)" -msgstr "" +#: cmdline/apt-get.cc:718 +msgid "Install these packages without verification [y/N]? " +msgstr "تثبيت هذه الحزم دون التحقق منها [y/N]؟ " -#: apt-pkg/sourcelist.cc:90 -#, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "" +#: cmdline/apt-get.cc:720 +msgid "Some packages could not be authenticated" +msgstr "تعذرت المصادقة على بعض الحزم" -#: apt-pkg/sourcelist.cc:92 -#, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "" +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 +msgid "There are problems and -y was used without --force-yes" +msgstr "هناك مشاكل وتم استخدام -y دون --force-yes" -#: apt-pkg/sourcelist.cc:95 -#, c-format -msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "" +#: cmdline/apt-get.cc:773 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "خطأ داخلي، تم طلب InstallPackages مع وجود حزم معطوبة!" -#: apt-pkg/sourcelist.cc:101 -#, c-format -msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "" +#: cmdline/apt-get.cc:782 +msgid "Packages need to be removed but remove is disabled." +msgstr "حزم بحاجة للإزالة لكن الإزالة مُعطّلة." -#: apt-pkg/sourcelist.cc:108 -#, c-format -msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "" +#: cmdline/apt-get.cc:793 +msgid "Internal error, Ordering didn't finish" +msgstr "خطأ داخلي، لم تنته عملية الترتيب" -#: apt-pkg/sourcelist.cc:199 -#, c-format -msgid "Opening %s" -msgstr "فتح %s" +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 +msgid "Unable to lock the download directory" +msgstr "تعذر قَفْل دليل التنزيل" -#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 -#, c-format -msgid "Line %u too long in source list %s." -msgstr "" +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 +msgid "The list of sources could not be read." +msgstr "تعذرت قراءة قائمة المصادر." -#: apt-pkg/sourcelist.cc:236 -#, c-format -msgid "Malformed line %u in source list %s (type)" -msgstr "" +#: cmdline/apt-get.cc:834 +msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgstr "يا للغرابة.. لم تتطابق الأحجام، الرجاء مراسلة apt@packages.debian.org" -#: apt-pkg/sourcelist.cc:240 +#: cmdline/apt-get.cc:839 #, c-format -msgid "Type '%s' is not known on line %u in source list %s" -msgstr "" +msgid "Need to get %sB/%sB of archives.\n" +msgstr "بحاجة إلى جلب %sب/%sب من الأرشيف.\n" -#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 +#: cmdline/apt-get.cc:842 #, c-format -msgid "Malformed line %u in source list %s (vendor id)" -msgstr "" +msgid "Need to get %sB of archives.\n" +msgstr "بحاجة إلى جلب %sب من الأرشيف.\n" + +#: cmdline/apt-get.cc:847 +#, fuzzy, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "بعد الاستخراج %sب من المساحة الإضافيّة سيتمّ استخدامها.\n" + +#: cmdline/apt-get.cc:850 +#, fuzzy, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n" -#: apt-pkg/packagemanager.cc:399 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format -msgid "" -"This installation run will require temporarily removing the essential " -"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " -"you really want to do it, activate the APT::Force-LoopBreak option." -msgstr "" +msgid "Couldn't determine free space in %s" +msgstr "تعذر حساب المساحة الحرة في %s" -#: apt-pkg/pkgrecords.cc:32 +#: cmdline/apt-get.cc:871 #, c-format -msgid "Index file type '%s' is not supported" +msgid "You don't have enough free space in %s." +msgstr "ليس هناك مساحة كافية في %s." + +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 +msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: apt-pkg/algorithms.cc:247 +#: cmdline/apt-get.cc:889 +msgid "Yes, do as I say!" +msgstr "نعم، افعل ما أقوله!" + +#: cmdline/apt-get.cc:891 #, c-format msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " msgstr "" +"أنت على وشك أن تقوم بشيء ضارّ جداً\n" +"كي تستمر اكتب العبارة '%s'\n" +" ؟] " -#: apt-pkg/algorithms.cc:1105 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 +msgid "Abort." +msgstr "إجهاض." -#: apt-pkg/algorithms.cc:1107 -msgid "Unable to correct problems, you have held broken packages." -msgstr "" +#: cmdline/apt-get.cc:912 +msgid "Do you want to continue [Y/n]? " +msgstr "هل تريد الاستمرار [Y/n]؟" -#: apt-pkg/acquire.cc:59 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format -msgid "Lists directory %spartial is missing." -msgstr "" +msgid "Failed to fetch %s %s\n" +msgstr "فشل إحضار %s %s\n" -#: apt-pkg/acquire.cc:63 -#, c-format -msgid "Archive directory %spartial is missing." -msgstr "" +#: cmdline/apt-get.cc:1002 +msgid "Some files failed to download" +msgstr "فشل تنزيل بعض الملفات" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:827 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "" +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 +msgid "Download complete and in download only mode" +msgstr "اكتمل التنزيل وفي وضع التنزيل فقط" -#: apt-pkg/acquire.cc:829 -#, c-format -msgid "Retrieving file %li of %li" +#: cmdline/apt-get.cc:1009 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" msgstr "" +"تعذر إحضار بعض الأرشيف، ربما يمكنك محاولة تنفيذ apt-get update أو إضافة --" +"fix-missing؟" -#: apt-pkg/acquire-worker.cc:110 +#: cmdline/apt-get.cc:1013 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "--fix-missing وتبديل الأوساط غير مدعومة حالياً" + +#: cmdline/apt-get.cc:1018 +msgid "Unable to correct missing packages." +msgstr "تعذر تصحيح الحزم المفقودة." + +#: cmdline/apt-get.cc:1019 +msgid "Aborting install." +msgstr "إجهاض التثبيت." + +#: cmdline/apt-get.cc:1053 #, c-format -msgid "The method driver %s could not be found." -msgstr "" +msgid "Note, selecting %s instead of %s\n" +msgstr "لاحظ، تحديد %s بدلاً من %s\n" -#: apt-pkg/acquire-worker.cc:159 +#: cmdline/apt-get.cc:1063 #, c-format -msgid "Method %s did not start correctly" -msgstr "" +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n" -#: apt-pkg/acquire-worker.cc:398 +#: cmdline/apt-get.cc:1081 #, c-format -msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "الرجاء إدخال القرص المُسمّى '%s' في السوّاقة '%s' وضغط مفتاح الإدخال." +msgid "Package %s is not installed, so not removed\n" +msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n" -#: apt-pkg/init.cc:124 +#: cmdline/apt-get.cc:1092 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "نظام الحزم '%s' غير مدعوم" +msgid "Package %s is a virtual package provided by:\n" +msgstr "الحزمة %s وهميّة وتوفّرها:\n" -#: apt-pkg/init.cc:140 -msgid "Unable to determine a suitable packaging system type" -msgstr "" +#: cmdline/apt-get.cc:1104 +msgid " [Installed]" +msgstr " [مُثبّتة]" -#: apt-pkg/clean.cc:57 +#: cmdline/apt-get.cc:1109 +msgid "You should explicitly select one to install." +msgstr "يجب اختيار واحدة بالتحديد لتثبيتها." + +#: cmdline/apt-get.cc:1114 #, c-format -msgid "Unable to stat %s." +msgid "" +"Package %s is not available, but is referred to by another package.\n" +"This may mean that the package is missing, has been obsoleted, or\n" +"is only available from another source\n" msgstr "" -#: apt-pkg/srcrecords.cc:44 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "" +#: cmdline/apt-get.cc:1133 +msgid "However the following packages replace it:" +msgstr "على أيّ فإن الحزم التالية تحلّ مكانها:" -#: apt-pkg/cachefile.cc:63 -msgid "The list of sources could not be read." -msgstr "تعذرت قراءة قائمة المصادر." +#: cmdline/apt-get.cc:1136 +#, c-format +msgid "Package %s has no installation candidate" +msgstr "الحزمة %s ليس لها مرشح تثبيت" -#: apt-pkg/cachefile.cc:69 -msgid "The package lists or status file could not be parsed or opened." -msgstr "" +#: cmdline/apt-get.cc:1156 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "إعادة تثبيت %s غير ممكنة، حيث أنّه لا يمكن تنزيلها.\n" -#: apt-pkg/cachefile.cc:73 -msgid "You may want to run apt-get update to correct these problems" -msgstr "قد يساعدك تنفيذ الأمر apt-get update في تصحيح هذه المشاكل" +#: cmdline/apt-get.cc:1164 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s هي النسخة الأحدث.\n" -#: apt-pkg/policy.cc:267 -msgid "Invalid record in the preferences file, no Package header" -msgstr "" +#: cmdline/apt-get.cc:1193 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'" -#: apt-pkg/policy.cc:289 +#: cmdline/apt-get.cc:1195 #, c-format -msgid "Did not understand pin type %s" -msgstr "" +msgid "Version '%s' for '%s' was not found" +msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'" -#: apt-pkg/policy.cc:297 -msgid "No priority (or zero) specified for pin" -msgstr "" +#: cmdline/apt-get.cc:1201 +#, c-format +msgid "Selected version %s (%s) for %s\n" +msgstr "النسخة المحددة %s (%s) للإصدارة %s\n" -#: apt-pkg/pkgcachegen.cc:72 -msgid "Cache has an incompatible versioning system" +#: cmdline/apt-get.cc:1338 +msgid "The update command takes no arguments" +msgstr "لا يقبل الأمر update أية مُعطيات" + +#: cmdline/apt-get.cc:1351 +msgid "Unable to lock the list directory" +msgstr "تعذر قفل دليل القائمة" + +#: cmdline/apt-get.cc:1402 +msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: apt-pkg/pkgcachegen.cc:115 -#, c-format -msgid "Error occurred while processing %s (NewPackage)" -msgstr "حدث خطأ أثناء معالجة %s (NewPackage)" +#: cmdline/apt-get.cc:1434 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "سيتم تثبيت الحزم الجديدة التالية:" -#: apt-pkg/pkgcachegen.cc:130 -#, c-format -msgid "Error occurred while processing %s (UsePackage1)" -msgstr "حدث خطأ أثناء معالجة %s (UserPackage1)" +#: cmdline/apt-get.cc:1436 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" -#: apt-pkg/pkgcachegen.cc:153 -#, fuzzy, c-format -#| msgid "Error occurred while processing %s (NewFileVer1)" -msgid "Error occurred while processing %s (NewFileDesc1)" -msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)" +#: cmdline/apt-get.cc:1441 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" -#: apt-pkg/pkgcachegen.cc:178 -#, c-format -msgid "Error occurred while processing %s (UsePackage2)" -msgstr "حدث خطأ أثناء معالجة %s (UserPackage2)" +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 +msgid "The following information may help to resolve the situation:" +msgstr "قد تساعد المعلومات التالية في حل المشكلة:" -#: apt-pkg/pkgcachegen.cc:182 -#, c-format -msgid "Error occurred while processing %s (NewFileVer1)" -msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)" +#: cmdline/apt-get.cc:1448 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء" -#: apt-pkg/pkgcachegen.cc:213 -#, c-format -msgid "Error occurred while processing %s (NewVersion1)" -msgstr "حدث خطأ أثناء معالجة %s (NewVersion1)" +#: cmdline/apt-get.cc:1467 +msgid "Internal error, AllUpgrade broke stuff" +msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء" -#: apt-pkg/pkgcachegen.cc:217 +#: cmdline/apt-get.cc:1514 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "تعذر العثور على الحزمة %s" + +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format -msgid "Error occurred while processing %s (UsePackage3)" -msgstr "حدث خطأ أثناء معالجة %s (UsePackage3)" +msgid "Couldn't find package %s" +msgstr "تعذر العثور على الحزمة %s" -#: apt-pkg/pkgcachegen.cc:221 +#: cmdline/apt-get.cc:1652 #, c-format -msgid "Error occurred while processing %s (NewVersion2)" -msgstr "حدث خطأ أثناء معالجة %s (NewVersion2)" +msgid "Note, selecting %s for regex '%s'\n" +msgstr "لاحظ، تحديد %s بسبب صيغة regex '%s'\n" -#: apt-pkg/pkgcachegen.cc:245 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format -#| msgid "Error occurred while processing %s (NewFileVer1)" -msgid "Error occurred while processing %s (NewFileDesc2)" -msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)" +msgid "%s set to manually installed.\n" +msgstr "إلا أنه سيتم تثبيت %s" -#: apt-pkg/pkgcachegen.cc:251 -msgid "Wow, you exceeded the number of package names this APT is capable of." +#: cmdline/apt-get.cc:1696 +msgid "You might want to run `apt-get -f install' to correct these:" +msgstr "قد ترغب بتشغيل `apt-get -f install' لتصحيح هذه:" + +#: cmdline/apt-get.cc:1699 +msgid "" +"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " +"solution)." msgstr "" +"مُعتمدات غير مستوفاة. جرب 'apt-get -f install' بدون أسماء حزم (أو حدّد حلاً)." -#: apt-pkg/pkgcachegen.cc:254 -msgid "Wow, you exceeded the number of versions this APT is capable of." +#: cmdline/apt-get.cc:1711 +msgid "" +"Some packages could not be installed. This may mean that you have\n" +"requested an impossible situation or if you are using the unstable\n" +"distribution that some required packages have not yet been created\n" +"or been moved out of Incoming." msgstr "" -#: apt-pkg/pkgcachegen.cc:257 -msgid "Wow, you exceeded the number of descriptions this APT is capable of." +#: cmdline/apt-get.cc:1719 +msgid "" +"Since you only requested a single operation it is extremely likely that\n" +"the package is simply not installable and a bug report against\n" +"that package should be filed." msgstr "" -#: apt-pkg/pkgcachegen.cc:260 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." +#: cmdline/apt-get.cc:1727 +msgid "Broken packages" +msgstr "حزم معطوبة" + +#: cmdline/apt-get.cc:1756 +msgid "The following extra packages will be installed:" +msgstr "سيتم تثبيت الحزم الإضافيّة التالية:" + +#: cmdline/apt-get.cc:1845 +msgid "Suggested packages:" +msgstr "الحزم المقترحة:" + +#: cmdline/apt-get.cc:1846 +msgid "Recommended packages:" +msgstr "الحزم المستحسنة:" + +#: cmdline/apt-get.cc:1874 +msgid "Calculating upgrade... " +msgstr "حساب الترقية..." + +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 +msgid "Failed" +msgstr "فشل" + +#: cmdline/apt-get.cc:1882 +msgid "Done" +msgstr "تمّ" + +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 +msgid "Internal error, problem resolver broke stuff" msgstr "" -#: apt-pkg/pkgcachegen.cc:288 +#: cmdline/apt-get.cc:2057 +msgid "Must specify at least one package to fetch source for" +msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها" + +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format -msgid "Error occurred while processing %s (FindPkg)" -msgstr "" +msgid "Unable to find a source package for %s" +msgstr "تعذر العثور على مصدر الحزمة %s" -#: apt-pkg/pkgcachegen.cc:301 +#: cmdline/apt-get.cc:2103 #, c-format -msgid "Error occurred while processing %s (CollectFileProvides)" +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" msgstr "" -#: apt-pkg/pkgcachegen.cc:307 +#: cmdline/apt-get.cc:2108 #, c-format -msgid "Package %s %s was not found while processing file dependencies" +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" msgstr "" -#: apt-pkg/pkgcachegen.cc:678 +#: cmdline/apt-get.cc:2163 #, c-format -msgid "Couldn't stat source package list %s" -msgstr "" +msgid "Skipping already downloaded file '%s'\n" +msgstr "تخطي الملف '%s' المنزل مسبقاً\n" -#. Build the status cache -#: apt-pkg/pkgcachegen.cc:748 apt-pkg/pkgcachegen.cc:817 -#: apt-pkg/pkgcachegen.cc:822 apt-pkg/pkgcachegen.cc:945 -msgid "Reading package lists" -msgstr "قراءة قوائم الحزم" +#: cmdline/apt-get.cc:2191 +#, c-format +msgid "You don't have enough free space in %s" +msgstr "ليس هناك مساحة كافية في %s" -#: apt-pkg/pkgcachegen.cc:763 -msgid "Collecting File Provides" +#: cmdline/apt-get.cc:2197 +#, c-format +msgid "Need to get %sB/%sB of source archives.\n" +msgstr "يجب جلب %sب/%sب من الأرشيفات المصدرية.\n" + +#: cmdline/apt-get.cc:2200 +#, c-format +msgid "Need to get %sB of source archives.\n" +msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n" + +#: cmdline/apt-get.cc:2206 +#, c-format +msgid "Fetch source %s\n" +msgstr "إحضار المصدر %s\n" + +#: cmdline/apt-get.cc:2237 +msgid "Failed to fetch some archives." +msgstr "فشل إحضار بعض الأرشيفات." + +#: cmdline/apt-get.cc:2265 +#, c-format +msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: apt-pkg/pkgcachegen.cc:815 +#: cmdline/apt-get.cc:2277 #, c-format -msgid "Unable to write to %s" -msgstr "تعذرت الكتابة إلى %s" +msgid "Unpack command '%s' failed.\n" +msgstr "أمر فك الحزمة '%s' فشل.\n" -#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 -msgid "IO Error saving source cache" +#: cmdline/apt-get.cc:2278 +#, c-format +msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: apt-pkg/acquire-item.cc:127 +#: cmdline/apt-get.cc:2295 #, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "فشل إعادة التسمية ، %s (%s -> %s)." +msgid "Build command '%s' failed.\n" +msgstr "أمر البناء '%s' فشل.\n" -#: apt-pkg/acquire-item.cc:401 -msgid "MD5Sum mismatch" -msgstr "MD5Sum غير متطابقة" +#: cmdline/apt-get.cc:2314 +msgid "Child process failed" +msgstr "" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1399 -#, fuzzy -#| msgid "MD5Sum mismatch" -msgid "Hash Sum mismatch" -msgstr "MD5Sum غير متطابقة" +#: cmdline/apt-get.cc:2330 +msgid "Must specify at least one package to check builddeps for" +msgstr "" -#: apt-pkg/acquire-item.cc:1091 -msgid "There is no public key available for the following key IDs:\n" +#: cmdline/apt-get.cc:2358 +#, c-format +msgid "Unable to get build-dependency information for %s" msgstr "" -#: apt-pkg/acquire-item.cc:1204 +#: cmdline/apt-get.cc:2378 #, c-format -msgid "" -"I wasn't able to locate a file for the %s package. This might mean you need " -"to manually fix this package. (due to missing arch)" +msgid "%s has no build depends.\n" msgstr "" -#: apt-pkg/acquire-item.cc:1263 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" -"I wasn't able to locate file for the %s package. This might mean you need to " -"manually fix this package." +"%s dependency for %s cannot be satisfied because the package %s cannot be " +"found" msgstr "" -#: apt-pkg/acquire-item.cc:1304 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" -"The package index files are corrupted. No Filename: field for package %s." +"%s dependency for %s cannot be satisfied because no available versions of " +"package %s can satisfy version requirements" msgstr "" -#: apt-pkg/acquire-item.cc:1391 -msgid "Size mismatch" -msgstr "الحجم غير متطابق" - -#: apt-pkg/vendorlist.cc:66 +#: cmdline/apt-get.cc:2519 #, c-format -msgid "Vendor block %s contains no fingerprint" +msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: apt-pkg/cdrom.cc:529 +#: cmdline/apt-get.cc:2544 #, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" +msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 -msgid "Identifying.. " -msgstr "جاري التعرف..." - -#: apt-pkg/cdrom.cc:563 +#: cmdline/apt-get.cc:2558 #, c-format -msgid "Stored label: %s\n" +msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: apt-pkg/cdrom.cc:583 -#, c-format -msgid "Using CD-ROM mount point %s\n" +#: cmdline/apt-get.cc:2562 +msgid "Failed to process build dependencies" msgstr "" -#: apt-pkg/cdrom.cc:601 -msgid "Unmounting CD-ROM\n" -msgstr "فك تركيب القرص المدمج\n" - -#: apt-pkg/cdrom.cc:605 -msgid "Waiting for disc...\n" -msgstr "بانتظار القرص...\n" - -#. Mount the new CDROM -#: apt-pkg/cdrom.cc:613 -msgid "Mounting CD-ROM...\n" -msgstr "تركيب القرص...\n" - -#: apt-pkg/cdrom.cc:631 -msgid "Scanning disc for index files..\n" -msgstr "" +#: cmdline/apt-get.cc:2594 +msgid "Supported modules:" +msgstr "الوحدات المدعومة:" -#: apt-pkg/cdrom.cc:671 -#, c-format +#: cmdline/apt-get.cc:2635 msgid "" -"Found %u package indexes, %u source indexes, %u translation indexes and %u " -"signatures\n" -msgstr "" - -#: apt-pkg/cdrom.cc:708 -#, c-format -msgid "Found label '%s'\n" +"Usage: apt-get [options] command\n" +" apt-get [options] install|remove pkg1 [pkg2 ...]\n" +" apt-get [options] source pkg1 [pkg2 ...]\n" +"\n" +"apt-get is a simple command line interface for downloading and\n" +"installing packages. The most frequently used commands are update\n" +"and install.\n" +"\n" +"Commands:\n" +" update - Retrieve new lists of packages\n" +" upgrade - Perform an upgrade\n" +" install - Install new packages (pkg is libc6 not libc6.deb)\n" +" remove - Remove packages\n" +" autoremove - Remove all automatic unused packages\n" +" purge - Remove and purge packages\n" +" source - Download source archives\n" +" build-dep - Configure build-dependencies for source packages\n" +" dist-upgrade - Distribution upgrade, see apt-get(8)\n" +" dselect-upgrade - Follow dselect selections\n" +" clean - Erase downloaded archive files\n" +" autoclean - Erase old downloaded archive files\n" +" check - Verify that there are no broken dependencies\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -qq No output except for errors\n" +" -d Download only - do NOT install or unpack archives\n" +" -s No-act. Perform ordering simulation\n" +" -y Assume Yes to all queries and do not prompt\n" +" -f Attempt to continue if the integrity check fails\n" +" -m Attempt to continue if archives are unlocatable\n" +" -u Show a list of upgraded packages as well\n" +" -b Build the source package after fetching it\n" +" -V Show verbose version numbers\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n" +"pages for more information and options.\n" +" This APT has Super Cow Powers.\n" msgstr "" -#: apt-pkg/cdrom.cc:737 -msgid "That is not a valid name, try again.\n" -msgstr "هذا الاسم غير صالح، حاول مجدداً.\n" - -#: apt-pkg/cdrom.cc:753 -#, c-format -msgid "" -"This disc is called: \n" -"'%s'\n" +#: cmdline/acqprogress.cc:55 +msgid "Hit " msgstr "" -"هذا القرص مسمى: \n" -"'%s'\n" - -#: apt-pkg/cdrom.cc:757 -msgid "Copying package lists..." -msgstr "نسخ قوائم الحزم..." -#: apt-pkg/cdrom.cc:783 -msgid "Writing new source list\n" -msgstr "كتابة لائحة المصادر الجديدة\n" +#: cmdline/acqprogress.cc:79 +msgid "Get:" +msgstr "جلب:" -#: apt-pkg/cdrom.cc:792 -msgid "Source list entries for this disc are:\n" -msgstr "" +#: cmdline/acqprogress.cc:110 +msgid "Ign " +msgstr "تجاهل" -#: apt-pkg/cdrom.cc:834 -#, fuzzy -#| msgid "Unmounting CD-ROM..." -msgid "Unmounting CD-ROM...\n" -msgstr "فك تركيب القرص المدمج..." +#: cmdline/acqprogress.cc:114 +msgid "Err " +msgstr "خطأ" -#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 +#: cmdline/acqprogress.cc:135 #, c-format -msgid "Wrote %i records.\n" -msgstr "" +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "جلب %sب في %s (%sب/ث)\n" -#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 +#: cmdline/acqprogress.cc:225 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "" +msgid " [Working]" +msgstr " [يعمل]" -#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 +#: cmdline/acqprogress.cc:271 #, c-format -msgid "Wrote %i records with %i mismatched files\n" +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" msgstr "" +"تغيير الوسط: الرجاء إدخال القرص المُسمّى\n" +" '%s'\n" +"في السوّاقة '%s' وضغط مفتاح الإدخال\n" -#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831 -#, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "" +#: cmdline/apt-sortpkgs.cc:86 +msgid "Unknown package record!" +msgstr "سجل حزمة مجهول!" -#: apt-pkg/deb/dpkgpm.cc:510 -#, c-format -msgid "Directory '%s' missing" +#: cmdline/apt-sortpkgs.cc:150 +msgid "" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:572 -#, c-format -msgid "Preparing %s" -msgstr "تحضير %s" - -#: apt-pkg/deb/dpkgpm.cc:573 -#, c-format -msgid "Unpacking %s" -msgstr "فتح %s" - -#: apt-pkg/deb/dpkgpm.cc:578 -#, c-format -msgid "Preparing to configure %s" -msgstr "التحضير لتهيئة %s" - -#: apt-pkg/deb/dpkgpm.cc:579 -#, c-format -msgid "Configuring %s" -msgstr "تهيئة %s" - -#: apt-pkg/deb/dpkgpm.cc:581 apt-pkg/deb/dpkgpm.cc:582 -#, fuzzy, c-format -#| msgid "Error processing directory %s" -msgid "Processing triggers for %s" -msgstr "خطأ في معالجة الدليل %s" - -#: apt-pkg/deb/dpkgpm.cc:584 -#, c-format -msgid "Installed %s" -msgstr "تم تثبيت %s" - -#: apt-pkg/deb/dpkgpm.cc:589 apt-pkg/deb/dpkgpm.cc:591 -#: apt-pkg/deb/dpkgpm.cc:592 -#, c-format -msgid "Preparing for removal of %s" -msgstr "التحضير لإزالة %s" - -#: apt-pkg/deb/dpkgpm.cc:594 -#, c-format -msgid "Removing %s" -msgstr "إزالة %s" - -#: apt-pkg/deb/dpkgpm.cc:595 -#, c-format -msgid "Removed %s" -msgstr "تم إزالة %s" +#: dselect/install:32 +msgid "Bad default setting!" +msgstr "إعداد افتراضيّ سيّء!" -#: apt-pkg/deb/dpkgpm.cc:600 -#, c-format -msgid "Preparing to completely remove %s" -msgstr "التحضير لإزالة %s بالكامل" +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 +#: dselect/install:104 dselect/update:45 +msgid "Press enter to continue." +msgstr "اضغط مفتاح الإدخال للاستمرار." -#: apt-pkg/deb/dpkgpm.cc:601 -#, c-format -msgid "Completely removed %s" -msgstr "تمت إزالة %s بالكامل" +#: dselect/install:100 +msgid "Some errors occurred while unpacking. I'm going to configure the" +msgstr "حدثت بعض الأخطاء أثناء فك الحزمة. سأقوم بتهيئة " -#: apt-pkg/deb/dpkgpm.cc:749 -msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" -msgstr "" +#: dselect/install:101 +msgid "packages that were installed. This may result in duplicate errors" +msgstr "الحزم التي تم تثبيتها. قد يتسبب هذا بظهر أخطاء متكررة" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "" +#: dselect/install:102 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "أو أخطاء سبّبتها المُعتمدات المفقودة. لا بأس بهذا، فقط الأخطاء" -#: methods/rsh.cc:91 -msgid "Failed to create IPC pipe to subprocess" -msgstr "" +#: dselect/install:103 +msgid "" +"above this message are important. Please fix them and run [I]nstall again" +msgstr "أعلى هذه الرسالة مهمّة. الرجاء تصحيحها وتشغيل التثبيت مجدداً" -#: methods/rsh.cc:330 -msgid "Connection closed prematurely" -msgstr "" +#: dselect/update:30 +msgid "Merging available information" +msgstr "دمج المعلومات المتوفرة" #: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" @@ -1319,11 +1376,6 @@ msgstr "" msgid "The diversion path is too long" msgstr "" -#: apt-inst/extract.cc:185 -#, c-format -msgid "Failed to rename %s to %s" -msgstr "فشل تغيير اسم %s إلى %s" - #: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" @@ -1347,6 +1399,13 @@ msgstr "" msgid "File %s/%s overwrites the one in the package %s" msgstr "" +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 +#, c-format +msgid "Unable to read %s" +msgstr "تعذرت قراءة %s" + #: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" @@ -1371,6 +1430,13 @@ msgstr "" msgid "The info and temp directories need to be on the same filesystem" msgstr "" +#. Build the status cache +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 +msgid "Reading package lists" +msgstr "قراءة قوائم الحزم" + #: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" @@ -1467,1226 +1533,1170 @@ msgstr "فشل العثور على ملف تحكّم صالح" msgid "Unparsable control file" msgstr "" -#: cmdline/apt-cache.cc:143 -#, c-format -msgid "Package %s version %s has an unmet dep:\n" -msgstr "الحزمة %s النسخة %s لها معتمد غير مستوفى:\n" - -#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 -#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 -#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 +#: methods/cdrom.cc:114 #, c-format -msgid "Unable to locate package %s" -msgstr "تعذر العثور على الحزمة %s" - -#: cmdline/apt-cache.cc:247 -msgid "Total package names : " -msgstr "أسماء الحزم الكلية :" +msgid "Unable to read the cdrom database %s" +msgstr "تعذرت قراءة قاعدة بيانات القرص المدمج %s" -#: cmdline/apt-cache.cc:287 -msgid " Normal packages: " -msgstr " الحزم العادية:" - -#: cmdline/apt-cache.cc:288 -msgid " Pure virtual packages: " -msgstr "الحزمة الوهمية تماماً:" - -#: cmdline/apt-cache.cc:289 -msgid " Single virtual packages: " -msgstr " الحزمة الوهمية المفردة:" - -#: cmdline/apt-cache.cc:290 -msgid " Mixed virtual packages: " -msgstr " الحزم الوهمية المختلطة:" - -#: cmdline/apt-cache.cc:291 -msgid " Missing: " -msgstr " مفقودة:" +#: methods/cdrom.cc:123 +msgid "" +"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " +"cannot be used to add new CD-ROMs" +msgstr "" +"الرجاء استخدام apt-cdrom لتعريف APT بهذا القرص المدمج. لا يمكن استخدام apt-" +"get update لإضافة أقراص مدمجة جديدة." -#: cmdline/apt-cache.cc:293 -msgid "Total distinct versions: " -msgstr "مجموع النسخ الفريدة:" +#: methods/cdrom.cc:131 +msgid "Wrong CD-ROM" +msgstr "القرص المدمج الخطأ" -#: cmdline/apt-cache.cc:295 -#, fuzzy -#| msgid "Total distinct versions: " -msgid "Total Distinct Descriptions: " -msgstr "مجموع النسخ الفريدة:" +#: methods/cdrom.cc:166 +#, c-format +msgid "Unable to unmount the CD-ROM in %s, it may still be in use." +msgstr "تعذر فكّ القرص المدمج من %s، إذ قد يكون لا يزال قيد الاستخدام." -#: cmdline/apt-cache.cc:297 -msgid "Total dependencies: " -msgstr "مجموع المعتمدات:" +#: methods/cdrom.cc:171 +msgid "Disk not found." +msgstr "لم يُعثر على القرص." -#: cmdline/apt-cache.cc:300 -msgid "Total ver/file relations: " -msgstr "مجموع علاقات النسخ/الملفات:" +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 +msgid "File not found" +msgstr "لم يُعثر على الملف" -#: cmdline/apt-cache.cc:302 -#, fuzzy -#| msgid "Total ver/file relations: " -msgid "Total Desc/File relations: " -msgstr "مجموع علاقات النسخ/الملفات:" +#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 +#: methods/rred.cc:234 methods/rred.cc:243 +msgid "Failed to stat" +msgstr "فشيل تنفيذ stat" -#: cmdline/apt-cache.cc:304 -msgid "Total Provides mappings: " -msgstr "مجموع علاقات النسخ/الملفات:" +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +msgid "Failed to set modification time" +msgstr "فشل تعيين وقت التعديل" -#: cmdline/apt-cache.cc:316 -msgid "Total globbed strings: " +#: methods/file.cc:44 +msgid "Invalid URI, local URIS must not start with //" msgstr "" -#: cmdline/apt-cache.cc:330 -msgid "Total dependency version space: " -msgstr "" +#. Login must be before getpeername otherwise dante won't work. +#: methods/ftp.cc:162 +msgid "Logging in" +msgstr "تسجيل الدخول" -#: cmdline/apt-cache.cc:335 -msgid "Total slack space: " +#: methods/ftp.cc:168 +msgid "Unable to determine the peer name" msgstr "" -#: cmdline/apt-cache.cc:343 -msgid "Total space accounted for: " -msgstr "مجموع المساحة المحسوب حسابها:" - -#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 -#, c-format -msgid "Package file %s is out of sync." +#: methods/ftp.cc:173 +msgid "Unable to determine the local name" msgstr "" -#: cmdline/apt-cache.cc:1293 -msgid "You must give exactly one pattern" -msgstr "يجب أن تعطي صيغة واحدة بالضبط" +#: methods/ftp.cc:204 methods/ftp.cc:232 +#, c-format +msgid "The server refused the connection and said: %s" +msgstr "رفض الخادم اتصالنا بالرد: %s" -#: cmdline/apt-cache.cc:1447 -msgid "No packages found" -msgstr "لم يُعثر على أية حزم" +#: methods/ftp.cc:210 +#, c-format +msgid "USER failed, server said: %s" +msgstr "فشل USER، ردّ الخادم: %s" -#: cmdline/apt-cache.cc:1524 -msgid "Package files:" -msgstr "ملفات الحزم:" +#: methods/ftp.cc:217 +#, c-format +msgid "PASS failed, server said: %s" +msgstr "فشل PASS، ردّ الخادم: %s" -#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 -msgid "Cache is out of sync, can't x-ref a package file" +#: methods/ftp.cc:237 +msgid "" +"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " +"is empty." msgstr "" +"تم تحديد خادم بروكسي ولكن دون نص تسجيل دخول برمجي، Acquire::ftp::ProxyLogin " +"فارغ." -#: cmdline/apt-cache.cc:1532 +#: methods/ftp.cc:265 #, c-format -msgid "%4i %s\n" -msgstr "%4i %s\n" +msgid "Login script command '%s' failed, server said: %s" +msgstr "فشل أمر نص تسجيل الدخول البرمجي '%s'، ردّ الخادم: %s" -#. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1544 -msgid "Pinned packages:" -msgstr "الحزم المُدبّسة:" +#: methods/ftp.cc:291 +#, c-format +msgid "TYPE failed, server said: %s" +msgstr "فشل TYPE، ردّ الخادم: %s" -#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 -msgid "(not found)" -msgstr "(غير موجود)" +#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 +msgid "Connection timeout" +msgstr "انتهى وقت الاتصال" -#. Installed version -#: cmdline/apt-cache.cc:1577 -msgid " Installed: " -msgstr " مُثبّت:" +#: methods/ftp.cc:335 +msgid "Server closed the connection" +msgstr "أغلق الخادم الاتصال" -#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 -msgid "(none)" -msgstr "(لاشيء)" +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +msgid "Read error" +msgstr "خطأ في القراءة" -#. Candidate Version -#: cmdline/apt-cache.cc:1584 -msgid " Candidate: " -msgstr " مرشّح: " +#: methods/ftp.cc:345 methods/rsh.cc:197 +msgid "A response overflowed the buffer." +msgstr "" -#: cmdline/apt-cache.cc:1594 -msgid " Package pin: " +#: methods/ftp.cc:362 methods/ftp.cc:374 +msgid "Protocol corruption" msgstr "" -#. Show the priority tables -#: cmdline/apt-cache.cc:1603 -msgid " Version table:" -msgstr " جدول النسخ:" +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +msgid "Write error" +msgstr "خطأ في الكتابة" -#: cmdline/apt-cache.cc:1618 -#, c-format -msgid " %4i %s\n" -msgstr " %4i %s\n" +#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 +msgid "Could not create a socket" +msgstr "" -#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2588 cmdline/apt-sortpkgs.cc:144 -#, fuzzy, c-format -#| msgid "%s %s for %s %s compiled on %s %s\n" -msgid "%s %s for %s compiled on %s %s\n" -msgstr "%s %s لـ%s %s مُجمّع على %s %s\n" +#: methods/ftp.cc:698 +msgid "Could not connect data socket, connection timed out" +msgstr "" -#: cmdline/apt-cache.cc:1721 -msgid "" -"Usage: apt-cache [options] command\n" -" apt-cache [options] add file1 [file2 ...]\n" -" apt-cache [options] showpkg pkg1 [pkg2 ...]\n" -" apt-cache [options] showsrc pkg1 [pkg2 ...]\n" -"\n" -"apt-cache is a low-level tool used to manipulate APT's binary\n" -"cache files, and query information from them\n" -"\n" -"Commands:\n" -" add - Add a package file to the source cache\n" -" gencaches - Build both the package and source cache\n" -" showpkg - Show some general information for a single package\n" -" showsrc - Show source records\n" -" stats - Show some basic statistics\n" -" dump - Show the entire file in a terse form\n" -" dumpavail - Print an available file to stdout\n" -" unmet - Show unmet dependencies\n" -" search - Search the package list for a regex pattern\n" -" show - Show a readable record for the package\n" -" depends - Show raw dependency information for a package\n" -" rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" -" xvcg - Generate package graphs for xvcg\n" -" policy - Show policy settings\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -p=? The package cache.\n" -" -s=? The source cache.\n" -" -q Disable progress indicator.\n" -" -i Show only important deps for the unmet command.\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" +#: methods/ftp.cc:704 +msgid "Could not connect passive socket." msgstr "" -#: cmdline/apt-cdrom.cc:78 -msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "الرجاء كتابة اسم لهذا القرص، مثال 'Debian 2.1r1 Disk 1'" +#: methods/ftp.cc:722 +msgid "getaddrinfo was unable to get a listening socket" +msgstr "" -#: cmdline/apt-cdrom.cc:93 -msgid "Please insert a Disc in the drive and press enter" -msgstr "الرجاء إدخال قرص في السواقة وضغط الزر enter" +#: methods/ftp.cc:736 +msgid "Could not bind a socket" +msgstr "" -#: cmdline/apt-cdrom.cc:117 -msgid "Repeat this process for the rest of the CDs in your set." -msgstr "كرر هذه العملية لباقي الأقراص المدمجة في المجموعة." +#: methods/ftp.cc:740 +msgid "Could not listen on the socket" +msgstr "" -#: cmdline/apt-config.cc:41 -msgid "Arguments not in pairs" +#: methods/ftp.cc:747 +msgid "Could not determine the socket's name" msgstr "" -#: cmdline/apt-config.cc:76 -msgid "" -"Usage: apt-config [options] command\n" -"\n" -"apt-config is a simple tool to read the APT config file\n" -"\n" -"Commands:\n" -" shell - Shell mode\n" -" dump - Show the configuration\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: methods/ftp.cc:779 +msgid "Unable to send PORT command" +msgstr "تعذر إرسال الأمر PORT" + +#: methods/ftp.cc:789 +#, c-format +msgid "Unknown address family %u (AF_*)" msgstr "" -#: cmdline/apt-extracttemplates.cc:98 +#: methods/ftp.cc:798 #, c-format -msgid "%s not a valid DEB package." -msgstr "%s ليس حزمة DEB صالحة." +msgid "EPRT failed, server said: %s" +msgstr "فشل EPRT، ردّ الخادم: %s" -#: cmdline/apt-extracttemplates.cc:232 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: methods/ftp.cc:818 +msgid "Data socket connect timed out" msgstr "" -#: cmdline/apt-extracttemplates.cc:310 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "تعذر الحصول على نسخة debconf. هل هي مثبتة؟" +#: methods/ftp.cc:825 +msgid "Unable to accept connection" +msgstr "تعذر قبول الاتصال" -#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 -msgid "Package extension list is too long" -msgstr "قائمة توسيعات الحزمة طويلة جداً" +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 +msgid "Problem hashing file" +msgstr "" -#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 -#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 -#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 +#: methods/ftp.cc:877 #, c-format -msgid "Error processing directory %s" -msgstr "خطأ في معالجة الدليل %s" - -#: ftparchive/apt-ftparchive.cc:251 -msgid "Source extension list is too long" -msgstr "قائمة توسيعات المصدر طويلة جداً" +msgid "Unable to fetch file, server said '%s'" +msgstr "تعذر إحضار الملف، ردّ الخادم '%s'" -#: ftparchive/apt-ftparchive.cc:368 -msgid "Error writing header to contents file" -msgstr "خطأ في كتابة الترويسة إلى ملف المحتويات" +#: methods/ftp.cc:892 methods/rsh.cc:322 +msgid "Data socket timed out" +msgstr "" -#: ftparchive/apt-ftparchive.cc:398 +#: methods/ftp.cc:922 #, c-format -msgid "Error processing contents %s" -msgstr "خطأ في معالجة المحتويات %s" +msgid "Data transfer failed, server said '%s'" +msgstr "فشل نقل البيانات، ردّ الخادم '%s'" -#: ftparchive/apt-ftparchive.cc:553 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" +#. Get the files information +#: methods/ftp.cc:997 +msgid "Query" +msgstr "استعلام" -#: ftparchive/apt-ftparchive.cc:759 -msgid "No selections matched" -msgstr "لم تُطابق أية تحديدات" +#: methods/ftp.cc:1109 +msgid "Unable to invoke " +msgstr "" -#: ftparchive/apt-ftparchive.cc:832 +#: methods/connect.cc:65 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "بعض الملفات مفقودة في مجموعة ملف الحزمة `%s'" +msgid "Connecting to %s (%s)" +msgstr "الاتصال بـ%s (%s)" -#: ftparchive/cachedb.cc:43 +#: methods/connect.cc:72 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "قاعدة البيانات كانت فاسدة، فتم تغيير اسمها إلى %s.old" +msgid "[IP: %s %s]" +msgstr "[IP: %s %s]" -#: ftparchive/cachedb.cc:61 +#: methods/connect.cc:79 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "قاعدة البيانات قديمة، محاولة ترقية %s" - -#: ftparchive/cachedb.cc:72 -msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " -"remove and re-create the database." +msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "" -#: ftparchive/cachedb.cc:77 +#: methods/connect.cc:85 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "تعذر فتح ملف قاعدة البيانات %s: %s" - -#: ftparchive/cachedb.cc:238 -msgid "Archive has no control record" -msgstr "" - -#: ftparchive/cachedb.cc:444 -msgid "Unable to get a cursor" -msgstr "" +msgid "Cannot initiate the connection to %s:%s (%s)." +msgstr "تعذر تمهيد الاتصال بـ%s:%s (%s)." -#: ftparchive/writer.cc:76 +#: methods/connect.cc:92 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "W: تعذرت قراءة الدليل %s\n" +msgid "Could not connect to %s:%s (%s), connection timed out" +msgstr "تعذر الاتصال بـ%s:%s (%s)، انتهى وقت الاتصال" -#: ftparchive/writer.cc:81 +#: methods/connect.cc:107 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "" - -#: ftparchive/writer.cc:132 -msgid "E: " -msgstr "E: " +msgid "Could not connect to %s:%s (%s)." +msgstr "تعذر الاتصال بـ%s:%s (%s)." -#: ftparchive/writer.cc:134 -msgid "W: " -msgstr "W: " +#. We say this mainly because the pause here is for the +#. ssh connection that is still going +#: methods/connect.cc:135 methods/rsh.cc:425 +#, c-format +msgid "Connecting to %s" +msgstr "الاتصال بـ%s" -#: ftparchive/writer.cc:141 -msgid "E: Errors apply to file " +#: methods/connect.cc:167 +#, c-format +msgid "Could not resolve '%s'" msgstr "" -#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 +#: methods/connect.cc:173 #, c-format -msgid "Failed to resolve %s" +msgid "Temporary failure resolving '%s'" msgstr "" -#: ftparchive/writer.cc:170 -msgid "Tree walking failed" +#: methods/connect.cc:176 +#, c-format +msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "" -#: ftparchive/writer.cc:195 +#: methods/connect.cc:223 #, c-format -msgid "Failed to open %s" -msgstr "فشل فتح %s" +msgid "Unable to connect to %s %s:" +msgstr "تعذر الاتصال بـ%s %s:" -#: ftparchive/writer.cc:254 +#: methods/gpgv.cc:65 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " DeLink %s [%s]\n" +msgid "Couldn't access keyring: '%s'" +msgstr "" -#: ftparchive/writer.cc:262 -#, c-format -msgid "Failed to readlink %s" +#: methods/gpgv.cc:101 +msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: ftparchive/writer.cc:266 -#, c-format -msgid "Failed to unlink %s" +#: methods/gpgv.cc:205 +msgid "" +"Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: ftparchive/writer.cc:273 -#, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** فشل ربط %s بـ%s" +#: methods/gpgv.cc:210 +msgid "At least one invalid signature was encountered." +msgstr "" -#: ftparchive/writer.cc:283 +#: methods/gpgv.cc:214 #, c-format -msgid " DeLink limit of %sB hit.\n" +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: ftparchive/writer.cc:387 -msgid "Archive had no package field" +#: methods/gpgv.cc:219 +msgid "Unknown error executing gpgv" msgstr "" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 -#, c-format -msgid " %s has no override entry\n" +#: methods/gpgv.cc:250 +msgid "The following signatures were invalid:\n" msgstr "" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 -#, c-format -msgid " %s maintainer is %s not %s\n" +#: methods/gpgv.cc:257 +msgid "" +"The following signatures couldn't be verified because the public key is not " +"available:\n" msgstr "" -#: ftparchive/writer.cc:620 +#: methods/gzip.cc:64 #, c-format -msgid " %s has no source override entry\n" +msgid "Couldn't open pipe for %s" msgstr "" -#: ftparchive/writer.cc:624 +#: methods/gzip.cc:109 #, c-format -msgid " %s has no binary override entry either\n" +msgid "Read error from %s process" msgstr "" -#: ftparchive/contents.cc:317 +#: methods/http.cc:376 +msgid "Waiting for headers" +msgstr "بانتظار الترويسات" + +#: methods/http.cc:522 #, c-format -msgid "Internal error, could not locate member %s" -msgstr "خطأ داخلي، تعذر العثور على العضو %s" +msgid "Got a single header line over %u chars" +msgstr "" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - فشل تعيين الذاكرة" +#: methods/http.cc:530 +msgid "Bad header line" +msgstr "سطر ترويسة سيء" -#: ftparchive/override.cc:34 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "تعذر فتح %s" +#: methods/http.cc:549 methods/http.cc:556 +msgid "The HTTP server sent an invalid reply header" +msgstr "أرسل خادم http ترويسة ردّ غير صالحة" -#: ftparchive/override.cc:60 ftparchive/override.cc:166 -#, c-format -msgid "Malformed override %s line %lu #1" +#: methods/http.cc:585 +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "أرسل خادم http ترويسة طول محتويات (ِContent-Length) غير صالحة" + +#: methods/http.cc:600 +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "أرسل خادم http ترويسة مدى محتويات (ِContent-Range) غير صالحة" + +#: methods/http.cc:602 +msgid "This HTTP server has broken range support" +msgstr "خادم http له دعم مدى معطوب" + +#: methods/http.cc:626 +msgid "Unknown date format" +msgstr "نسق تاريخ مجهول" + +#: methods/http.cc:773 +msgid "Select failed" +msgstr "فشل التحديد" + +#: methods/http.cc:778 +msgid "Connection timed out" +msgstr "انتهى وقت الاتصال" + +#: methods/http.cc:801 +msgid "Error writing to output file" +msgstr "خطأ في الكتابة إلى ملف المُخرجات" + +#: methods/http.cc:832 +msgid "Error writing to file" +msgstr "خطأ في الكتابة إلى الملف" + +#: methods/http.cc:860 +msgid "Error writing to the file" +msgstr "خطأ في الكتابة إلى الملف" + +#: methods/http.cc:874 +msgid "Error reading from server. Remote end closed connection" +msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآخر الاتصال" + +#: methods/http.cc:876 +msgid "Error reading from server" +msgstr "خطأ في القراءة من الخادم" + +#: methods/http.cc:1106 +msgid "Bad header data" +msgstr "بيانات ترويسة سيئة" + +#: methods/http.cc:1123 methods/http.cc:1178 +msgid "Connection failed" +msgstr "فشل الاتصال" + +#: methods/http.cc:1230 +msgid "Internal error" +msgstr "خطأ داخلي" + +#: apt-pkg/contrib/mmap.cc:80 +msgid "Can't mmap an empty file" msgstr "" -#: ftparchive/override.cc:74 ftparchive/override.cc:178 +#: apt-pkg/contrib/mmap.cc:85 #, c-format -msgid "Malformed override %s line %lu #2" +msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: ftparchive/override.cc:88 ftparchive/override.cc:191 +#: apt-pkg/contrib/strutl.cc:978 #, c-format -msgid "Malformed override %s line %lu #3" -msgstr "" +msgid "Selection %s not found" +msgstr "تعذر العثور على التحديد %s" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 +#: apt-pkg/contrib/configuration.cc:439 #, c-format -msgid "Failed to read the override file %s" -msgstr "" +msgid "Unrecognized type abbreviation: '%c'" +msgstr "اختصار نوع مجهول: '%c'" -#: ftparchive/multicompress.cc:71 +#: apt-pkg/contrib/configuration.cc:497 #, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "" +msgid "Opening configuration file %s" +msgstr "فتح ملف التهيئة %s" + +#: apt-pkg/contrib/configuration.cc:515 +#, fuzzy, c-format +msgid "Line %d too long (max %u)" +msgstr "السطر %d طويل جداً (أقصاه %d)" -#: ftparchive/multicompress.cc:101 +#: apt-pkg/contrib/configuration.cc:611 #, c-format -msgid "Compressed output %s needs a compression set" +msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: ftparchive/multicompress.cc:194 -msgid "Failed to create FILE*" +#: apt-pkg/contrib/configuration.cc:630 +#, c-format +msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: ftparchive/multicompress.cc:197 -msgid "Failed to fork" +#: apt-pkg/contrib/configuration.cc:647 +#, c-format +msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: ftparchive/multicompress.cc:211 -msgid "Compress child" +#: apt-pkg/contrib/configuration.cc:687 +#, c-format +msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: ftparchive/multicompress.cc:234 +#: apt-pkg/contrib/configuration.cc:694 #, c-format -msgid "Internal error, failed to create %s" -msgstr "خطأ داخلي، تعذر إنشاء %s" - -#: ftparchive/multicompress.cc:285 -msgid "Failed to create subprocess IPC" +msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: ftparchive/multicompress.cc:320 -msgid "Failed to exec compressor " +#: apt-pkg/contrib/configuration.cc:698 apt-pkg/contrib/configuration.cc:703 +#, c-format +msgid "Syntax error %s:%u: Included from here" msgstr "" -#: ftparchive/multicompress.cc:359 -msgid "decompressor" +#: apt-pkg/contrib/configuration.cc:707 +#, c-format +msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: ftparchive/multicompress.cc:402 -msgid "IO to subprocess/file failed" +#: apt-pkg/contrib/configuration.cc:741 +#, c-format +msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" -#: ftparchive/multicompress.cc:454 -msgid "Failed to read while computing MD5" -msgstr "" +#: apt-pkg/contrib/progress.cc:153 +#, c-format +msgid "%c%s... Error!" +msgstr "%c%s... خطأ!" -#: ftparchive/multicompress.cc:471 +#: apt-pkg/contrib/progress.cc:155 #, c-format -msgid "Problem unlinking %s" -msgstr "" +msgid "%c%s... Done" +msgstr "%c%s... تمّ" -#: cmdline/apt-get.cc:121 -msgid "Y" -msgstr "Y" +#: apt-pkg/contrib/cmndline.cc:77 +#, c-format +msgid "Command line option '%c' [from %s] is not known." +msgstr "خيار سطر الأمر '%c' [من %s] مجهول." -#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format -msgid "Regex compilation error - %s" -msgstr "" +msgid "Command line option %s is not understood" +msgstr "خيار سطر الأمر %s غير مفهوم" -#: cmdline/apt-get.cc:238 -msgid "The following packages have unmet dependencies:" +#: apt-pkg/contrib/cmndline.cc:124 +#, c-format +msgid "Command line option %s is not boolean" msgstr "" -#: cmdline/apt-get.cc:328 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format -msgid "but %s is installed" -msgstr "إلا أن %s مثبت" +msgid "Option %s requires an argument." +msgstr "الخيار %s يتطلّب مُعطى." -#: cmdline/apt-get.cc:330 +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format -msgid "but %s is to be installed" -msgstr "إلا أنه سيتم تثبيت %s" +msgid "Option %s: Configuration item specification must have an =." +msgstr "" -#: cmdline/apt-get.cc:337 -msgid "but it is not installable" -msgstr "إلا أنه غير قابل للتثبيت" +#: apt-pkg/contrib/cmndline.cc:234 +#, c-format +msgid "Option %s requires an integer argument, not '%s'" +msgstr "" -#: cmdline/apt-get.cc:339 -msgid "but it is a virtual package" -msgstr "إلا أنها حزمة وهمية" +#: apt-pkg/contrib/cmndline.cc:265 +#, c-format +msgid "Option '%s' is too long" +msgstr "الخيار '%s' طويل جداً" -#: cmdline/apt-get.cc:342 -msgid "but it is not installed" -msgstr "إلا أنها غير مثبتة" +#: apt-pkg/contrib/cmndline.cc:298 +#, c-format +msgid "Sense %s is not understood, try true or false." +msgstr "" -#: cmdline/apt-get.cc:342 -msgid "but it is not going to be installed" -msgstr "إلا أنه لن يتم تثبيتها" +#: apt-pkg/contrib/cmndline.cc:348 +#, c-format +msgid "Invalid operation %s" +msgstr "عمليّة غير صالحة %s" -#: cmdline/apt-get.cc:347 -msgid " or" -msgstr " أو" +#: apt-pkg/contrib/cdromutl.cc:52 +#, c-format +msgid "Unable to stat the mount point %s" +msgstr "" -#: cmdline/apt-get.cc:376 -msgid "The following NEW packages will be installed:" -msgstr "سيتم تثبيت الحزم الجديدة التالية:" +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 +#, c-format +msgid "Unable to change to %s" +msgstr "" -#: cmdline/apt-get.cc:402 -msgid "The following packages will be REMOVED:" -msgstr "سيتم إزالة الحزم التالية:" +#: apt-pkg/contrib/cdromutl.cc:187 +msgid "Failed to stat the cdrom" +msgstr "" -#: cmdline/apt-get.cc:424 -msgid "The following packages have been kept back:" -msgstr "سيتم الإبقاء على الحزم التالية:" +#: apt-pkg/contrib/fileutl.cc:147 +#, c-format +msgid "Not using locking for read only lock file %s" +msgstr "" -#: cmdline/apt-get.cc:445 -msgid "The following packages will be upgraded:" -msgstr "ستتم ترقية الحزم التالية:" +#: apt-pkg/contrib/fileutl.cc:152 +#, c-format +msgid "Could not open lock file %s" +msgstr "" -#: cmdline/apt-get.cc:466 -msgid "The following packages will be DOWNGRADED:" -msgstr "سيتم تثبيط الحزم التالية:" +#: apt-pkg/contrib/fileutl.cc:170 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "" -#: cmdline/apt-get.cc:486 -msgid "The following held packages will be changed:" -msgstr "سيتم تغيير الحزم المبقاة التالية:" +#: apt-pkg/contrib/fileutl.cc:174 +#, c-format +msgid "Could not get lock %s" +msgstr "" -#: cmdline/apt-get.cc:539 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format -msgid "%s (due to %s) " -msgstr "%s (بسبب %s) " +msgid "Waited for %s but it wasn't there" +msgstr "" -#: cmdline/apt-get.cc:547 -msgid "" -"WARNING: The following essential packages will be removed.\n" -"This should NOT be done unless you know exactly what you are doing!" +#: apt-pkg/contrib/fileutl.cc:452 +#, c-format +msgid "Sub-process %s received a segmentation fault." msgstr "" -"تحذير: ستتم إزالة الحزم الأساسية التالية.\n" -"لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!" -#: cmdline/apt-get.cc:578 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format -msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً، " +msgid "Sub-process %s returned an error code (%u)" +msgstr "" -#: cmdline/apt-get.cc:582 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format -msgid "%lu reinstalled, " -msgstr "%lu أعيد تثبيتها، " +msgid "Sub-process %s exited unexpectedly" +msgstr "" -#: cmdline/apt-get.cc:584 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format -msgid "%lu downgraded, " -msgstr "%lu مثبطة، " +msgid "Could not open file %s" +msgstr "" -#: cmdline/apt-get.cc:586 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format -msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n" +msgid "read, still have %lu to read but none left" +msgstr "" -#: cmdline/apt-get.cc:590 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format -msgid "%lu not fully installed or removed.\n" -msgstr "%lu غير مثبتة بالكامل أو مزالة.\n" +msgid "write, still have %lu to write but couldn't" +msgstr "" -#: cmdline/apt-get.cc:664 -msgid "Correcting dependencies..." -msgstr "تصحيح المعتمدات..." +#: apt-pkg/contrib/fileutl.cc:662 +msgid "Problem closing the file" +msgstr "مشكلة في إغلاق الملف" -#: cmdline/apt-get.cc:667 -msgid " failed." -msgstr " فشل." +#: apt-pkg/contrib/fileutl.cc:668 +msgid "Problem unlinking the file" +msgstr "" -#: cmdline/apt-get.cc:670 -msgid "Unable to correct dependencies" -msgstr "لم يمكن تصحيح المعتمدات" +#: apt-pkg/contrib/fileutl.cc:679 +msgid "Problem syncing the file" +msgstr "مشكلة في مزامنة الملف" -#: cmdline/apt-get.cc:673 -msgid "Unable to minimize the upgrade set" -msgstr "لم يمكن تقليص مجموعة الترقية" +#: apt-pkg/pkgcache.cc:132 +msgid "Empty package cache" +msgstr "" -#: cmdline/apt-get.cc:675 -msgid " Done" -msgstr " تم" +#: apt-pkg/pkgcache.cc:138 +msgid "The package cache file is corrupted" +msgstr "" -#: cmdline/apt-get.cc:679 -msgid "You might want to run `apt-get -f install' to correct these." -msgstr "قد ترغب بتنفيذ الأمر `apt-get -f install' لتصحيح هذه." +#: apt-pkg/pkgcache.cc:143 +msgid "The package cache file is an incompatible version" +msgstr "" -#: cmdline/apt-get.cc:682 -msgid "Unmet dependencies. Try using -f." -msgstr "مُعتمدات غير مستوفاة. حاول استخدام -f." +#: apt-pkg/pkgcache.cc:148 +#, c-format +msgid "This APT does not support the versioning system '%s'" +msgstr "" -#: cmdline/apt-get.cc:704 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "تحذير: تعذرت المصادقة على الحزم التالية!" +#: apt-pkg/pkgcache.cc:153 +msgid "The package cache was built for a different architecture" +msgstr "" -#: cmdline/apt-get.cc:708 -msgid "Authentication warning overridden.\n" -msgstr "تم غض النظر عن تحذير المصادقة.\n" +#: apt-pkg/pkgcache.cc:224 +msgid "Depends" +msgstr "يعتمد" -#: cmdline/apt-get.cc:715 -msgid "Install these packages without verification [y/N]? " -msgstr "تثبيت هذه الحزم دون التحقق منها [y/N]؟ " +#: apt-pkg/pkgcache.cc:224 +msgid "PreDepends" +msgstr "يعتمد مسبقاً" -#: cmdline/apt-get.cc:717 -msgid "Some packages could not be authenticated" -msgstr "تعذرت المصادقة على بعض الحزم" +#: apt-pkg/pkgcache.cc:224 +msgid "Suggests" +msgstr "يستحسن" -#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 -msgid "There are problems and -y was used without --force-yes" -msgstr "هناك مشاكل وتم استخدام -y دون --force-yes" +#: apt-pkg/pkgcache.cc:225 +msgid "Recommends" +msgstr "يقترح" -#: cmdline/apt-get.cc:770 -msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "خطأ داخلي، تم طلب InstallPackages مع وجود حزم معطوبة!" +#: apt-pkg/pkgcache.cc:225 +msgid "Conflicts" +msgstr "يعارض" -#: cmdline/apt-get.cc:779 -msgid "Packages need to be removed but remove is disabled." -msgstr "حزم بحاجة للإزالة لكن الإزالة مُعطّلة." +#: apt-pkg/pkgcache.cc:225 +msgid "Replaces" +msgstr "يستبدل" -#: cmdline/apt-get.cc:790 -msgid "Internal error, Ordering didn't finish" -msgstr "خطأ داخلي، لم تنته عملية الترتيب" +#: apt-pkg/pkgcache.cc:226 +msgid "Obsoletes" +msgstr "يُلغي" -#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2012 cmdline/apt-get.cc:2045 -msgid "Unable to lock the download directory" -msgstr "تعذر قَفْل دليل التنزيل" +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" -#: cmdline/apt-get.cc:831 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "يا للغرابة.. لم تتطابق الأحجام، الرجاء مراسلة apt@packages.debian.org" +#: apt-pkg/pkgcache.cc:237 +msgid "important" +msgstr "مهم" -#: cmdline/apt-get.cc:836 -#, c-format -msgid "Need to get %sB/%sB of archives.\n" -msgstr "بحاجة إلى جلب %sب/%sب من الأرشيف.\n" +#: apt-pkg/pkgcache.cc:237 +msgid "required" +msgstr "مطلوب" -#: cmdline/apt-get.cc:839 -#, c-format -msgid "Need to get %sB of archives.\n" -msgstr "بحاجة إلى جلب %sب من الأرشيف.\n" +#: apt-pkg/pkgcache.cc:237 +msgid "standard" +msgstr "قياسي" -#: cmdline/apt-get.cc:844 -#, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "بعد الاستخراج %sب من المساحة الإضافيّة سيتمّ استخدامها.\n" +#: apt-pkg/pkgcache.cc:238 +msgid "optional" +msgstr "اختياري" -#: cmdline/apt-get.cc:847 -#, c-format -msgid "After unpacking %sB disk space will be freed.\n" -msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n" +#: apt-pkg/pkgcache.cc:238 +msgid "extra" +msgstr "إضافي" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2188 -#, c-format -msgid "Couldn't determine free space in %s" -msgstr "تعذر حساب المساحة الحرة في %s" +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 +msgid "Building dependency tree" +msgstr "" -#: cmdline/apt-get.cc:864 -#, c-format -msgid "You don't have enough free space in %s." -msgstr "ليس هناك مساحة كافية في %s." +#: apt-pkg/depcache.cc:122 +msgid "Candidate versions" +msgstr "" -#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 -msgid "Trivial Only specified but this is not a trivial operation." +#: apt-pkg/depcache.cc:151 +msgid "Dependency generation" msgstr "" -#: cmdline/apt-get.cc:881 -msgid "Yes, do as I say!" -msgstr "نعم، افعل ما أقوله!" +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +#, fuzzy +msgid "Reading state information" +msgstr "دمج المعلومات المتوفرة" + +#: apt-pkg/depcache.cc:219 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "فشل فتح %s" -#: cmdline/apt-get.cc:883 +#: apt-pkg/depcache.cc:225 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "فشلت كتابة الملف %s" + +#: apt-pkg/tagfile.cc:102 #, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " +msgid "Unable to parse package file %s (1)" msgstr "" -"أنت على وشك أن تقوم بشيء ضارّ جداً\n" -"كي تستمر اكتب العبارة '%s'\n" -" ؟] " -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 -msgid "Abort." -msgstr "إجهاض." +#: apt-pkg/tagfile.cc:189 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "" -#: cmdline/apt-get.cc:904 -msgid "Do you want to continue [Y/n]? " -msgstr "هل تريد الاستمرار [Y/n]؟" +#: apt-pkg/sourcelist.cc:90 +#, c-format +msgid "Malformed line %lu in source list %s (URI)" +msgstr "" -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2231 +#: apt-pkg/sourcelist.cc:92 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "فشل إحضار %s %s\n" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "" -#: cmdline/apt-get.cc:994 -msgid "Some files failed to download" -msgstr "فشل تنزيل بعض الملفات" +#: apt-pkg/sourcelist.cc:95 +#, c-format +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "" -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2240 -msgid "Download complete and in download only mode" -msgstr "اكتمل التنزيل وفي وضع التنزيل فقط" +#: apt-pkg/sourcelist.cc:101 +#, c-format +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "" -#: cmdline/apt-get.cc:1001 -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" +#: apt-pkg/sourcelist.cc:108 +#, c-format +msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -"تعذر إحضار بعض الأرشيف، ربما يمكنك محاولة تنفيذ apt-get update أو إضافة --" -"fix-missing؟" -#: cmdline/apt-get.cc:1005 -msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing وتبديل الأوساط غير مدعومة حالياً" +#: apt-pkg/sourcelist.cc:199 +#, c-format +msgid "Opening %s" +msgstr "فتح %s" -#: cmdline/apt-get.cc:1010 -msgid "Unable to correct missing packages." -msgstr "تعذر تصحيح الحزم المفقودة." +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 +#, c-format +msgid "Line %u too long in source list %s." +msgstr "" -#: cmdline/apt-get.cc:1011 -msgid "Aborting install." -msgstr "إجهاض التثبيت." +#: apt-pkg/sourcelist.cc:236 +#, c-format +msgid "Malformed line %u in source list %s (type)" +msgstr "" + +#: apt-pkg/sourcelist.cc:240 +#, c-format +msgid "Type '%s' is not known on line %u in source list %s" +msgstr "" -#: cmdline/apt-get.cc:1045 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format -msgid "Note, selecting %s instead of %s\n" -msgstr "لاحظ، تحديد %s بدلاً من %s\n" +msgid "Malformed line %u in source list %s (vendor id)" +msgstr "" -#: cmdline/apt-get.cc:1055 +#: apt-pkg/packagemanager.cc:428 #, c-format -msgid "Skipping %s, it is already installed and upgrade is not set.\n" -msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n" +msgid "" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." +msgstr "" -#: cmdline/apt-get.cc:1073 +#: apt-pkg/pkgrecords.cc:32 #, c-format -msgid "Package %s is not installed, so not removed\n" -msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n" +msgid "Index file type '%s' is not supported" +msgstr "" -#: cmdline/apt-get.cc:1084 +#: apt-pkg/algorithms.cc:247 #, c-format -msgid "Package %s is a virtual package provided by:\n" -msgstr "الحزمة %s وهميّة وتوفّرها:\n" +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" -#: cmdline/apt-get.cc:1096 -msgid " [Installed]" -msgstr " [مُثبّتة]" +#: apt-pkg/algorithms.cc:1105 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" -#: cmdline/apt-get.cc:1101 -msgid "You should explicitly select one to install." -msgstr "يجب اختيار واحدة بالتحديد لتثبيتها." +#: apt-pkg/algorithms.cc:1107 +msgid "Unable to correct problems, you have held broken packages." +msgstr "" -#: cmdline/apt-get.cc:1106 -#, c-format +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 msgid "" -"Package %s is not available, but is referred to by another package.\n" -"This may mean that the package is missing, has been obsoleted, or\n" -"is only available from another source\n" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." msgstr "" -#: cmdline/apt-get.cc:1125 -msgid "However the following packages replace it:" -msgstr "على أيّ فإن الحزم التالية تحلّ مكانها:" +#: apt-pkg/acquire.cc:59 +#, c-format +msgid "Lists directory %spartial is missing." +msgstr "" -#: cmdline/apt-get.cc:1128 +#: apt-pkg/acquire.cc:63 #, c-format -msgid "Package %s has no installation candidate" -msgstr "الحزمة %s ليس لها مرشح تثبيت" +msgid "Archive directory %spartial is missing." +msgstr "" -#: cmdline/apt-get.cc:1148 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:827 #, c-format -msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "إعادة تثبيت %s غير ممكنة، حيث أنّه لا يمكن تنزيلها.\n" +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "" -#: cmdline/apt-get.cc:1156 +#: apt-pkg/acquire.cc:829 #, c-format -msgid "%s is already the newest version.\n" -msgstr "%s هي النسخة الأحدث.\n" +msgid "Retrieving file %li of %li" +msgstr "" -#: cmdline/apt-get.cc:1185 +#: apt-pkg/acquire-worker.cc:110 #, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'" +msgid "The method driver %s could not be found." +msgstr "" -#: cmdline/apt-get.cc:1187 +#: apt-pkg/acquire-worker.cc:159 #, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'" +msgid "Method %s did not start correctly" +msgstr "" -#: cmdline/apt-get.cc:1193 +#: apt-pkg/acquire-worker.cc:399 #, c-format -msgid "Selected version %s (%s) for %s\n" -msgstr "النسخة المحددة %s (%s) للإصدارة %s\n" +msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." +msgstr "الرجاء إدخال القرص المُسمّى '%s' في السوّاقة '%s' وضغط مفتاح الإدخال." -#: cmdline/apt-get.cc:1330 -msgid "The update command takes no arguments" -msgstr "لا يقبل الأمر update أية مُعطيات" +#: apt-pkg/init.cc:125 +#, c-format +msgid "Packaging system '%s' is not supported" +msgstr "نظام الحزم '%s' غير مدعوم" -#: cmdline/apt-get.cc:1343 -msgid "Unable to lock the list directory" -msgstr "تعذر قفل دليل القائمة" +#: apt-pkg/init.cc:141 +msgid "Unable to determine a suitable packaging system type" +msgstr "" -#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +#: apt-pkg/clean.cc:57 +#, c-format +msgid "Unable to stat %s." msgstr "" -#: cmdline/apt-get.cc:1433 -msgid "We are not supposed to delete stuff, can't start AutoRemover" +#: apt-pkg/srcrecords.cc:44 +msgid "You must put some 'source' URIs in your sources.list" msgstr "" -#: cmdline/apt-get.cc:1465 -#, fuzzy -#| msgid "The following NEW packages will be installed:" -msgid "" -"The following packages were automatically installed and are no longer " -"required:" -msgstr "سيتم تثبيت الحزم الجديدة التالية:" +#: apt-pkg/cachefile.cc:71 +msgid "The package lists or status file could not be parsed or opened." +msgstr "" -#: cmdline/apt-get.cc:1467 -msgid "Use 'apt-get autoremove' to remove them." +#: apt-pkg/cachefile.cc:75 +msgid "You may want to run apt-get update to correct these problems" +msgstr "قد يساعدك تنفيذ الأمر apt-get update في تصحيح هذه المشاكل" + +#: apt-pkg/policy.cc:267 +msgid "Invalid record in the preferences file, no Package header" msgstr "" -#: cmdline/apt-get.cc:1472 -msgid "" -"Hmm, seems like the AutoRemover destroyed something which really\n" -"shouldn't happen. Please file a bug report against apt." +#: apt-pkg/policy.cc:289 +#, c-format +msgid "Did not understand pin type %s" msgstr "" -#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1755 -msgid "The following information may help to resolve the situation:" -msgstr "قد تساعد المعلومات التالية في حل المشكلة:" +#: apt-pkg/policy.cc:297 +msgid "No priority (or zero) specified for pin" +msgstr "" -#: cmdline/apt-get.cc:1479 -#, fuzzy -#| msgid "Internal error, AllUpgrade broke stuff" -msgid "Internal Error, AutoRemover broke stuff" -msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء" +#: apt-pkg/pkgcachegen.cc:72 +msgid "Cache has an incompatible versioning system" +msgstr "" -#: cmdline/apt-get.cc:1498 -msgid "Internal error, AllUpgrade broke stuff" -msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء" +#: apt-pkg/pkgcachegen.cc:115 +#, c-format +msgid "Error occurred while processing %s (NewPackage)" +msgstr "حدث خطأ أثناء معالجة %s (NewPackage)" + +#: apt-pkg/pkgcachegen.cc:130 +#, c-format +msgid "Error occurred while processing %s (UsePackage1)" +msgstr "حدث خطأ أثناء معالجة %s (UserPackage1)" -#: cmdline/apt-get.cc:1545 +#: apt-pkg/pkgcachegen.cc:153 #, fuzzy, c-format -#| msgid "Couldn't find package %s" -msgid "Couldn't find task %s" -msgstr "تعذر العثور على الحزمة %s" +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)" -#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696 +#: apt-pkg/pkgcachegen.cc:178 #, c-format -msgid "Couldn't find package %s" -msgstr "تعذر العثور على الحزمة %s" +msgid "Error occurred while processing %s (UsePackage2)" +msgstr "حدث خطأ أثناء معالجة %s (UserPackage2)" -#: cmdline/apt-get.cc:1683 +#: apt-pkg/pkgcachegen.cc:182 #, c-format -msgid "Note, selecting %s for regex '%s'\n" -msgstr "لاحظ، تحديد %s بسبب صيغة regex '%s'\n" +msgid "Error occurred while processing %s (NewFileVer1)" +msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)" -#: cmdline/apt-get.cc:1714 -#, fuzzy, c-format -#| msgid "but %s is to be installed" -msgid "%s set to manual installed.\n" -msgstr "إلا أنه سيتم تثبيت %s" +#: apt-pkg/pkgcachegen.cc:213 +#, c-format +msgid "Error occurred while processing %s (NewVersion1)" +msgstr "حدث خطأ أثناء معالجة %s (NewVersion1)" -#: cmdline/apt-get.cc:1727 -msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "قد ترغب بتشغيل `apt-get -f install' لتصحيح هذه:" +#: apt-pkg/pkgcachegen.cc:217 +#, c-format +msgid "Error occurred while processing %s (UsePackage3)" +msgstr "حدث خطأ أثناء معالجة %s (UsePackage3)" -#: cmdline/apt-get.cc:1730 -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." +#: apt-pkg/pkgcachegen.cc:221 +#, c-format +msgid "Error occurred while processing %s (NewVersion2)" +msgstr "حدث خطأ أثناء معالجة %s (NewVersion2)" + +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:251 +msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -"مُعتمدات غير مستوفاة. جرب 'apt-get -f install' بدون أسماء حزم (أو حدّد حلاً)." -#: cmdline/apt-get.cc:1742 -msgid "" -"Some packages could not be installed. This may mean that you have\n" -"requested an impossible situation or if you are using the unstable\n" -"distribution that some required packages have not yet been created\n" -"or been moved out of Incoming." +#: apt-pkg/pkgcachegen.cc:254 +msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: cmdline/apt-get.cc:1750 -msgid "" -"Since you only requested a single operation it is extremely likely that\n" -"the package is simply not installable and a bug report against\n" -"that package should be filed." +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" -#: cmdline/apt-get.cc:1758 -msgid "Broken packages" -msgstr "حزم معطوبة" +#: apt-pkg/pkgcachegen.cc:260 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "" -#: cmdline/apt-get.cc:1787 -msgid "The following extra packages will be installed:" -msgstr "سيتم تثبيت الحزم الإضافيّة التالية:" +#: apt-pkg/pkgcachegen.cc:288 +#, c-format +msgid "Error occurred while processing %s (FindPkg)" +msgstr "" -#: cmdline/apt-get.cc:1876 -msgid "Suggested packages:" -msgstr "الحزم المقترحة:" +#: apt-pkg/pkgcachegen.cc:301 +#, c-format +msgid "Error occurred while processing %s (CollectFileProvides)" +msgstr "" -#: cmdline/apt-get.cc:1877 -msgid "Recommended packages:" -msgstr "الحزم المستحسنة:" +#: apt-pkg/pkgcachegen.cc:307 +#, c-format +msgid "Package %s %s was not found while processing file dependencies" +msgstr "" -#: cmdline/apt-get.cc:1905 -msgid "Calculating upgrade... " -msgstr "حساب الترقية..." +#: apt-pkg/pkgcachegen.cc:678 +#, c-format +msgid "Couldn't stat source package list %s" +msgstr "" -#: cmdline/apt-get.cc:1913 -msgid "Done" -msgstr "تمّ" +#: apt-pkg/pkgcachegen.cc:763 +msgid "Collecting File Provides" +msgstr "" -#: cmdline/apt-get.cc:1980 cmdline/apt-get.cc:1988 -msgid "Internal error, problem resolver broke stuff" +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 +msgid "IO Error saving source cache" msgstr "" -#: cmdline/apt-get.cc:2088 -msgid "Must specify at least one package to fetch source for" -msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها" +#: apt-pkg/acquire-item.cc:134 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "فشل إعادة التسمية ، %s (%s -> %s)." + +#: apt-pkg/acquire-item.cc:451 +msgid "MD5Sum mismatch" +msgstr "MD5Sum غير متطابقة" + +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 +#, fuzzy +msgid "Hash Sum mismatch" +msgstr "MD5Sum غير متطابقة" + +#: apt-pkg/acquire-item.cc:1150 +msgid "There is no public key available for the following key IDs:\n" +msgstr "" -#: cmdline/apt-get.cc:2118 cmdline/apt-get.cc:2352 +#: apt-pkg/acquire-item.cc:1264 #, c-format -msgid "Unable to find a source package for %s" -msgstr "تعذر العثور على مصدر الحزمة %s" +msgid "" +"I wasn't able to locate a file for the %s package. This might mean you need " +"to manually fix this package. (due to missing arch)" +msgstr "" -#: cmdline/apt-get.cc:2167 +#: apt-pkg/acquire-item.cc:1323 #, c-format -msgid "Skipping already downloaded file '%s'\n" -msgstr "تخطي الملف '%s' المنزل مسبقاً\n" +msgid "" +"I wasn't able to locate file for the %s package. This might mean you need to " +"manually fix this package." +msgstr "" -#: cmdline/apt-get.cc:2191 +#: apt-pkg/acquire-item.cc:1364 #, c-format -msgid "You don't have enough free space in %s" -msgstr "ليس هناك مساحة كافية في %s" +msgid "" +"The package index files are corrupted. No Filename: field for package %s." +msgstr "" -#: cmdline/apt-get.cc:2196 -#, c-format -msgid "Need to get %sB/%sB of source archives.\n" -msgstr "يجب جلب %sب/%sب من الأرشيفات المصدرية.\n" +#: apt-pkg/acquire-item.cc:1451 +msgid "Size mismatch" +msgstr "الحجم غير متطابق" -#: cmdline/apt-get.cc:2199 +#: apt-pkg/vendorlist.cc:66 #, c-format -msgid "Need to get %sB of source archives.\n" -msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n" +msgid "Vendor block %s contains no fingerprint" +msgstr "" -#: cmdline/apt-get.cc:2205 +#: apt-pkg/cdrom.cc:529 #, c-format -msgid "Fetch source %s\n" -msgstr "إحضار المصدر %s\n" +msgid "" +"Using CD-ROM mount point %s\n" +"Mounting CD-ROM\n" +msgstr "" -#: cmdline/apt-get.cc:2236 -msgid "Failed to fetch some archives." -msgstr "فشل إحضار بعض الأرشيفات." +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 +msgid "Identifying.. " +msgstr "جاري التعرف..." -#: cmdline/apt-get.cc:2264 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Skipping unpack of already unpacked source in %s\n" +msgid "Stored label: %s\n" msgstr "" -#: cmdline/apt-get.cc:2276 -#, c-format -msgid "Unpack command '%s' failed.\n" -msgstr "أمر فك الحزمة '%s' فشل.\n" +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "فك تركيب القرص المدمج..." -#: cmdline/apt-get.cc:2277 +#: apt-pkg/cdrom.cc:590 #, c-format -msgid "Check if the 'dpkg-dev' package is installed.\n" +msgid "Using CD-ROM mount point %s\n" msgstr "" -#: cmdline/apt-get.cc:2294 -#, c-format -msgid "Build command '%s' failed.\n" -msgstr "أمر البناء '%s' فشل.\n" +#: apt-pkg/cdrom.cc:608 +msgid "Unmounting CD-ROM\n" +msgstr "فك تركيب القرص المدمج\n" -#: cmdline/apt-get.cc:2313 -msgid "Child process failed" -msgstr "" +#: apt-pkg/cdrom.cc:612 +msgid "Waiting for disc...\n" +msgstr "بانتظار القرص...\n" -#: cmdline/apt-get.cc:2329 -msgid "Must specify at least one package to check builddeps for" -msgstr "" +#. Mount the new CDROM +#: apt-pkg/cdrom.cc:620 +msgid "Mounting CD-ROM...\n" +msgstr "تركيب القرص...\n" -#: cmdline/apt-get.cc:2357 -#, c-format -msgid "Unable to get build-dependency information for %s" +#: apt-pkg/cdrom.cc:638 +msgid "Scanning disc for index files..\n" msgstr "" -#: cmdline/apt-get.cc:2377 +#: apt-pkg/cdrom.cc:678 #, c-format -msgid "%s has no build depends.\n" +msgid "" +"Found %u package indexes, %u source indexes, %u translation indexes and %u " +"signatures\n" msgstr "" -#: cmdline/apt-get.cc:2429 +#: apt-pkg/cdrom.cc:715 #, c-format -msgid "" -"%s dependency for %s cannot be satisfied because the package %s cannot be " -"found" +msgid "Found label '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2482 +#: apt-pkg/cdrom.cc:744 +msgid "That is not a valid name, try again.\n" +msgstr "هذا الاسم غير صالح، حاول مجدداً.\n" + +#: apt-pkg/cdrom.cc:760 #, c-format msgid "" -"%s dependency for %s cannot be satisfied because no available versions of " -"package %s can satisfy version requirements" +"This disc is called: \n" +"'%s'\n" msgstr "" +"هذا القرص مسمى: \n" +"'%s'\n" -#: cmdline/apt-get.cc:2518 -#, c-format -msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" +#: apt-pkg/cdrom.cc:764 +msgid "Copying package lists..." +msgstr "نسخ قوائم الحزم..." + +#: apt-pkg/cdrom.cc:790 +msgid "Writing new source list\n" +msgstr "كتابة لائحة المصادر الجديدة\n" + +#: apt-pkg/cdrom.cc:799 +msgid "Source list entries for this disc are:\n" msgstr "" -#: cmdline/apt-get.cc:2543 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format -msgid "Failed to satisfy %s dependency for %s: %s" +msgid "Wrote %i records.\n" msgstr "" -#: cmdline/apt-get.cc:2557 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format -msgid "Build-dependencies for %s could not be satisfied." +msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: cmdline/apt-get.cc:2561 -msgid "Failed to process build dependencies" +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: cmdline/apt-get.cc:2593 -msgid "Supported modules:" -msgstr "الوحدات المدعومة:" - -#: cmdline/apt-get.cc:2634 -msgid "" -"Usage: apt-get [options] command\n" -" apt-get [options] install|remove pkg1 [pkg2 ...]\n" -" apt-get [options] source pkg1 [pkg2 ...]\n" -"\n" -"apt-get is a simple command line interface for downloading and\n" -"installing packages. The most frequently used commands are update\n" -"and install.\n" -"\n" -"Commands:\n" -" update - Retrieve new lists of packages\n" -" upgrade - Perform an upgrade\n" -" install - Install new packages (pkg is libc6 not libc6.deb)\n" -" remove - Remove packages\n" -" autoremove - Remove all automatic unused packages\n" -" purge - Remove and purge packages\n" -" source - Download source archives\n" -" build-dep - Configure build-dependencies for source packages\n" -" dist-upgrade - Distribution upgrade, see apt-get(8)\n" -" dselect-upgrade - Follow dselect selections\n" -" clean - Erase downloaded archive files\n" -" autoclean - Erase old downloaded archive files\n" -" check - Verify that there are no broken dependencies\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -qq No output except for errors\n" -" -d Download only - do NOT install or unpack archives\n" -" -s No-act. Perform ordering simulation\n" -" -y Assume Yes to all queries and do not prompt\n" -" -f Attempt to continue if the integrity check fails\n" -" -m Attempt to continue if archives are unlocatable\n" -" -u Show a list of upgraded packages as well\n" -" -b Build the source package after fetching it\n" -" -V Show verbose version numbers\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n" -"pages for more information and options.\n" -" This APT has Super Cow Powers.\n" +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831 +#, c-format +msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: cmdline/acqprogress.cc:55 -msgid "Hit " +#: apt-pkg/deb/dpkgpm.cc:454 +#, c-format +msgid "Directory '%s' missing" msgstr "" -#: cmdline/acqprogress.cc:79 -msgid "Get:" -msgstr "جلب:" - -#: cmdline/acqprogress.cc:110 -msgid "Ign " -msgstr "تجاهل" +#: apt-pkg/deb/dpkgpm.cc:537 +#, c-format +msgid "Preparing %s" +msgstr "تحضير %s" -#: cmdline/acqprogress.cc:114 -msgid "Err " -msgstr "خطأ" +#: apt-pkg/deb/dpkgpm.cc:538 +#, c-format +msgid "Unpacking %s" +msgstr "فتح %s" -#: cmdline/acqprogress.cc:135 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "جلب %sب في %s (%sب/ث)\n" +msgid "Preparing to configure %s" +msgstr "التحضير لتهيئة %s" -#: cmdline/acqprogress.cc:225 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format -msgid " [Working]" -msgstr " [يعمل]" +msgid "Configuring %s" +msgstr "تهيئة %s" -#: cmdline/acqprogress.cc:271 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 +#, fuzzy, c-format +msgid "Processing triggers for %s" +msgstr "خطأ في معالجة الدليل %s" + +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"تغيير الوسط: الرجاء إدخال القرص المُسمّى\n" -" '%s'\n" -"في السوّاقة '%s' وضغط مفتاح الإدخال\n" +msgid "Installed %s" +msgstr "تم تثبيت %s" -#: cmdline/apt-sortpkgs.cc:86 -msgid "Unknown package record!" -msgstr "سجل حزمة مجهول!" +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 +#, c-format +msgid "Preparing for removal of %s" +msgstr "التحضير لإزالة %s" -#: cmdline/apt-sortpkgs.cc:150 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" +#: apt-pkg/deb/dpkgpm.cc:559 +#, c-format +msgid "Removing %s" +msgstr "إزالة %s" -#: dselect/install:32 -msgid "Bad default setting!" -msgstr "إعداد افتراضيّ سيّء!" +#: apt-pkg/deb/dpkgpm.cc:560 +#, c-format +msgid "Removed %s" +msgstr "تم إزالة %s" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 -msgid "Press enter to continue." -msgstr "اضغط مفتاح الإدخال للاستمرار." +#: apt-pkg/deb/dpkgpm.cc:565 +#, c-format +msgid "Preparing to completely remove %s" +msgstr "التحضير لإزالة %s بالكامل" -#: dselect/install:100 -msgid "Some errors occurred while unpacking. I'm going to configure the" -msgstr "حدثت بعض الأخطاء أثناء فك الحزمة. سأقوم بتهيئة " +#: apt-pkg/deb/dpkgpm.cc:566 +#, c-format +msgid "Completely removed %s" +msgstr "تمت إزالة %s بالكامل" -#: dselect/install:101 -msgid "packages that were installed. This may result in duplicate errors" -msgstr "الحزم التي تم تثبيتها. قد يتسبب هذا بظهر أخطاء متكررة" +#: apt-pkg/deb/dpkgpm.cc:716 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "" -#: dselect/install:102 -msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "أو أخطاء سبّبتها المُعتمدات المفقودة. لا بأس بهذا، فقط الأخطاء" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" -#: dselect/install:103 -msgid "" -"above this message are important. Please fix them and run [I]nstall again" -msgstr "أعلى هذه الرسالة مهمّة. الرجاء تصحيحها وتشغيل التثبيت مجدداً" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "" -#: dselect/update:30 -msgid "Merging available information" -msgstr "دمج المعلومات المتوفرة" +#: methods/rsh.cc:330 +msgid "Connection closed prematurely" +msgstr "" #~ msgid "File date has changed %s" #~ msgstr "تغير تاريخ الملف %s" diff --git a/po/bg.po b/po/bg.po index 560e2688b..55e96ae34 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2006-10-12 20:14+0300\n" "Last-Translator: Yavor Doganov \n" "Language-Team: Bulgarian \n" @@ -160,7 +160,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s за %s %s, компилиран на %s %s\n" @@ -664,7 +664,7 @@ msgstr "Неуспех при преименуването на %s на %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "Грешка при компилирането на регулярния израз - %s" @@ -827,12 +827,12 @@ msgstr "Трябва да бъдат премахнати пакети, но п msgid "Internal error, Ordering didn't finish" msgstr "Вътрешна грешка, „Ordering“ не завърши" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "Неуспех при заключването на директорията за изтегляне" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Списъкът с източници не можа да бъде прочетен." @@ -861,7 +861,7 @@ msgstr "След разпакетирането ще бъде използван msgid "After this operation, %sB disk space will be freed.\n" msgstr "След разпакетирането ще бъде освободено %sB дисково пространство.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "Неуспех при определянето на свободното пространство в %s" @@ -898,7 +898,7 @@ msgstr "Прекъсване." msgid "Do you want to continue [Y/n]? " msgstr "Искате ли да продължите [Y/n]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Неуспех при изтеглянето на %s %s\n" @@ -907,7 +907,7 @@ msgstr "Неуспех при изтеглянето на %s %s\n" msgid "Some files failed to download" msgstr "Някои файлове не можаха да бъдат изтеглени" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "Изтеглянето завърши в режим само на изтегляне" @@ -1012,74 +1012,66 @@ msgstr "Командата „update“ не възприема аргумент msgid "Unable to lock the list directory" msgstr "Неуспех при заключването на директорията със списъка на пакетите" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"Някои индексни файлове не можаха да бъдат изтеглени, те са пренебрегнати или " -"са използвани по-стари." - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Следните НОВИ пакети ще бъдат инсталирани:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "" "Следната информация може да помогне за намиране на изход от ситуацията:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Неуспех при намирането на пакет %s" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "Неуспех при намирането на пакет %s" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Забележете, избиране на %s за регулярен израз „%s“\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "но ще бъде инсталиран %s" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1087,7 +1079,7 @@ msgstr "" "Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или " "укажете разрешение)." -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1099,7 +1091,7 @@ msgstr "" "дистрибуция, че някои необходими пакети още не са създадени или пък\n" "са били преместени от Incoming." -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1109,118 +1101,133 @@ msgstr "" "да не може да бъде инсталиран; в такъв случай би трябвало да се подаде\n" "доклад за грешка за този пакет." -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "Счупени пакети" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "Следните допълнителни пакети ще бъдат инсталирани:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "Предложени пакети:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "Препоръчвани пакети:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "Изчисляване на актуализацията..." -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Неуспех" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "Готово" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "Неуспех при намирането на изходен код на пакет %s" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускане на вече изтегления файл „%s“\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "Нямате достатъчно свободно пространство в %s" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "Изтегляне на изходен код %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "Неуспех при изтеглянето на някои архиви." -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Командата за разпакетиране „%s“ пропадна.\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "Командата за компилиране „%s“ пропадна.\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "Процесът-потомък пропадна" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "" "Трябва да укажете поне един пакет за проверка на зависимости за компилиране" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Неуспех при получаването на информация за зависимостите за компилиране на %s" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s няма зависимости за компилиране.\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1229,7 +1236,7 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s " "не може да бъде намерен" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1239,32 +1246,32 @@ msgstr "" "налични версии на пакета %s, които могат да удовлетворят изискването за " "версия" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният " "пакет %s е твърде нов" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени." -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "Неуспех при обработката на зависимостите за компилиране" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "Поддържани модули:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1577,7 +1584,7 @@ msgstr "Файл %s/%s заменя този в пакет %s" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "Неуспех при четенето на %s" @@ -1810,7 +1817,7 @@ msgstr "Допустимото време за свързването изтеч msgid "Server closed the connection" msgstr "Сървърът разпадна връзката" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "Грешка при четене" @@ -1822,7 +1829,7 @@ msgstr "Отговорът препълни буфера." msgid "Protocol corruption" msgstr "Развален протокол" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "Грешка при запис" @@ -1878,7 +1885,7 @@ msgstr "Времето за установяване на връзка с гне msgid "Unable to accept connection" msgstr "Невъзможно е да се приеме свързването" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Проблем при хеширане на файла" @@ -1905,39 +1912,39 @@ msgstr "Запитване" msgid "Unable to invoke " msgstr "Неуспех при извикването на " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Свързване с %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Неуспех при създаването на гнездо за %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Не може да се започне свързване с %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Неуспех при свързване с %s:%s (%s), допустимото време изтече" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Неуспех при свързване с %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Свързване с %s" @@ -2017,76 +2024,76 @@ msgstr "Неуспех при отварянето на програмен ка msgid "Read error from %s process" msgstr "Грешка при четене от процес %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Чакане на заглавни части" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Получен е един ред на заглавна част с над %u символа" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Невалиден ред на заглавна част" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP сървърът изпрати невалидна заглавна част като отговор" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Length“" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Range“" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "HTTP сървърът няма поддръжка за прехвърляне на фрагменти на файлове" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Неизвестен формат на дата" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Неуспех на избора" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Допустимото време за свързване изтече" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Грешка при записа на изходен файл" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Грешка при записа на файл" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Грешка при записа на файла" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Грешка при четене от сървъра" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Невалидни данни на заглавната част" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "Неуспех при свързването" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "Вътрешна грешка" @@ -2223,6 +2230,7 @@ msgid "Unable to stat the mount point %s" msgstr "Неуспех при намирането на атрибутите на точка за монтиране %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "Неуспех при преминаването в %s" @@ -2231,73 +2239,73 @@ msgstr "Неуспех при преминаването в %s" msgid "Failed to stat the cdrom" msgstr "Неуспех при намирането на атрибутите на cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Не се използва заключване за файл за заключване %s, който е само за четене" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "Неуспех при отварянето на файл за заключване %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Не се използва заключване за файл за заключване %s, който е монтиран по NFS" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "Неуспех при достъпа до заключване %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Изчака се завършването на %s, но той не беше пуснат" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Нарушение на защитата на паметта (segmentation fault) в подпроцеса %s." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Подпроцесът %s върна код за грешка (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Подпроцесът %s завърши неочаквано" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "Неуспех при отварянето на файла %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "" "грешка при четене, все още има %lu за четене, но няма нито един останал" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "грешка при запис, все още име %lu за запис, но не успя" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "Проблем при затварянето на файла" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "Проблем при премахването на връзка към файла" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "Проблем при синхронизиране на файла" @@ -2465,7 +2473,7 @@ msgstr "" "Лошо форматиран ред %u в списъка с източници %s (идентификатор на " "производител)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2503,6 +2511,14 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "Неуспех при коригирането на проблемите, имате задържани счупени пакети." +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Някои индексни файлове не можаха да бъдат изтеглени, те са пренебрегнати или " +"са използвани по-стари." + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2535,17 +2551,17 @@ msgstr "Неуспех при намирането на драйвер за ме msgid "Method %s did not start correctly" msgstr "Методът %s не стартира правилно" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“." -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Пакетната система „%s“ не е поддържана" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Неуспех при определянето на подходяща пакетна система" @@ -2558,13 +2574,13 @@ msgstr "Неуспех при получаването на атрибути н msgid "You must put some 'source' URIs in your sources.list" msgstr "Трябва да добавите адреси-URI от тип „source“ в sources.list" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Списъците с пакети или файлът за състояние не можаха да бъдат анализирани " "или отворени." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Може да искате да изпълните „apt-get update“, за да коригирате тези проблеми" @@ -2680,25 +2696,25 @@ msgstr "Събиране на информация за „Осигурява“ msgid "IO Error saving source cache" msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "преименуването се провали, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "Несъответствие на контролна сума MD5" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 #, fuzzy msgid "Hash Sum mismatch" msgstr "Несъответствие на контролна сума MD5" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2707,7 +2723,7 @@ msgstr "" "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет (поради пропусната архитектура)." -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2716,14 +2732,14 @@ msgstr "" "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет." -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s." -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "Несъответствие на размера" @@ -2836,71 +2852,78 @@ msgstr "Записани са %i записа с %i несъответстващ msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Записани са %i записа с %i липсващи и %i несъответстващи файла\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Директорията със списъци %spartial липсва." -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "Подготвяне на %s" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "Разпакетиране на %s" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "Подготвяне на %s за конфигуриране" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "Конфигуриране на %s" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Грешка при обработката на директория %s" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "%s е инсталиран" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "Подготвяне за премахване на %s" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "Премахване на %s" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "%s е премахнат" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "Подготовка за пълно премахване на %s" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "%s е напълно премахнат" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 #, fuzzy msgid "Could not patch file" diff --git a/po/bs.po b/po/bs.po index a6a72e91a..fb47d8937 100644 --- a/po/bs.po +++ b/po/bs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Šećerović \n" "Language-Team: Bosnian \n" @@ -157,7 +157,7 @@ msgstr "" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" @@ -568,7 +568,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -729,12 +729,12 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "" @@ -762,7 +762,7 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -797,7 +797,7 @@ msgstr "Odustani." msgid "Do you want to continue [Y/n]? " msgstr "Da li želite nastaviti? [Y/n]" -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -806,7 +806,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "" @@ -906,76 +906,70 @@ msgstr "" msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Slijedeći NOVI paketi će biti instalirani:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, c-format msgid "Couldn't find task %s" msgstr "" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ali se %s treba instalirati" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -983,159 +977,174 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "Oštećeni paketi" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "Slijedeći dodatni paketi će biti instalirani:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "Predloženi paketi:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "Preporučeni paketi:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "Računam nadogradnju..." -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Neuspješno" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "Urađeno" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "Podržani moduli:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1392,7 +1401,7 @@ msgstr "" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "Ne mogu čitati %s" @@ -1619,7 +1628,7 @@ msgstr "" msgid "Server closed the connection" msgstr "Server je zatvorio vezu" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "Greška pri čitanju" @@ -1632,7 +1641,7 @@ msgstr "" msgid "Protocol corruption" msgstr "Oštećenje protokola" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "Greška pri pisanju" @@ -1686,7 +1695,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1713,39 +1722,39 @@ msgstr "" msgid "Unable to invoke " msgstr "" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "" -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Povezujem se sa %s" @@ -1818,76 +1827,76 @@ msgstr "" msgid "Read error from %s process" msgstr "" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Čekam na zaglavlja" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Nepoznat oblik datuma" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "Povezivanje neuspješno" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "Unutrašnja greška" @@ -2022,6 +2031,7 @@ msgid "Unable to stat the mount point %s" msgstr "" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "" @@ -2030,70 +2040,70 @@ msgstr "" msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "" @@ -2258,7 +2268,7 @@ msgstr "" msgid "Malformed line %u in source list %s (vendor id)" msgstr "" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2287,6 +2297,12 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "" +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2319,17 +2335,17 @@ msgstr "" msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "" @@ -2342,11 +2358,11 @@ msgstr "" msgid "You must put some 'source' URIs in your sources.list" msgstr "" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "" @@ -2456,44 +2472,44 @@ msgstr "" msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 msgid "Hash Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "" @@ -2602,71 +2618,78 @@ msgstr "" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, fuzzy, c-format msgid "Preparing %s" msgstr "Otvaram %s" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Otvaram %s" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, fuzzy, c-format msgid "Configuring %s" msgstr "Povezujem se sa %s" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, c-format msgid "Processing triggers for %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, fuzzy, c-format msgid "Installed %s" msgstr " Instalirano:" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, fuzzy, c-format msgid "Removing %s" msgstr "Otvaram %s" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, fuzzy, c-format msgid "Removed %s" msgstr "Preporučuje" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Ne mogu ukloniti %s" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "" diff --git a/po/ca.po b/po/ca.po index aca2f91c1..f17bf7524 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2006-02-05 22:00+0100\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -160,7 +160,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s per a %s %s compilat el %s %s\n" @@ -657,7 +657,7 @@ msgstr "No s'ha pogut canviar el nom de %s a %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "S'ha produït un error de compilació de l'expressió regular - %s" @@ -820,12 +820,12 @@ msgstr "Els paquets necessiten ser eliminats però Remove està inhabilitat." msgid "Internal error, Ordering didn't finish" msgstr "S'ha produït un error intern, l'ordenació no ha acabat" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "No és possible blocar el directori de descàrrega" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "No s'ha pogut llegir la llista de les fonts." @@ -854,7 +854,7 @@ msgstr "Després de desempaquetar s'usaran %sB d'espai en disc addicional.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Després de desempaquetar s'alliberaran %sB d'espai en disc.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "No s'ha pogut determinar l'espai lliure en %s" @@ -891,7 +891,7 @@ msgstr "Avortat." msgid "Do you want to continue [Y/n]? " msgstr "Voleu continuar [S/n]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "No s'ha pogut obtenir %s %s\n" @@ -900,7 +900,7 @@ msgstr "No s'ha pogut obtenir %s %s\n" msgid "Some files failed to download" msgstr "Alguns fitxers no s'han pogut descarregar" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "Descàrrega completa i en mode de només descàrrega" @@ -1007,74 +1007,66 @@ msgstr "L'ordre update no pren arguments" msgid "Unable to lock the list directory" msgstr "No es pot blocar el directori de la llista" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"No es poden descarregar alguns fitxers índex, s'han ignorat o en el seu lloc " -"s'han usat els antics." - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "S'instal·laran els següents paquets NOUS:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "La següent informació pot ajudar-vos a resoldre la situació:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "" "S'ha produït un error intern, el solucionador de problemes ha trencat coses" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error intern, AllUpgrade ha trencat coses" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "No s'ha pogut trobar el paquet %s" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "No s'ha pogut trobar el paquet %s" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota: s'està seleccionant %s per a l'expressió regular '%s'\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "però s'instal·larà %s" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho:" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1082,7 +1074,7 @@ msgstr "" "Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o " "especifiqueu una solució)." -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1094,7 +1086,7 @@ msgstr "" "unstable i alguns paquets requerits encara no han estat creats o bé\n" "encara no els hi han afegit." -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1104,120 +1096,135 @@ msgstr "" "probable que el paquet no sigui instal·lable i que s'hagi d'emetre\n" "un informe d'error en contra d'aquest per a arxivar-lo." -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "Paquets trencats" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "S'instal·laran els següents paquets extres:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "Paquets suggerits:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "Paquets recomanats:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "S'està calculant l'actualització... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Ha fallat" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "Fet" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "" "S'ha produït un error intern, el solucionador de problemes ha trencat coses" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "Haureu d'especificar un paquet de codi font per a descarregar" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "No es pot trobar un paquet de fonts per a %s" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "S'està ometent el fitxer ja descarregat «%s»\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "No teniu prou espai lliure en %s" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es necessita descarregar %sB/%sB d'arxius font.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es necessita descarregar %sB d'arxius font.\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "Font descarregada %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "No s'ha pogut descarregar alguns arxius." -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "L'ordre de desempaquetar «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comproveu si el paquet «dpkgdev» està instal·lat.\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "L'ordre de construir «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "Ha fallat el procés fill" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "" "S'ha d'especificar un paquet per a verificar les dependències de construcció " "per a" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "No es pot obtenir informació sobre les dependències de construcció per a %s" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s no té dependències de construcció.\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1226,7 +1233,7 @@ msgstr "" "La dependència %s en %s no es pot satisfer per que no es pot trobar el " "paquet %s" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1235,32 +1242,32 @@ msgstr "" "La dependència %s per a %s no es pot satisfer per que cap versió del paquet %" "s pot satisfer els requeriments de versions" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "No s'ha pogut satisfer la dependència %s per a %s: El paquet instal·lat %s " "és massa nou" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No s'han pogut satisfer les dependències de construcció per a %s" -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "No es poden processar les dependències de construcció" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "Mòduls suportats:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1575,7 +1582,7 @@ msgstr "El fitxer %s/%s sobreescriu al que està en el paquet %s" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "No es pot llegir %s" @@ -1809,7 +1816,7 @@ msgstr "Temps de connexió finalitzat" msgid "Server closed the connection" msgstr "El servidor ha tancat la connexió" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "Error de lectura" @@ -1821,7 +1828,7 @@ msgstr "Una resposta ha desbordat la memòria temporal." msgid "Protocol corruption" msgstr "Protocol corrumput" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "Error d'escriptura" @@ -1876,7 +1883,7 @@ msgstr "S'ha esgotat el temps de connexió al sòcol de dades" msgid "Unable to accept connection" msgstr "No es pot acceptar la connexió" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema escollint el fitxer" @@ -1903,39 +1910,39 @@ msgstr "Consulta" msgid "Unable to invoke " msgstr "No es pot invocar" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "S'està connectant amb %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "No s'ha pogut crear un sòcol per a %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "No es pot iniciar la connexió amb %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "No s'ha pogut connectar amb %s:%s (%s), temps de connexió excedit" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "No s'ha pogut connectar amb %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "S'està connectant amb %s" @@ -2015,76 +2022,76 @@ msgstr "No s'ha pogut obrir un conducte per a %s" msgid "Read error from %s process" msgstr "Error llegint des del procés %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "S'estan esperant les capçaleres" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "S'ha aconseguit una sola línia de capçalera més de %u caràcters" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Línia de capçalera incorrecta" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "El servidor http ha enviat una capçalera de resposta no vàlida" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "El servidor http ha enviat una capçalera de Content-Length no vàlida" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "El servidor http ha enviat una capçalera de Content-Range no vàlida" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Aquest servidor http té el suport d'abast trencat" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Format de la data desconegut" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Ha fallat la selecció" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Connexió finalitzada" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Error escrivint en el fitxer d'eixida" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Error escrivint en el fitxer" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Error escrivint en el fitxer" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Error llegint, el servidor remot ha tancat la connexió" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Error llegint des del servidor" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Capçalera de dades no vàlida" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "Ha fallat la connexió" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "Error intern" @@ -2219,6 +2226,7 @@ msgid "Unable to stat the mount point %s" msgstr "No es pot obtenir informació del punt de muntatge %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "No es pot canviar a %s" @@ -2227,70 +2235,70 @@ msgstr "No es pot canviar a %s" msgid "Failed to stat the cdrom" msgstr "No s'ha pogut fer «stat» del cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "No s'usen blocats per a llegir el fitxer de blocat de sols lectura %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "No es pot resoldre el fixter de blocat %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "No s'usen blocats per al fitxer de blocat %s de muntar nfs" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "No s'ha pogut blocar %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperava %s però no hi era" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Sub-procés %s ha rebut una violació de segment." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Sub-procés %s ha retornat un codi d'error (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Sub-procés %s ha eixit inesperadament" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "No s'ha pogut obrir el fitxer %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "llegits, falten %lu per llegir, però no queda res" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "escrits, falten %lu per escriure però no s'ha pogut" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "Ha hagut un problema en tancar el fitxer" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "Ha hagut un problema en desenllaçar el fitxer" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "Ha hagut un problema en sincronitzar el fitxer" @@ -2454,7 +2462,7 @@ msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s" msgid "Malformed line %u in source list %s (vendor id)" msgstr "La línia %u és malformada en la llista de fonts %s (id del proveïdor)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2492,6 +2500,14 @@ msgstr "" "No es poden corregir els problemes, teniu paquets mantinguts que estan " "trencats." +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"No es poden descarregar alguns fitxers índex, s'han ignorat o en el seu lloc " +"s'han usat els antics." + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2524,17 +2540,17 @@ msgstr "No s'ha pogut trobar el mètode de control %s." msgid "Method %s did not start correctly" msgstr "El mètode %s no s'ha iniciat correctament" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Inseriu el disc amb l'etiqueta: «%s» en la unitat «%s» i premeu Intro." -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "El sistema d'empaquetament '%s' no està suportat" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat." @@ -2547,12 +2563,12 @@ msgstr "No es pot veure l'estat de %s." msgid "You must put some 'source' URIs in your sources.list" msgstr "Heu de posar algunes URI 'font' en el vostre sources.list" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" "No s'han pogut analitzar o obrir les llistes de paquets o el fitxer d'estat." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Potser voldreu executar apt-get update per a corregir aquests problemes" @@ -2669,25 +2685,25 @@ msgstr "S'estan recollint els fitxers que proveeixen" msgid "IO Error saving source cache" msgstr "Error d'E/S en desar la memòria cau de la font" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "Suma MD5 diferent" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 #, fuzzy msgid "Hash Sum mismatch" msgstr "Suma MD5 diferent" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2697,7 +2713,7 @@ msgstr "" "significar que haureu d'arreglar aquest paquet manualment (segons " "arquitectura)." -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2706,7 +2722,7 @@ msgstr "" "No s'ha trobat un fitxer pel paquet %s. Això podria significar que haureu " "d'arreglar aquest paquet manualment." -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2714,7 +2730,7 @@ msgstr "" "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp " "per al paquet %s." -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "La mida no concorda" @@ -2827,71 +2843,78 @@ msgstr "" "S'han escrit %i registres, on falten %i fitxers i hi ha %i fitxers no " "coincidents\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Falta el directori de llistes %spartial." -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "S'està preparant el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "S'està desempaquetant %s" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "S'està preparant per a configurar el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "S'està configurant el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "S'ha produït un error en processar el directori %s" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "S'ha instal·lat el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "S'està preparant per a l'eliminació del paquet %s" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "S'està eliminant el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "S'ha eliminat el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "S'està preparant per a eliminar completament el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "S'ha eliminat completament el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 #, fuzzy msgid "Could not patch file" diff --git a/po/cs.po b/po/cs.po index 0b38d8935..938028949 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2006-10-04 18:53+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -158,7 +158,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pro %s %s zkompilován na %s %s\n" @@ -652,7 +652,7 @@ msgstr "Selhalo přejmenování %s na %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba při kompilaci regulárního výrazu - %s" @@ -813,12 +813,12 @@ msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta." msgid "Internal error, Ordering didn't finish" msgstr "Vnitřní chyba, třídění nedoběhlo do konce" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "Nemohu zamknout adresář pro stahování" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Nelze přečíst seznam zdrojů." @@ -847,7 +847,7 @@ msgstr "Po rozbalení bude na disku použito dalších %sB.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po rozbalení bude na disku uvolněno %sB.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nemohu určit volné místo v %s" @@ -884,7 +884,7 @@ msgstr "Přerušeno." msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovat [Y/n]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Selhalo stažení %s %s\n" @@ -893,7 +893,7 @@ msgstr "Selhalo stažení %s %s\n" msgid "Some files failed to download" msgstr "Některé soubory nemohly být staženy" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "Stahování dokončeno v režimu pouze stáhnout" @@ -998,73 +998,65 @@ msgstr "Příkaz update neakceptuje žádné argumenty" msgid "Unable to lock the list directory" msgstr "Nemohu uzamknout list adresář" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"Některé indexové soubory se nepodařilo stáhnout, jsou ignorovány, nebo jsou " -"použity starší verze." - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Následující NOVÉ balíky budou nainstalovány:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Vnitřní chyba, řešitel problémů pokazil věci" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnitřní chyba, AllUpgrade pokazil věci" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Nemohu najít balík %s" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "Nemohu najít balík %s" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Pozn: vybírám %s pro regulární výraz '%s'\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ale %s se bude instalovat" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Pro opravení následujících můžete spustit `apt-get -f install':" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1072,7 +1064,7 @@ msgstr "" "Nesplněné závislosti. Zkuste spustit 'apt-get -f install' bez balíků (nebo " "navrhněte řešení)." -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1083,7 +1075,7 @@ msgstr "" "nemožnou situaci, nebo, pokud používáte nestabilní distribuci, že\n" "vyžadované balíky ještě nebyly vytvořeny nebo přesunuty z Příchozí fronty." -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1093,124 +1085,139 @@ msgstr "" "balík není instalovatelný a měl byste o tom zaslat hlášení o chybě\n" "(bug report)." -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "Poškozené balíky" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "Následující extra balíky budou instalovány:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "Doporučované balíky:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "Propočítávám aktualizaci... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Selhalo" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "Vnitřní chyba, řešitel problémů pokazil věci" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "Nemohu najít zdrojový balík pro %s" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Přeskakuji dříve stažený soubor '%s'\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatek volného místa" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potřebuji stáhnout %sB zdrojových archivů.\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "Stáhnout zdroj %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "Stažení některých archivů selhalo." -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Příkaz pro rozbalení '%s' selhal.\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Zkontrolujte, zda je nainstalován balíček 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "Příkaz pro sestavení '%s' selhal.\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "Synovský proces selhal" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "" "Musíte zadat alespoň jeden balík, pro který budou kontrolovány závislosti " "pro sestavení" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nemohu získat závislosti pro sestavení %s" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žádné závislosti pro sestavení.\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1219,31 +1226,31 @@ msgstr "" "%s závislost pro %s nemůže být splněna protože není k dispozici verze balíku " "%s, která odpovídá požadavku na verzi" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Selhalo splnění %s závislosti pro %s: Instalovaný balík %s je příliš nový" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Selhalo splnění %s závislosti pro %s: %s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti pro sestavení %s nemohly být splněny." -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "Chyba při zpracování závislostí pro sestavení" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1551,7 +1558,7 @@ msgstr "Soubor %s/%s přepisuje ten z balíku %s" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "Nemohu číst %s" @@ -1783,7 +1790,7 @@ msgstr "Čas spojení vypršel" msgid "Server closed the connection" msgstr "Server uzavřel spojení" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "Chyba čtení" @@ -1795,7 +1802,7 @@ msgstr "Odpověď přeplnila buffer." msgid "Protocol corruption" msgstr "Porušení protokolu" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "Chyba zápisu" @@ -1849,7 +1856,7 @@ msgstr "Spojení datového socketu vypršelo" msgid "Unable to accept connection" msgstr "Nemohu přijmout spojení" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problém s hashováním souboru" @@ -1876,39 +1883,39 @@ msgstr "Dotaz" msgid "Unable to invoke " msgstr "Nemohu vyvolat " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Připojuji se k %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Nemohu vytvořit socket pro %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Nemohu navázat spojení na %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Nemohu se připojit k %s:%s (%s), čas spojení vypršel" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Nemohu se připojit k %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Připojuji se k %s" @@ -1983,76 +1990,76 @@ msgstr "Nemohu otevřít rouru pro %s" msgid "Read error from %s process" msgstr "Chyba čtení z procesu %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Čekám na hlavičky" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Získal jsem jednu řádku hlavičky přes %u znaků" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Chybná hlavička" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Http server poslal neplatnou hlavičku odpovědi" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Http server poslal neplatnou hlavičku Content-Length" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Http server poslal neplatnou hlavičku Content-Range" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Tento HTTP server má porouchanou podporu rozsahů" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Neznámý formát data" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Výběr selhal" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Čas spojení vypršel" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupního souboru" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Chyba čtení ze serveru" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Špatné datové záhlaví" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "Spojení selhalo" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "Vnitřní chyba" @@ -2188,6 +2195,7 @@ msgid "Unable to stat the mount point %s" msgstr "Nelze vyhodnotit přípojný bod %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "Nemohu přejít do %s" @@ -2196,70 +2204,70 @@ msgstr "Nemohu přejít do %s" msgid "Failed to stat the cdrom" msgstr "Nezdařilo se vyhodnotit cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Nepoužívám zamykání pro zámkový soubor %s, který je pouze pro čtení" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "Nešlo otevřít zámkový soubor %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nepoužívám zamykání pro zámkový soubor %s připojený přes nfs" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "Nemohu získat zámek %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Čekal jsem na %s, ale nebyl tam" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Podproces %s obdržel chybu segmentace." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s vrátil chybový kód (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s neočekávaně skončil" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "Nemohu otevřít soubor %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "čtení, stále mám k přečtení %lu, ale už nic nezbývá" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "zápis, stále mám %lu k zápisu, ale nejde to" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "Problém při zavírání souboru" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "Problém při odstraňování souboru" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "Problém při synchronizování souboru" @@ -2423,7 +2431,7 @@ msgstr "Typ '%s' na řádce %u v seznamu zdrojů %s není známý" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Zkomolený řádek %u v seznamu zdrojů %s (id výrobce)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2457,6 +2465,14 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Nemohu opravit problémy, některé balíky držíte v porouchaném stavu." +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Některé indexové soubory se nepodařilo stáhnout, jsou ignorovány, nebo jsou " +"použity starší verze." + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2489,17 +2505,17 @@ msgstr "Ovladač metody %s nemohl být nalezen." msgid "Method %s did not start correctly" msgstr "Metoda %s nebyla spuštěna správně" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Vložte prosím disk nazvaný '%s' do mechaniky '%s' a stiskněte enter." -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Balíčkovací systém '%s' není podporován" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Nebylo možno určit vhodný typ balíčkovacího systému" @@ -2512,12 +2528,12 @@ msgstr "Nebylo možno vyhodnotit %s." msgid "You must put some 'source' URIs in your sources.list" msgstr "Do sources.list musíte zadat 'zdrojové' URI" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Seznamy balíků nebo stavový soubor nemohly být zpracovány nebo otevřeny." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "Pro nápravu těchto problémů můžete zkusit spustit apt-get update" @@ -2630,25 +2646,25 @@ msgstr "Collecting File poskytuje" msgid "IO Error saving source cache" msgstr "Chyba IO při ukládání zdrojové cache" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "přejmenování selhalo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "Neshoda MD5 součtů" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 #, fuzzy msgid "Hash Sum mismatch" msgstr "Neshoda MD5 součtů" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "K následujícím ID klíčů není dostupný veřejný klíč:\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2657,7 +2673,7 @@ msgstr "" "Nebyl jsem schopen nalézt soubor s balíkem %s. To by mohlo znamenat, že " "tento balík je třeba opravit ručně (kvůli chybějící architektuře)" -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2666,14 +2682,14 @@ msgstr "" "Nebyl jsem schopen nalézt soubor s balíkem %s. Asi budete muset tento balík " "opravit ručně." -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s." -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "Velikosti nesouhlasí" @@ -2785,71 +2801,78 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "Zapsal jsem %i záznamů s chybějícími (%i) a nesouhlasícími (%i) soubory.\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Adresář seznamů %spartial chybí." -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "Připravuji %s" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "Rozbaluji %s" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "Připravuji nastavení %s" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "Nastavuji %s" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Chyba zpracování adresáře %s" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "Nainstalován %s" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "Připravuji odstranění %s" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "Odstraňuji %s" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "Odstraněn %s" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "Připravuji úplné odstranění %s" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "Kompletně odstraněn %s" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 #, fuzzy msgid "Could not patch file" diff --git a/po/cy.po b/po/cy.po index 078d89725..5ac0610be 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" @@ -174,7 +174,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n" @@ -680,7 +680,7 @@ msgstr "Methwyd ailenwi %s at %s" msgid "Y" msgstr "I" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "Gwall crynhoi patrwm - %s" @@ -850,12 +850,12 @@ msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi." msgid "Internal error, Ordering didn't finish" msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Methwyd darllen y rhestr ffynhonellau." @@ -883,7 +883,7 @@ msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" @@ -921,7 +921,7 @@ msgstr "Erthylu." msgid "Do you want to continue [Y/n]? " msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" @@ -930,7 +930,7 @@ msgstr "Methwyd cyrchu %s %s\n" msgid "Some files failed to download" msgstr "Methodd rhai ffeiliau lawrlwytho" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" @@ -1038,75 +1038,67 @@ msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" msgid "Unable to lock the list directory" msgstr "Ni ellir cloi'r cyfeiriadur rhestr" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen " -"rai eu defnyddio yn lle." - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 #, fuzzy msgid "Internal error, AllUpgrade broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain:" # FIXME -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1115,7 +1107,7 @@ msgstr "" "pecyn (neu penodwch ddatrys)" # FIXME: needs commas -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1128,7 +1120,7 @@ msgstr "" "heb gael eu symud allan o Incoming." # FIXME: commas, wrapping -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1137,118 +1129,133 @@ msgstr "" "Gan y gofynnoch am weithred syml yn unig, mae'n debygol nad yw'r pecyn\n" "yn sefydladwy a dylid cyflwyno adroddiad nam yn erbyn y pecyn hwnnw." -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "Pecynnau wedi torri" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "Pecynnau a awgrymmir:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "Pecynnau a argymhellir:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 #, fuzzy msgid "Calculating upgrade... " msgstr "Yn Cyfrifo'r Uwchraddiad... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Methwyd" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "Wedi Gorffen" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, fuzzy, c-format msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "" "Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1257,7 +1264,7 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %" "s" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1266,34 +1273,34 @@ msgstr "" "Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd " "ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy " "newydd" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 #, fuzzy msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1613,7 +1620,7 @@ msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "Ni ellir darllen %s" @@ -1860,7 +1867,7 @@ msgstr "Goramser cysylltu" msgid "Server closed the connection" msgstr "Caeodd y gweinydd y cysylltiad" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "Gwall darllen" @@ -1872,7 +1879,7 @@ msgstr "Gorlifodd ateb y byffer." msgid "Protocol corruption" msgstr "Llygr protocol" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "Gwall ysgrifennu" @@ -1928,7 +1935,7 @@ msgstr "Goramserodd cysylltiad y soced data" msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" @@ -1956,39 +1963,39 @@ msgstr "Ymholiad" msgid "Unable to invoke " msgstr "Methwyd gweithredu " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Yn cysylltu i %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Methwyd creu soced ar gyfer %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Methwyd cysylltu i %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Yn cysylltu i %s" @@ -2061,82 +2068,82 @@ msgstr "Methwyd agor pibell ar gyfer %s" msgid "Read error from %s process" msgstr "Gwall darllen o broses %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Yn aros am benawdau" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Derbynnwyd llinell pennaws sengl dros %u nod" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Llinell pennawd gwael" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 #, fuzzy msgid "The HTTP server sent an invalid reply header" msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys" -#: methods/http.cc:586 +#: methods/http.cc:585 #, fuzzy msgid "The HTTP server sent an invalid Content-Length header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys" -#: methods/http.cc:601 +#: methods/http.cc:600 #, fuzzy msgid "The HTTP server sent an invalid Content-Range header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys" -#: methods/http.cc:603 +#: methods/http.cc:602 #, fuzzy msgid "This HTTP server has broken range support" msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:875 +#: methods/http.cc:874 #, fuzzy msgid "Error reading from server. Remote end closed connection" msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" -#: methods/http.cc:1104 +#: methods/http.cc:1106 #, fuzzy msgid "Bad header data" msgstr "Data pennawd gwael" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "Gwall mewnol" @@ -2275,6 +2282,7 @@ msgid "Unable to stat the mount point %s" msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "Ni ellir newid i %s" @@ -2283,72 +2291,72 @@ msgstr "Ni ellir newid i %s" msgid "Failed to stat the cdrom" msgstr "Methwyd gwneud stat() o'r CD-ROM" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "Methwyd agor y ffeil clo %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Ddim yn cloi'r ffeil clo ar NFS %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "Methwyd cael y clo %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, fuzzy, c-format msgid "Waited for %s but it wasn't there" msgstr "Arhoswyd am %s ond nid oedd e yna" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Dychwelodd is-broses %s gôd gwall (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Gorffenodd is-broses %s yn annisgwyl" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "Methwyd agor ffeil %s" # FIXME -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "o hyd %lu i ddarllen ond dim ar ôl" # FIXME -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "o hyd %lu i ysgrifennu ond methwyd" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "Gwall wrth dadgysylltu'r ffeil" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "Gwall wrth gyfamseru'r ffeil" @@ -2519,7 +2527,7 @@ msgid "Malformed line %u in source list %s (vendor id)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" # FIXME: %s may have an arbirrary length -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2556,6 +2564,14 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig." +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen " +"rai eu defnyddio yn lle." + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2588,7 +2604,7 @@ msgstr "Methwyd canfod y gyrrydd dull %s." msgid "Method %s did not start correctly" msgstr "Ni gychwynodd y dull %s yn gywir" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, fuzzy, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -2596,12 +2612,12 @@ msgstr "" " '%s'\n" "yn y gyrriant '%s' a gwasgwch Enter\n" -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Ni chynhelir y system pecynnu '%s'" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 #, fuzzy msgid "Unable to determine a suitable packaging system type" msgstr "Ni ellir canfod math system addas" @@ -2616,11 +2632,11 @@ msgstr "Ni ellir gwneud stat() o %s." msgid "You must put some 'source' URIs in your sources.list" msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn." @@ -2735,26 +2751,26 @@ msgstr "Yn Casglu Darpariaethau Ffeil" msgid "IO Error saving source cache" msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "methwyd ailenwi, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 #, fuzzy msgid "Hash Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" # FIXME: case -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2763,7 +2779,7 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)" -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2772,14 +2788,14 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law." -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s." -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "Camgyfatebiaeth maint" @@ -2889,71 +2905,78 @@ msgstr "" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, fuzzy, c-format msgid "Preparing %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, fuzzy, c-format msgid "Configuring %s" msgstr "Yn cysylltu i %s" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Gwall wrth brosesu'r cyfeiriadur %s" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, fuzzy, c-format msgid "Installed %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, fuzzy, c-format msgid "Removing %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, fuzzy, c-format msgid "Removed %s" msgstr "Argymell" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Methwyd dileu %s" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 #, fuzzy msgid "Could not patch file" diff --git a/po/da.po b/po/da.po index f43d54ae3..6e5532813 100644 --- a/po/da.po +++ b/po/da.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-da\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2007-09-06 21:40+0200\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish\n" @@ -162,7 +162,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s oversat %s %s\n" @@ -658,7 +658,7 @@ msgstr "Kunne ikke omd msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "Fejl ved tolkning af regulrt udtryk - %s" @@ -819,12 +819,12 @@ msgstr "Pakker skal afinstalleres, men Remove er deaktiveret." msgid "Internal error, Ordering didn't finish" msgstr "Intern fejl. Sortering blev ikke fuldfrt" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "Kunne ikke lse nedhentningsmappen" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Listen med kilder kunne ikke lses." @@ -852,7 +852,7 @@ msgstr "Efter udpakning vil %sB yderligere diskplads v msgid "After this operation, %sB disk space will be freed.\n" msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunne ikke bestemme ledig plads i %s" @@ -889,7 +889,7 @@ msgstr "Afbryder." msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortstte [J/n]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Kunne ikke hente %s %s\n" @@ -898,7 +898,7 @@ msgstr "Kunne ikke hente %s %s\n" msgid "Some files failed to download" msgstr "Nedhentningen af filer mislykkedes" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand" @@ -1005,31 +1005,23 @@ msgstr "'update'-kommandoen benytter ingen parametre" msgid "Unable to lock the list directory" msgstr "Kunne ikke lse listemappen" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"Nogle indeksfiler kunne ikke hentes, de er blevet ignoreret eller de gamle " -"bruges i stedet." - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Det er ikke meningen, at vi skal slette ting og sager, kan ikke starte " "AutoRemover" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Flgende pakker blev installeret automatisk, og behves ikke lngere:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "Brug 'apt-get autoremove' til at fjerne dem." -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1037,43 +1029,43 @@ msgstr "" "Hmm, det lader til at AutoRemover smadrede noget, der virkelig ikke\n" "burde kunne ske. Indsend venligst en fejlrapport om apt." -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "Flgende oplysninger kan hjlpe dig med at klare situationen:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 msgid "Internal Error, AutoRemover broke stuff" msgstr "Intern fejl. AutoRemover delagde noget" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern fejl, AllUpgrade delagde noget" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, c-format msgid "Couldn't find task %s" msgstr "Kunne ikke finde opgaven %s" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "Kunne ikke finde pakken %s" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Bemrk, vlger %s som regulrt udtryk '%s'\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "%s sat til manuelt installeret.\n" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du kan muligvis rette det ved at kre 'apt-get -f install':" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1081,7 +1073,7 @@ msgstr "" "Uopfyldte afhngigheder. Prv 'apt-get -f install' uden pakker (eller angiv " "en lsning)." -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1092,7 +1084,7 @@ msgstr "" "en umulig situation eller bruger den ustabile distribution, hvor enkelte\n" "pakker endnu ikke er lavet eller gjort tilgngelige." -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1101,115 +1093,130 @@ msgstr "" "Siden du kan bad om en enkelt handling, kan pakken hjst sandsynligt slet\n" "ikke installeres og du br indsende en fejlrapport for denne pakke." -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "delagte pakker" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "Flgende yderligere pakker vil blive installeret:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "Foreslede pakker:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "Anbefalede pakker:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "Beregner opgraderingen... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Mislykkedes" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "Frdig" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "Intern fejl. Problemlseren delagde noget" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "Du skal angive mindst n pakke at hente kildeteksten til" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunne ikke finde kildetekstpakken for %s" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Overspringer allerede hentet fil '%s'\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plads i %s" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB skal hentes fra kildetekst-arkiverne.\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "Henter kildetekst %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "Nogle arkiver kunne ikke hentes." -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Udpakningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Tjek om pakken 'dpkg-dev' er installeret.\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "Opbygningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "Barneprocessen fejlede" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "Skal angive mindst n pakke at tjekke opbygningsafhngigheder for" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunne ikke hente oplysninger om opbygningsafhngigheder for %s" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen opbygningsafhngigheder.\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1217,7 +1224,7 @@ msgid "" msgstr "" "%s-afhngigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1226,32 +1233,32 @@ msgstr "" "%s-afhngigheden for %s kan ikke opfyldes, da ingen af de tilgngelige " "udgaver af pakken %s kan tilfredsstille versions-kravene" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Kunne ikke opfylde %s-afhngigheden for %s: Den installerede pakke %s er for " "ny" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Kunne ikke opfylde %s-afhngigheden for %s: %s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Opbygningsafhngigheden for %s kunne ikke opfyldes." -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "Kunne ikke behandler opbygningsafhngighederne" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "Understttede moduler:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1566,7 +1573,7 @@ msgstr "File %s/%s overskriver filen i pakken %s" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "Kunne ikke lse %s" @@ -1800,7 +1807,7 @@ msgstr "Tidsudl msgid "Server closed the connection" msgstr "Serveren lukkede forbindelsen" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "Lsefejl" @@ -1812,7 +1819,7 @@ msgstr "Mellemlageret blev overfyldt af et svar." msgid "Protocol corruption" msgstr "Protokolfejl" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "Skrivefejl" @@ -1866,7 +1873,7 @@ msgstr "Tidsudl msgid "Unable to accept connection" msgstr "Kunne ikke acceptere forbindelse" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved \"hashing\" af fil" @@ -1893,39 +1900,39 @@ msgstr "Foresp msgid "Unable to invoke " msgstr "Kunne ikke udfre " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Forbinder til %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Kunne ikke oprette sokkel til %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Kan ikke oprette forbindelse til %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Kunne ikke forbinde til %s:%s (%s) grundet tidsudlb" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Kunne ikke forbinde til %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Forbinder til %s" @@ -2001,77 +2008,77 @@ msgstr "Kunne ikke msgid "Read error from %s process" msgstr "Lsefejl fra %s-process" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Afventer hoveder" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Fandt en enkelt linje i hovedet p over %u tegn" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Ugyldig linje i hovedet" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "http-serveren sendte et ugyldigt svarhovede" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "http-serveren sendte et ugyldigt Content-Length-hovede" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "http-serveren sendte et ugyldigt Content-Range-hovede" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "" "Denne http-servere har fejlagtig understttelse af intervaller ('ranges')" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Ukendt datoformat" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Valg mislykkedes" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Tidsudlb p forbindelsen" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Fejl ved skrivning af uddatafil" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Fejl ved skrivning til fil" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Fejl ved skrivning til filen" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Fejl ved lsning fra serveren. Den fjerne ende lukkede forbindelsen" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Fejl ved lsning fra server" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Ugyldige hoved-data" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "Forbindelsen mislykkedes" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "Intern fejl" @@ -2206,6 +2213,7 @@ msgid "Unable to stat the mount point %s" msgstr "Kunne ikke finde monteringspunktet %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "Kunne ikke skifte til %s" @@ -2214,70 +2222,70 @@ msgstr "Kunne ikke skifte til %s" msgid "Failed to stat the cdrom" msgstr "Kunne ikke finde cdrommen" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Benytter ikke lsning for skrivebeskyttet lsefil %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "Kunne ikke bne lsefilen %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Benytter ikke lsning for nfs-monteret lsefil %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "Kunne ikke opn lsen %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ventede p %s, men den var der ikke" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprocessen %s modtog en segmenteringsfejl." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprocessen %s returnerede en fejlkode (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprocessen %s afsluttedes uventet" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "Kunne ikke bne filen %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "ls, mangler stadig at lse %lu men der er ikke flere" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "skriv, mangler stadig at skrive %lu men kunne ikke" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "Problem under lukning af fil" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "Fejl ved frigivelse af filen" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "Problem under synkronisering af fil" @@ -2440,7 +2448,7 @@ msgstr "Typen '%s' er ukendt p msgid "Malformed line %u in source list %s (vendor id)" msgstr "Ugyldig linje %u i kildelisten %s (producent-id)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2477,6 +2485,14 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "Kunne ikke korrigere problemerne, da du har tilbageholdt delagte pakker." +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Nogle indeksfiler kunne ikke hentes, de er blevet ignoreret eller de gamle " +"bruges i stedet." + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2509,17 +2525,17 @@ msgstr "Metodedriveren %s blev ikke fundet." msgid "Method %s did not start correctly" msgstr "Metoden %s startede ikke korrekt" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Indst disken med navnet: '%s' i drevet '%s' og tryk retur." -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet '%s' understttes ikke" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Kunne ikke bestemme en passende pakkesystemtype" @@ -2532,11 +2548,11 @@ msgstr "Kunne ikke finde %s." msgid "You must put some 'source' URIs in your sources.list" msgstr "Du skal have nogle 'source'-URI'er i din sources.list" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "Pakkelisterne eller statusfilen kunne ikke tolkes eller bnes." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "Du kan muligvis rette problemet ved at kre 'apt-get update'" @@ -2648,26 +2664,26 @@ msgstr "Samler filudbud" msgid "IO Error saving source cache" msgstr "IO-fejl ved gemning af kilde-mellemlageret" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "omdbning mislykkedes, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "MD5Sum stemmer ikke" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum stemmer ikke" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Der er ingen tilgngelige offentlige ngler for flgende ngle-ID'er:\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2676,7 +2692,7 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "ndt til manuelt at reparere denne pakke. (grundet manglende arch)" -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2685,13 +2701,13 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "ndt til manuelt at reparere denne pakke." -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s." -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "Strrelsen stemmer ikke" @@ -2803,71 +2819,78 @@ msgstr "Skrev %i poster med %i ikke-trufne filer\n" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Listemappen %spartial mangler." -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "Klargr %s" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "Pakker %s ud" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "Gr klar til at stte %s op" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "Stter %s op" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Fejl under behandling af mappen %s" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "Installerede %s" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "Gr klar til afinstallation af %s" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "Fjerner %s" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "Fjernede %s" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "Gr klar til at fjerne %s helt" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "Fjernede %s helt" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "Kunne ikke pfre filen %s en lap" diff --git a/po/de.po b/po/de.po index 3aba19cdd..50b4a7fbc 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6.46.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2006-10-24 11:45+0200\n" "Last-Translator: Michael Piefel \n" "Language-Team: \n" @@ -158,7 +158,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s für %s %s kompiliert am %s %s\n" @@ -669,7 +669,7 @@ msgstr "Konnte %s nicht in %s umbenennen" msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "Fehler beim Kompilieren eines regulären Ausdrucks – %s" @@ -830,12 +830,12 @@ msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet." msgid "Internal error, Ordering didn't finish" msgstr "Interner Fehler, Anordnung beendete nicht" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "Kann kein Lock für das Downloadverzeichnis erhalten." -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Die Liste der Quellen konnte nicht gelesen werden." @@ -865,7 +865,7 @@ msgstr "Nach dem Auspacken werden %sB Plattenplatz zusätzlich benutzt.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Nach dem Auspacken werden %sB Plattenplatz freigegeben worden sein.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "Konnte freien Platz in %s nicht bestimmen" @@ -902,7 +902,7 @@ msgstr "Abbruch." msgid "Do you want to continue [Y/n]? " msgstr "Möchten Sie fortfahren [J/n]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Konnte %s nicht holen %s\n" @@ -911,7 +911,7 @@ msgstr "Konnte %s nicht holen %s\n" msgid "Some files failed to download" msgstr "Einige Dateien konnten nicht heruntergeladen werden" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "Herunterladen abgeschlossen und im Nur-Herunterladen-Modus" @@ -1019,74 +1019,66 @@ msgstr "Der Befehl „update“ nimmt keine Argumente" msgid "Unable to lock the list directory" msgstr "Kann kein Lock auf das Listenverzeichnis bekommen" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"Einige Indexdateien konnten nicht heruntergeladen werden, sie wurden " -"ignoriert oder alte an ihrer Stelle benutzt." - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Die folgenden NEUEN Pakete werden installiert:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "" "Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Konnte Paket %s nicht finden" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "Konnte Paket %s nicht finden" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Achtung, wähle %s für reg. Ausdruck „%s“\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "aber %s soll installiert werden" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Probieren Sie „apt-get -f install“, um diese zu korrigieren:" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1094,7 +1086,7 @@ msgstr "" "Nichterfüllte Abhängigkeiten. Versuchen Sie „apt-get -f install“ ohne " "jeglich Pakete (oder geben Sie eine Lösung an)." -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1106,7 +1098,7 @@ msgstr "" "Unstable-Distribution verwenden, einige erforderliche Pakete noch nicht\n" "kreiert oder aus Incoming herausbewegt wurden." -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1117,119 +1109,134 @@ msgstr "" "dass das Paket einfach nicht installierbar ist und eine Fehlermeldung über\n" "dieses Paket erfolgen sollte." -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "Kaputte Pakete" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "Die folgenden zusätzlichen Pakete werden installiert:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "Vorgeschlagene Pakete:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "Empfohlene Pakete:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "Berechne Upgrade..." -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Fehlgeschlagen" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "Fertig" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "" "Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden " "sollen" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "Kann Quellpaket für %s nicht finden" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Überspringe schon heruntergeladene Datei „%s“\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "Sie haben nicht genug freien Platz in %s" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es müssen noch %sB/%sB der Quellarchive geholt werden.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es müssen %sB der Quellarchive geholt werden.\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "Hole Quelle %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "Konnte einige Archive nicht holen." -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Entpack-Befehl „%s“ fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Überprüfen Sie, ob das Paket „dpkg-dev“ installiert ist.\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build-Befehl „%s“ fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "Kindprozess fehlgeschlagen" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "" "Es muss zumindest ein Paket angegeben werden, dessen Build-Dependencies\n" "überprüft werden sollen." -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Information zu Build-Dependencies für %s konnte nicht gefunden werden." -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s hat keine Build-Dependencies.\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1238,7 +1245,7 @@ msgstr "" "%s Abhängigkeit für %s kann nicht befriedigt werden, da Paket %s nicht " "gefunden werden kann." -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1247,32 +1254,32 @@ msgstr "" "%s Abhängigkeit für %s kann nicht befriedigt werden, da keine verfügbare " "Version von Paket %s die Versionsanforderungen erfüllen kann." -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Konnte die %s-Abhängigkeit für %s nicht erfüllen: Installiertes Paket %s ist " "zu neu." -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Konnte die %s-Abhängigkeit für %s nicht erfüllen: %s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Build-Abhängigkeiten für %s konnten nicht erfüllt werden." -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "Verarbeitung der Build-Abhängigkeiten fehlgeschlagen" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "Unterstützte Module:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1591,7 +1598,7 @@ msgstr "Datei %s/%s überschreibt die Datei in Paket %s" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "Kann %s nicht lesen" @@ -1827,7 +1834,7 @@ msgstr "Zeitüberschreitung der Verbindung" msgid "Server closed the connection" msgstr "Der Server hat die Verbindung geschlossen" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "Lesefehler" @@ -1839,7 +1846,7 @@ msgstr "Eine Antwort hat einen Puffer zum Überlaufen gebracht." msgid "Protocol corruption" msgstr "Protokollkorrumption" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "Schreibfehler" @@ -1894,7 +1901,7 @@ msgstr "Datenverbindungsaufbau erlitt Zeitüberschreitung" msgid "Unable to accept connection" msgstr "Kann Verbindung nicht annehmen" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf" @@ -1921,40 +1928,40 @@ msgstr "Abfrage" msgid "Unable to invoke " msgstr "Kann nicht aufrufen: " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Verbinde mit %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Kann keinen Verbindungsendpunkt für %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Kann keine Verbindung mit %s:%s aufbauen (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" "Konnte wegen Zeitüberschreitung keine Verbindung mit %s:%s aufbauen (%s)" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Konnte nicht mit %s:%s verbinden (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Verbinde mit %s" @@ -2033,78 +2040,78 @@ msgstr "Konnte keine Pipe für %s öffnen" msgid "Read error from %s process" msgstr "Lesefehler von Prozess %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Warte auf Kopfzeilen (header)" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Erhielt einzelne Kopfzeile aus %u Zeichen" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Schlechte Kopfzeile" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Der http-Server sandte eine ungültige Antwort-Kopfzeile" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Der http-Server sandte eine ungültige „Content-Length“-Kopfzeile" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Der http-Server sandte eine ungültige „Content-Range“-Kopfzeile" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Der http-Server unterstützt Dateiteilübertragung nur fehlerhaft." -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Unbekanntes Datumsformat" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Auswahl fehlgeschlagen" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Verbindung erlitt Zeitüberschreitung" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Fehler beim Schreiben einer Ausgabedatei" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Fehler beim Schreiben einer Datei" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Fehler beim Schreiben der Datei" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fehler beim Lesen vom Server: Das entfernte Ende hat die Verbindung " "geschlossen" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Fehler beim Lesen vom Server" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Fehlerhafte Kopfzeilendaten" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "Verbindung fehlgeschlagen" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "Interner Fehler" @@ -2241,6 +2248,7 @@ msgid "Unable to stat the mount point %s" msgstr "Kann auf den Einhängepunkt %s nicht zugreifen." #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "Kann nicht nach %s wechseln" @@ -2249,70 +2257,70 @@ msgstr "Kann nicht nach %s wechseln" msgid "Failed to stat the cdrom" msgstr "Konnte auf CD-ROM nicht zugreifen" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Benutze kein Locking für Nur-Lese-Lockdatei %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "Konnte Lockdatei %s nicht öffnen" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Benutze kein Locking für NFS-eingebundene Lockdatei %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "Konnte Lock %s nicht bekommen" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Auf %s gewartet, aber es war nicht da" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Unterprozess %s hat einen Speicherzugriffsfehler erhalten." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Unterprozess %s ist mit einem Fehlercode zurückgekehrt (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Unterprozess %s hat sich unerwartet beendet" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "Konnte Datei %s nicht öffnen" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "Lesen, habe noch %lu zu lesen aber nichts mehr da" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "Schreiben, habe noch %lu zu schreiben, konnte aber nicht" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "Beim Schließen der Datei trat ein Problem auf" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "Beim Unlinking der Datei trat ein Problem auf" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "Beim Synchronisieren einer Datei trat ein Problem auf" @@ -2476,7 +2484,7 @@ msgstr "Typ „%s“ ist unbekannt in Zeile %u der Quellliste %s" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Missgestaltete Zeile %u in Quellliste %s („vendor id“)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2513,6 +2521,14 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Kann Probleme nicht korrigieren, Sie haben gehaltene kaputte Pakete." +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Einige Indexdateien konnten nicht heruntergeladen werden, sie wurden " +"ignoriert oder alte an ihrer Stelle benutzt." + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2545,19 +2561,19 @@ msgstr "Der Treiber für Methode %s konnte nicht gefunden werden." msgid "Method %s did not start correctly" msgstr "Methode %s hat nicht korrekt gestartet" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Bitte legen Sie das Medium mit dem Namen „%s“ in Laufwerk „%s“ und drücken " "Sie die Eingabetaste." -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketierungssystem „%s“ wird nicht unterstützt" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Kann keinen passenden Paketierungssystem-Typ bestimmen" @@ -2572,13 +2588,13 @@ msgstr "" "Sie müssen einige „source“-URIs für Quellen in die sources.list-Datei " "schreiben." -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Die Paketliste oder die Statusdatei konnte nicht geparst oder geöffnet " "werden." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "Probieren Sie „apt-get update“, um diese Probleme zu korrigieren." @@ -2697,26 +2713,26 @@ msgstr "Sammle Datei-Empfehlungen ein" msgid "IO Error saving source cache" msgstr "E/A-Fehler beim Sichern des Quellcaches" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "MD5-Summe stimmt nicht" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5-Summe stimmt nicht" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Es gibt keine öffentlichen Schlüssel für die folgenden Schlüssel-IDs:\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2725,7 +2741,7 @@ msgstr "" "Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie " "dieses Paket von Hand korrigieren müssen (aufgrund fehlender Architektur)." -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2734,14 +2750,14 @@ msgstr "" "Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie " "dieses Paket von Hand korrigieren müssen." -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Die Paketindexdateien sind korrumpiert: Kein Filename:-Feld für Paket %s." -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "Größe stimmt nicht" @@ -2854,71 +2870,78 @@ msgstr "" "Es wurden %i Datensätze mit %i fehlenden und %i nicht passenden Dateien " "geschrieben.\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Listenverzeichnis %spartial fehlt." -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "%s wird vorbereitet" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "%s wird entpackt" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "Konfiguration von %s wird vorbereitet" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "Konfiguriere %s" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Fehler beim Verarbeiten von Verzeichnis %s" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "%s installiert" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "Entfernen von %s wird vorbereitet" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "%s wird entfernt" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "%s entfernt" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "Komplettes Entfernen von %s wird vorbereitet" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "%s komplett entfernt" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 #, fuzzy msgid "Could not patch file" diff --git a/po/dz.po b/po/dz.po index 13112e4ab..dbd2f0014 100644 --- a/po/dz.po +++ b/po/dz.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po.pot\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2006-09-19 09:49+0530\n" "Last-Translator: Kinley Tshering \n" "Language-Team: Dzongkha \n" @@ -162,7 +162,7 @@ msgstr "%4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s་གི་དོན་ལུ་%s %sགུར་ཕྱོགས་སྒྲིག་འབད་ཡོད་པའི་%s %s\n" @@ -663,7 +663,7 @@ msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི msgid "Y" msgstr "ཝའི།" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s" @@ -826,12 +826,12 @@ msgstr "ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་བཏ msgid "Internal error, Ordering didn't finish" msgstr "ནང་འཁོད་འཛོལ་བ་ གོ་རིམ་བཟོ་ནི་ཚུ་མཇུག་མ་བསྡུ་བས།" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབས་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "འབྱུང་ཁུངས་ཚུ་ཀྱི་ཐོ་ཡིག་དེ་ལྷག་མི་ཚུགས་པས།" @@ -861,7 +861,7 @@ msgstr "ཁ་སྐོང་གི་%sB་འདི་བཤུབ་པའི msgid "After this operation, %sB disk space will be freed.\n" msgstr "%sB་འདི་ཤུབ་པའི་ཤུལ་ལས་ཀྱི་བར་སྟོང་དེ་དལཝ་སྦེ་ལུས་འོང་།\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s་ནང་བར་སྟོང་" @@ -898,7 +898,7 @@ msgstr "བར་བཤོལ་འབད།" msgid "Do you want to continue [Y/n]? " msgstr "ཁྱོན་ཀྱི་འཕྲོ་མཐུད་ནི་འབད་ནི་ཨིན་ན་[Y/n]?" -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n" @@ -907,7 +907,7 @@ msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བ msgid "Some files failed to download" msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "ཕབ་ལེན་ཐབས་ལམ་རྐྱངམ་གཅིག་ནང་མཇུག་བསྡུཝ་སྦེ་རང་ཕབ་ལེན་འབད།" @@ -1014,73 +1014,65 @@ msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོ msgid "Unable to lock the list directory" msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"ཟུར་ཐོ་ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ནུག་ འདི་ཚུ་སྣང་མེད་སྦེ་བཞགཔ་མ་ཚད་ ཚབ་ལུ་" -"རྙིངམ་འདི་ཚུ་ལག་ལེན་འཐབ་ནུག" - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "འོག་གི་བརྡ་དོན་དེ་གིས་དུས་སྐབས་འདི་མོས་མཐུན་བཟོ་ནི་ལུ་གྲོགས་རམ་འབད་འོང་:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "ནང་འགོད་འཛོལ་བ་ ཡར་བསྐྱེད་ཀྱི་ཅ་ཆས་ཆ་མཉམ་མེདཔ་ཐལ་ཡོད།" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "དྲན་འཛིན་ རི་ཇེགསི་'%s'གི་དོན་ལུ་%s་སེལ་འཐུ་འབད་དོ།\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "འདི་ཚུ་ནོར་བཅོས་འབད་ནིའི་དོན་ལུ་ཁྱོད་ཀྱི་`apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་:" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1088,7 +1080,7 @@ msgstr "" "མ་ཚང་བའི་རྟེན་འབྲེལ་ ཐུས་སྒྲིལ་མེད་མི་ཚུ་དང་གཅིག་ཁར་ 'apt-get -f install'དེ་འབཐ་རྩོལ་བསྐྱེདཔ།" "(ཡང་ན་ཐབས་ཤེས་ཅིག་གསལ་བཀོད་འབད།)" -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1099,7 +1091,7 @@ msgstr "" "འབད་འབདཝ་འོང་ནི་མས་ ཡང་ན་ད་ལྟོ་ཡང་གསར་བསྐྲུན་མ་འབད་བར་ཡོད་པའི་ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་ཡང་ན་ནང་" "འབྱོར་གྱི་ཕྱི་ཁར་རྩ་བསྐྲད་བཏང་ཡོད་པའི་རྩ་བརྟན་མེད་པའི་བགོ་འགྲེམ་ཚུ་ལག་ལེན་འཐབ་དོ་ཡོདཔ་འོང་ནི་ཨིན་པས།" -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1108,122 +1100,137 @@ msgstr "" "ད་ཚུན་ཁྱོད་ཀྱི་བཀོལ་སྤྱོད་རྐྱང་པ་ཅིག་རྐྱང་པ་ རྐྱངམ་ཅིག་ཞུ་བ་འབད་ཡོདཔ་ལས་ ཧ་ཅང་གི་ཐུམ་སྒྲིལ་འདི་གཞི་" "བཙུགས་འབད་མི་བཏུབ་ནི་དེ་སྲིད་ནི་བཟུམ་ཅིག་དང་ཐུམ་སྒྲིལ་དི་གི་ཁ་ཐད་དུ་རྐྱེན་གྱི་སྙན་ཞུ་འདི་བཀང་བཞག་དགོ" -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ།" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཐེབས་ཚུ་གཞི་བཙུགས་འབད་འོང་:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "བསམ་འཆར་བཀོད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "འོས་སྦྱོར་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "འབད་ཚར་ཡི།" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "%s་གི་དོན་ལུ་འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་ཅིག་འཚོལ་མ་འཐོབ" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr " %s་ནང་ཁྱོད་ལུ་བར་སྟོང་ཚུ་ལངམ་སྦེ་མིན་འདུག་" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB་ལེན་དགོཔ་འདུག་ འབྱུང་ཁུངས་ཡིག་མཛོད་ཀྱི་%sB།\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "འབྱུང་ཁུངས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསས།\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "%s་འབྱུང་ཁུངས་ལེན།\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ།\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འཐུས་ཤོར་བྱུང་ནུག" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགས།" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1232,32 +1239,32 @@ msgstr "" "%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་སྐོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་ཐུམ་སྒརིལ་%s་གི་འཐོན་རིམ་" "ཚུ་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་འཐོན་རིམ་དགོས་མཁོ་ཚུ་གི་རེ་བ་དོ་སྐོང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%s:གི་དོན་ལུ་%s་རྟེན་འབྲེལ་དེ་གི་རེ་བ་སྐོང་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན་ གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་" "སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པས།" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འཐུས་ཤོར་བྱུང་ནུག" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1576,7 +1583,7 @@ msgstr "ཐུམ་སྒྲིལ་%s་ནང་ལུ་་ཡིག་ས #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "%s་འདི་ལུ་ལྷག་མ་ཚུགས།" @@ -1808,7 +1815,7 @@ msgstr "མཐུད་ལམ་ངལ་མཚམས" msgid "Server closed the connection" msgstr "སར་བར་གྱིས་མཐུད་ལམ་འདི་ཁ་བསྡམས་ཏེ་ཡོདཔ་ཨིན།" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "འཛོལ་བ་ལྷབ།" @@ -1820,7 +1827,7 @@ msgstr "ལན་གྱིས་ གནད་ཁོངས་གུར་ལས msgid "Protocol corruption" msgstr "གནད་སྤེལ་ལམ་ལུགས་ ངན་ཅན།" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "འཛོལ་བ་འབྲི།" @@ -1874,7 +1881,7 @@ msgstr "གནད་སྡུད་སོ་ཀེཊི་ མཐུད་ན msgid "Unable to accept connection" msgstr "མཐུད་ལམ་འདི་དང་ལེན་འབད་མ་ཚུགས།" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "ཡིག་སྣོད་ལུ་་དྲྭ་རྟགས་བཀལ་བའི་བསྒང་དཀའ་ངལ།" @@ -1901,39 +1908,39 @@ msgstr "འདྲི་དཔྱད།" msgid "Unable to invoke " msgstr "ལས་བཀོལ་འབད་མ་ཚུགས།" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "%s (%s)་ལུ་མཐུད་དོ།" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "%s (f=%u t=%u p=%u)གི་དོན་ལུ་སོ་ཀེཊི་ཅིག་གསར་བསྐྲུན་འབད་མ་ཚུགས།" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "%s:%s (%s)ལུ་མཐུད་ལམ་དེ་འགོ་འབྱེད་འབད་མ་ཚུགས།" -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr " %s:%s (%s)ལུ་མཐུད་མ་ཚུགས་ མཐུད་ལམ་ངལ་མཚམས།" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr " %s:%s (%s)ལུ་མཐུད་མ་ཚུགས།" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "%s་ལུ་མཐུད་དོ།" @@ -2012,76 +2019,76 @@ msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འད msgid "Read error from %s process" msgstr "%s་ལས་སྦྱོར་ནང་ལས་འཛོལ་བ་ཚུ་ལྷག" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "མགོ་ཡིག་ཚུ་གི་དོན་ལུ་བསྒ྄ག་དོ།" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "%u་ཡིག་འབྲུ་ཚུ་གི་ལྟག་ལས་མགོ་ཡིག་རྐྱང་པ་ཅིག་ཐོབ་ཡོད།" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "མགོ་ཡིག་གི་གྲལ་ཐིག་བྱང་ཉེས།" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ནུས་མེད་ལན་གསལ་གི་མགོ་ཡིག་ཅིག་བཏང་ཡོད།" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "ཨེཆི་ཊི་ཊི་པི་སར་བར་འདི་གིས་ནུས་མེད་ནང་དོན་རིང་-ཚད་ཀྱི་མགོ་ཡིག་ཅིག་བཏང་ཡོད།" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ ནུས་མེད་ ནང་དོན་-ཁྱབ་ཚད་ཀྱི་མགོ་ཡིག་ཅིག་བཏང་ཡོད།" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "འ་ནི་ ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ ཁྱབ་ཚད་ཀྱི་རྒྱབ་སྐྱོར་དེ་ཆད་པ་བཟོ་བཏང་ནུག" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "མ་ཤེས་པའི་ཚེས་རྩ་སྒྲིག" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "སེལ་འཐུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "མཐུད་ལམ་ངལ་མཚམས་འབད་ཡོད།" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "ཨའུཊི་པུཊི་ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "ཡིག་སྣོད་འདི་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ། ཐག་རིང་མཇུག་གི་མཐུད་ལམ་དེ་ཁ་བསྡམས།" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ།" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "མགོ་ཡིག་གནད་སྡུད་བྱང་ཉེས།" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "ནང་འཁོད་འཛོལ་བ།" @@ -2216,6 +2223,7 @@ msgid "Unable to stat the mount point %s" msgstr "སྦྱར་བརྩེགས་ས་ཚིགས་%s་འདི་ངོ་བཤུས་འབད་མ་ཚུགས།" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "%s་ལུ་བསྒྱུར་བཅོས་འབད་མ་ཚུགས།" @@ -2224,71 +2232,71 @@ msgstr "%s་ལུ་བསྒྱུར་བཅོས་འབད་མ་ཚ msgid "Failed to stat the cdrom" msgstr "སི་ཌི་རོམ་འདི་ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "%s ལྷག་ནི་རྐྱངམ་ཅིག་འབད་མི་ལྡེ་མིག་ཡིག་སྣོད་འདི་གི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "ལྡེ་མིག་རྐྱབས་ཡོད་པའི་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "ཨེན་ཨེཕ་ཨེསི་ %s སྦྱར་བརྩེགས་འབད་ཡོད་པའི་ལྡེ་མིག་ཡིག་སྣོད་ཀྱི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "%sལྡེ་མིག་རྐྱབ་ནི་ལེན་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "ཡན་ལག་ལས་སྦྱོར་%s་གིས་འཛོལ་བའི་ཨང་རྟགས་(%u)ཅིག་སླར་ལོག་འབད་ཡོདཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "ཡན་ལག་ལས་སྦྱོར་་%s་གིས་རེ་བ་མེད་པར་ཕྱིར་ཐོན་ཡོདཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "ལྷག་ ད་ལྟོ་ཡང་ལྷག་ནི་ལུ་%lu་ཡོད་འདི་འབདཝ་ད་ཅི་ཡང་ལྷག་ལུས་མིན་འདུག" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "འབྲི་ ད་ལྟོ་ཡང་འབྲི་ནི་ལུ་%lu་ཡོད་འདི་འདབཝ་ད་འབད་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "ཡིག་སྣོད་འདི་འབྲེལལམ་མེདཔ་བཟོ་བའི་བསྒང་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།" @@ -2452,7 +2460,7 @@ msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་ག msgid "Malformed line %u in source list %s (vendor id)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(སིལ་ཚོང་པ་ ཨའི་ཌི)གི་ནང་ན།" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2489,6 +2497,14 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "དཀའ་ངལ་འདི་ནོར་བཅོས་འབད་མ་ཚུགས་ ཁྱོད་ཀྱི་ཐུམ་སྒྲིལ་ཆད་པ་ཚུ་འཆང་འདི་འདུག" +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"ཟུར་ཐོ་ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ནུག་ འདི་ཚུ་སྣང་མེད་སྦེ་བཞགཔ་མ་ཚད་ ཚབ་ལུ་" +"རྙིངམ་འདི་ཚུ་ལག་ལེན་འཐབ་ནུག" + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2521,17 +2537,17 @@ msgstr "ཐབས་ལམ་འདྲེན་བྱེད་%s་འདི་ msgid "Method %s did not start correctly" msgstr "ཐབས་ལམ་ %s འདི་ངེས་བདེན་སྦེ་འགོ་མ་བཙུགས་འབད།" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "ཁ་ཡིག་བཀོད་ཡོད་པའི་ ཌིསི་འདི་བཙུགས་གནང་། '%s'འདྲེན་འཕྲུལ་ནང་'%s' དང་ལོག་ལྡེ་འདི་ཨེབ།་" -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "སྦུང་ཚན་བཟོ་ནིའི་རིམ་ལུགས་ '%s' འདི་ལུ་རྒྱབ་སྐྱོར་མ་འབད་བས།" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "འོས་འབབ་དང་ལྡན་པའི་སྦུང་ཚན་རིམ་ལུགས་ཀྱི་དབྱེ་བ་ཅིག་གཏན་འབེབས་བཟོ་མི་ཚུགས་པས།" @@ -2545,11 +2561,11 @@ msgid "You must put some 'source' URIs in your sources.list" msgstr "" "ཁྱོད་རའི་sources.listགི་ཐོ་ཡིག་ནང་ལུ་ཁྱོད་ཀྱི་ 'འབྱུང་ཁུངས་' ཡུ་ཨར་ཨའི་ཚུ་་ལ་ལུ་ཅིག་བཙུགས་དགོ" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་ཡང་ན་གནས་ཚད་ཡིག་སྣོད་ཚུ་ མིང་དཔྱད་ཡང་ན་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "འ་ནི་དཀའ་ངལ་འདི་ཚུ་སེལ་ནིའི་ལུ་ ཁྱོད་ཀྱི་ apt-get update་དེ་གཡོག་བཀོལ་དགོཔ་འོང་།" @@ -2660,25 +2676,25 @@ msgstr "ཡིག་སྣོད་བྱིན་མི་ཚུ་བསྡུ msgid "IO Error saving source cache" msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོ།" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "%s (%s -> %s)བསྐྱར་མིང་བཏགས་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།" -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 #, fuzzy msgid "Hash Sum mismatch" msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "འོག་གི་ ཨའི་ཌི་་ ལྡེ་མིག་ཚུ་གི་དོན་ལུ་མི་དམང་གི་ལྡེ་མིག་འདི་འཐོབ་མི་ཚུགས་པས:\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2687,7 +2703,7 @@ msgstr "" " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ " "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)" -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2696,14 +2712,14 @@ msgstr "" " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ " "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག " -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "ཐུམ་སྒྲིལ་ ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་ངན་ཅན་འགྱོ་ནུག ཡིག་སྣོད་ཀྱི་མིང་མིན་འདུག: %s་ཐུམ་སྒྲིལ་གྱི་དོན་ལུ་ས་སྒོ།" -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "ཚད་མ་མཐུན།" @@ -2816,71 +2832,78 @@ msgstr "" "%i བྱིག་འགྱོ་ཡོད་པའི་ཡིག་སྣོད་ཚུ་དང་ %iམཐུན་སྒྲིག་མེད་པའི་ཡིག་སྣོད་ཚུ་དང་གཅིག་ཁར་ %i དྲན་ཐོ་འདི་ཚུ་བྲིས་" "ཡོདཔ་ཨིན།\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག" -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "%s་ གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr " %s་ གི་སྦུང་ཚན་བཟོ་བཤོལ་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "%s་ རིམ་སྒྲིག་ལུ་གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "%s་རིམ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "སྣོད་ཐོ་%s་ལས་སྦྱོར་འབདཝ་ད་འཛོལ་བ་འཐོན་ཡི།" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "%s་ རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "%s་རྩ་བསྐྲད་གཏང་དོ།" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "རྩ་བསྐྲད་བཏང་ཡོད་པའི་%s" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 #, fuzzy msgid "Could not patch file" diff --git a/po/el.po b/po/el.po index b6b6f8c7c..4aa8899bc 100644 --- a/po/el.po +++ b/po/el.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_el_new\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2006-01-18 15:16+0200\n" "Last-Translator: Konstantinos Margaritis \n" "Language-Team: Greek \n" @@ -173,7 +173,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s για %s %s είναι μεταγλωττισμένο σε %s %s\n" @@ -673,7 +673,7 @@ msgstr "Αποτυχία μετονομασίας του %s σε %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "σφάλμα μεταγλωτισμου - %s" @@ -837,12 +837,12 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "Εσωτερικό Σφάλμα, η Ταξινόμηση δεν ολοκληρώθηκε" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Αδύνατη η ανάγνωση της λίστας πηγών." @@ -872,7 +872,7 @@ msgstr "Μετά την αποσυμπίεση θα χρησιμοποιηθού msgid "After this operation, %sB disk space will be freed.\n" msgstr "Μετά την αποσυμπίεση θα ελευθερωθούν %sB χώρου από το δίσκο.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s" @@ -909,7 +909,7 @@ msgstr "Εγκατάλειψη." msgid "Do you want to continue [Y/n]? " msgstr "Θέλετε να συνεχίσετε [Ν/ο]; " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Αποτυχία ανάκτησης του %s %s\n" @@ -918,7 +918,7 @@ msgstr "Αποτυχία ανάκτησης του %s %s\n" msgid "Some files failed to download" msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο" @@ -1028,75 +1028,67 @@ msgstr "Η εντολή update δεν παίρνει ορίσματα" msgid "Unable to lock the list directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"Μερικά αρχεία δεν μεταφορτώθηκαν, αγνοήθηκαν ή χρησιμοποιήθηκαν παλαιότερα " -"στη θέση τους." - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "" "Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο " "υλικό" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "Εσωτερικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Αδύνατη η εύρεση του πακέτου %s" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "Αδύνατη η εύρεση του πακέτου %s" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "αλλά το %s πρόκειται να εγκατασταθεί" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Aν τρέξετε 'apt-get f install' ίσως να διορθώσετε αυτά τα προβλήματα:" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1104,7 +1096,7 @@ msgstr "" "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε " "πακέτο (ή καθορίστε μια λύση)." -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1116,7 +1108,7 @@ msgstr "" "διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n" "μετακινηθεί από τα εισερχόμενα." -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1126,120 +1118,135 @@ msgstr "" "το πακέτο αυτό δεν είναι εγκαταστάσιμο και θα πρέπει να κάνετε μια\n" "αναφορά σφάλματος για αυτό το πακέτο." -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "Χαλασμένα πακέτα" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "Προτεινόμενα πακέτα:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "Συνιστώμενα πακέτα:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "Υπολογισμός της αναβάθμισης... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Απέτυχε" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "Ετοιμο" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "" "Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο " "υλικό" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον " "κωδικάτου" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "Μεταφόρτωση Κωδικα %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών." -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "Απέτυχε η εντολή χτισίματος %s.\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "Η απογονική διεργασία απέτυχε" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1247,7 +1254,7 @@ msgid "" msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1256,32 +1263,32 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες " "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s " "είναι νεώτερο" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται." -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "Υποστηριζόμενοι Οδηγοί:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1595,7 +1602,7 @@ msgstr "Το αρχείο %s/%s αντικαθιστά αυτό στο πακέ #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "Αδύνατη η ανάγνωση του %s" @@ -1827,7 +1834,7 @@ msgstr "Λήξη χρόνου σύνδεσης" msgid "Server closed the connection" msgstr "Ο διακομιστής έκλεισε την σύνδεση" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "Σφάλμα ανάγνωσης" @@ -1839,7 +1846,7 @@ msgstr "Το μήνυμα απάντησης υπερχείλισε την εν msgid "Protocol corruption" msgstr "Αλλοίωση του πρωτοκόλλου" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "Σφάλμα εγγραφής" @@ -1893,7 +1900,7 @@ msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδο msgid "Unable to accept connection" msgstr "Αδύνατη η αποδοχή συνδέσεων" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Πρόβλημα κατά το hashing του αρχείου" @@ -1920,39 +1927,39 @@ msgstr "Επερώτηση" msgid "Unable to invoke " msgstr "Αδύνατη η εκτέλεση" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Σύνδεση στο %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Αδύνατη η δημιουργία υποδοχής για το %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Αδύνατη η αρχικοποίηση της σύνδεσης στο %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Αδύνατη η σύνδεση στο %s:%s (%s), λήξη χρόνου σύνδεσης" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Αδύνατη η σύνδεση στο %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Σύνδεση στο %s" @@ -2028,77 +2035,77 @@ msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το msgid "Read error from %s process" msgstr "Σφάλμα ανάγνωσης από τη διεργασία %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Αναμονή επικεφαλίδων" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Λήψη μίας και μόνης γραμμής επικεφαλίδας πάνω από %u χαρακτήρες" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Ελαττωματική γραμμή επικεφαλίδας" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα απάντησης" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Length" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Range" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρως το range" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Άγνωστη μορφή ημερομηνίας" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Η επιλογή απέτυχε" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Λήξη χρόνου σύνδεσης" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "" "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Σφάλμα στην ανάγνωση από το διακομιστή" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Ελαττωματικά δεδομένα επικεφαλίδας" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "Η σύνδεση απέτυχε" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "Εσωτερικό Σφάλμα" @@ -2235,6 +2242,7 @@ msgid "Unable to stat the mount point %s" msgstr "Αδύνατη η εύρεση της κατάστασης του σημείου επαφής %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "Αδύνατη η αλλαγή σε %s" @@ -2243,73 +2251,73 @@ msgstr "Αδύνατη η αλλαγή σε %s" msgid "Failed to stat the cdrom" msgstr "Αδύνατη η εύρεση της κατάστασης του cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Δε θα χρησιμοποιηθεί κλείδωμα για το ανάγνωσης μόνο αρχείο κλειδώματος %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "Αδύνατο το άνοιγμα του αρχείου κλειδώματος %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Δε θα χρησιμοποιηθεί κλείδωμα για το συναρμοσμένο από nfs αρχείο κλειδώματος " "%s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "Αδύνατο το κλείδωμα %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Η υποδιεργασία %s επέστρεψε ένα κωδικός σφάλματος (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Η υποδιεργασία %s εγκατέλειψε απρόσμενα" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "Αδύνατο το άνοιγμα του αρχείου %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "αναγνώστηκαν, απομένουν ακόμη %lu για ανάγνωση αλλά δεν απομένουν άλλα" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "γράφτηκαν, απομένουν %lu για εγγραφή αλλά χωρίς επιτυχία" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "Πρόβλημα κατά την διαγραφή του αρχείου" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου" @@ -2473,7 +2481,7 @@ msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών % msgid "Malformed line %u in source list %s (vendor id)" msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (id κατασκευαστή)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2510,6 +2518,14 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα." +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Μερικά αρχεία δεν μεταφορτώθηκαν, αγνοήθηκαν ή χρησιμοποιήθηκαν παλαιότερα " +"στη θέση τους." + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2542,19 +2558,19 @@ msgstr "Ο οδηγός μεθόδου %s δεν μπορεί να εντοπι msgid "Method %s did not start correctly" msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Παρακαλώ εισάγετε το δίσκο με ετικέτα '%s' στη συσκευή '%s' και πατήστε " "enter." -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Το σύστημα συσκευασίας '%s' δεν υποστηρίζεται" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Αδύνατος ο καθορισμός ενός κατάλληλου τύπου συστήματος πακέτων" @@ -2567,12 +2583,12 @@ msgstr "Αδύνατη η εύρεση της κατάστασης του %s." msgid "You must put some 'source' URIs in your sources.list" msgstr "Πρέπει να τοποθετήσετε μερικά URI 'πηγών' στο sources.list" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Αδύνατο το άνοιγμα ή η ανάλυση των λιστών πακέτων ή του αρχείου κατάστασης." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Ίσως να πρέπει να τρέξετε apt-get update για να διορθώσετε αυτά τα προβλήματα" @@ -2688,25 +2704,25 @@ msgstr "Συλλογή Παροχών Αρχείου" msgid "IO Error saving source cache" msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "απέτυχε η μετονομασία, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "Ανόμοιο MD5Sum" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 #, fuzzy msgid "Hash Sum mismatch" msgstr "Ανόμοιο MD5Sum" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2715,7 +2731,7 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)" -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2724,7 +2740,7 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο." -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2732,7 +2748,7 @@ msgstr "" "Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο " "πακέτο %s." -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "Ανόμοιο μέγεθος" @@ -2843,71 +2859,78 @@ msgstr "Εγιναν %i εγγραφές με %i ασύμβατα αρχεία.\ msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία και %i ασύμβατα αρχεία\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Ο φάκελος λιστών %spartial αγνοείται." -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "Προετοιμασία του %s" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "Ξεπακετάρισμα του %s" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "Προετοιμασία ρύθμισης του %s" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "Ρύθμιση του %s" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Σφάλμα επεξεργασίας του καταλόγου %s" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "Εγκατέστησα το %s" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "Προετοιμασία για την αφαίρεση του %s" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "Αφαιρώ το %s" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "Αφαίρεσα το %s" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Προετοιμασία ρύθμισης του %s" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Αποτυχία διαγραφής του %s" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 #, fuzzy msgid "Could not patch file" diff --git a/po/en_GB.po b/po/en_GB.po index 483a0f827..6ca863c47 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6.46.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2006-10-12 11:07+0100\n" "Last-Translator: Neil Williams \n" "Language-Team: en_GB \n" @@ -158,7 +158,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s %s compiled on %s %s\n" @@ -653,7 +653,7 @@ msgstr "Failed to rename %s to %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "Regex compilation error - %s" @@ -814,12 +814,12 @@ msgstr "Packages need to be removed but remove is disabled." msgid "Internal error, Ordering didn't finish" msgstr "Internal error, Ordering didn't finish" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "Unable to lock the download directory" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "The list of sources could not be read." @@ -847,7 +847,7 @@ msgstr "After unpacking %sB of additional disk space will be used.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "After unpacking %sB disk space will be freed.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "Couldn't determine free space in %s" @@ -884,7 +884,7 @@ msgstr "Abort." msgid "Do you want to continue [Y/n]? " msgstr "Do you want to continue [Y/n]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Failed to fetch %s %s\n" @@ -893,7 +893,7 @@ msgstr "Failed to fetch %s %s\n" msgid "Some files failed to download" msgstr "Some files failed to download" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "Download complete and in download only mode" @@ -998,73 +998,65 @@ msgstr "The update command takes no arguments" msgid "Unable to lock the list directory" msgstr "Unable to lock the list directory" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "The following NEW packages will be installed" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "The following information may help to resolve the situation:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Internal error, problem resolver broke stuff" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, AllUpgrade broke stuff" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Couldn't find package %s" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "Couldn't find package %s" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, selecting %s for regex ‘%s’\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "but %s is to be installed" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "You might want to run ‘apt-get -f install’ to correct these:" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1072,7 +1064,7 @@ msgstr "" "Unmet dependencies. Try ‘apt-get -f install’ with no packages (or specify a " "solution)." -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1084,7 +1076,7 @@ msgstr "" "distribution that some required packages have not yet been created\n" "or been moved out of Incoming." -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1094,115 +1086,130 @@ msgstr "" "the package is simply not installable and a bug report against\n" "that package should be filed." -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "Broken packages" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "The following extra packages will be installed:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "Suggested packages:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "Recommended packages:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "Calculating upgrade... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Failed" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "Done" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "Internal error, problem resolver broke stuff" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "Must specify at least one package for which to fetch source" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "Unable to find a source package for %s" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Skipping already downloaded file '%s'\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "You don't have enough free space in %s" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Need to get %sB/%sB of source archives.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Need to get %sB of source archives.\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "Fetch source %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "Failed to fetch some archives." -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Skipping unpack of already unpacked source in %s\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Unpack command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Check if the 'dpkg-dev' package is installed.\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "Child process failed" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "Must specify at least one package to check builddeps for" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Unable to get build-dependency information for %s" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s has no build depends.\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1211,7 +1218,7 @@ msgstr "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1220,31 +1227,31 @@ msgstr "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Failed to satisfy %s dependency for %s: Installed package %s is too new" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Failed to satisfy %s dependency for %s: %s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Build-dependencies for %s could not be satisfied." -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "Failed to process build dependencies" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "Supported modules:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1554,7 +1561,7 @@ msgstr "File %s/%s overwrites the one in the package %s" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "Unable to read %s" @@ -1786,7 +1793,7 @@ msgstr "Connection timeout" msgid "Server closed the connection" msgstr "Server closed the connection" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "Read error" @@ -1798,7 +1805,7 @@ msgstr "A response overflowed the buffer." msgid "Protocol corruption" msgstr "Protocol corruption" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "Write error" @@ -1852,7 +1859,7 @@ msgstr "Data socket connect timed out" msgid "Unable to accept connection" msgstr "Unable to accept connection" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem hashing file" @@ -1879,39 +1886,39 @@ msgstr "Query" msgid "Unable to invoke " msgstr "Unable to invoke" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Connecting to %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Could not create a socket for %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Cannot initiate the connection to %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Could not connect to %s:%s (%s), connection timed out" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Could not connect to %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Connecting to %s" @@ -1986,76 +1993,76 @@ msgstr "Couldn't open pipe for %s" msgid "Read error from %s process" msgstr "Read error from %s process" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Waiting for headers" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Got a single header line over %u chars" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Bad header line" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "The HTTP server sent an invalid reply header" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "The HTTP server sent an invalid Content-Length header" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "The HTTP server sent an invalid Content-Range header" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "This HTTP server has broken range support" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Unknown date format" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Select failed" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Connection timed out" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Error writing to output file" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Error writing to file" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Error writing to the file" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Error reading from server. Remote end closed connection" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Error reading from server" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Bad header data" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "Connection failed" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "Internal error" @@ -2190,6 +2197,7 @@ msgid "Unable to stat the mount point %s" msgstr "Unable to stat the mount point %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "Unable to change to %s" @@ -2198,70 +2206,70 @@ msgstr "Unable to change to %s" msgid "Failed to stat the cdrom" msgstr "Failed to stat the cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Not using locking for read only lock file %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "Could not open lock file %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Not using locking for nfs mounted lock file %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "Could not get lock %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Waited for %s but it wasn't there" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Sub-process %s received a segmentation fault." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Sub-process %s returned an error code (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Sub-process %s exited unexpectedly" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "Could not open file %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "read, still have %lu to read but none left" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "write, still have %lu to write but couldn't" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "Problem closing the file" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "Problem unlinking the file" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "Problem syncing the file" @@ -2425,7 +2433,7 @@ msgstr "Type ‘%s’ is not known on line %u in source list %s" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Malformed line %u in source list %s (vendor id)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2460,6 +2468,14 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Unable to correct problems, you have held broken packages." +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2492,18 +2508,18 @@ msgstr "The method driver %s could not be found." msgid "Method %s did not start correctly" msgstr "Method %s did not start correctly" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Packaging system ‘%s’ is not supported" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Unable to determine a suitable packaging system type" @@ -2516,11 +2532,11 @@ msgstr "Unable to stat %s." msgid "You must put some 'source' URIs in your sources.list" msgstr "You must put some ‘source’ URIs in your sources.list" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "The package lists or status file could not be parsed or opened." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "You may want to run apt-get update to correct these problems" @@ -2631,25 +2647,25 @@ msgstr "Collecting File Provides" msgid "IO Error saving source cache" msgstr "IO Error saving source cache" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "rename failed, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "MD5Sum mismatch" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum mismatch" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "There is no public key available for the following key IDs:\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2658,7 +2674,7 @@ msgstr "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2667,14 +2683,14 @@ msgstr "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "The package index files are corrupted. No Filename: field for package %s." -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "Size mismatch" @@ -2785,71 +2801,78 @@ msgstr "Wrote %i records with %i mismatched files\n" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Wrote %i records with %i missing files and %i mismatched files\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Lists directory %spartial is missing." -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "Preparing %s" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "Unpacking %s" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "Preparing to configure %s" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "Configuring %s" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Error processing directory %s" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "Installed %s" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "Preparing for removal of %s" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "Removing %s" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "Removed %s" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparing to completely remove %s" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "Completely removed %s" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "Could not patch file" diff --git a/po/es.po b/po/es.po index cf44d35d9..0c5c39268 100644 --- a/po/es.po +++ b/po/es.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6.42.3exp1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2007-06-21 13:06+0200\n" "Last-Translator: Javier Fernandez-Sanguino \n" "Language-Team: Debian Spanish \n" @@ -161,7 +161,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado en %s %s\n" @@ -666,7 +666,7 @@ msgstr "Fall msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilacin de expresiones regulares - %s" @@ -827,12 +827,12 @@ msgstr "Los paquetes necesitan eliminarse pero Remove est msgid "Internal error, Ordering didn't finish" msgstr "Error interno, no termin el ordenamiento" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "No se puede bloquear el directorio de descarga" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "No se pudieron leer las listas de fuentes." @@ -863,7 +863,7 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Se liberarn %sB despus de desempaquetar.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "No pude determinar el espacio libre en %s" @@ -900,7 +900,7 @@ msgstr "Abortado." msgid "Do you want to continue [Y/n]? " msgstr "Desea continuar [S/n]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Imposible obtener %s %s\n" @@ -909,7 +909,7 @@ msgstr "Imposible obtener %s %s\n" msgid "Some files failed to download" msgstr "Algunos archivos no pudieron descargarse" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "Descarga completa y en modo de slo descarga" @@ -1014,20 +1014,12 @@ msgstr "El comando de actualizaci msgid "Unable to lock the list directory" msgstr "No se pudo bloquear el directorio de listas" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"Algunos archivos de ndice no se han podido descargar, se han ignorado,\n" -"o se ha utilizado unos antiguos en su lugar." - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Se supone que no vamos a eliminar cosas, no se pudo iniciar AutoRemover" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1035,11 +1027,11 @@ msgstr "" "Se instalaron de forma automtica los siguientes paquetes y ya no son " "necesarios." -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "Utilice apt-get autoremove para eliminarlos." -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1047,43 +1039,43 @@ msgstr "" "Hmmm. Parece que AutoRemover destruy algo y eso no debera haber pasado. " "Por favor, enve un informe de fallo al programa apt." -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "La siguiente informacin puede ayudar a resolver la situacin:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 msgid "Internal Error, AutoRemover broke stuff" msgstr "Error interno, AutoRemover rompi cosas" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error Interno, AllUpgrade rompi cosas" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, c-format msgid "Couldn't find task %s" msgstr "No se pudo encontrar la tarea %s" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "No se pudo encontrar el paquete %s" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, seleccionando %s para la expresin regular '%s'\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "fijado %s como instalado manualmente.\n" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo:" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1091,7 +1083,7 @@ msgstr "" "Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o " "especifique una solucin)." -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1103,7 +1095,7 @@ msgstr "" "inestable, que algunos paquetes necesarios no han sido creados o han\n" "sido movidos fuera de Incoming." -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1113,119 +1105,134 @@ msgstr "" "paquete simplemente no sea instalable y debera de rellenar un informe de\n" "error contra ese paquete." -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "Paquetes rotos" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "Se instalarn los siguientes paquetes extras:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "Paquetes sugeridos:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "Paquetes recomendados" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "Calculando la actualizacin... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Fall" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "Listo" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "" "Error interno, el sistema de solucin de problemas rompi\n" "algunas cosas" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "Debe especificar al menos un paquete para obtener su cdigo fuente" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "No se pudo encontrar un paquete de fuentes para %s" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Ignorando fichero ya descargado '%s'\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "No tiene suficiente espacio libre en %s" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Necesito descargar %sB/%sB de archivos fuente.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Necesito descargar %sB de archivos fuente.\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "Fuente obtenida %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "No se pudieron obtener algunos archivos." -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fall la orden de desempaquetamiento '%s'.\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Compruebe que el paquete dpkg-dev est instalado.\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fall la orden de construccin '%s'.\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "Fall el proceso hijo" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "" "Debe especificar al menos un paquete para verificar sus\n" "dependencias de construccin" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "No se pudo obtener informacin de dependencias de construccin para %s" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s no tiene dependencias de construccin.\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1234,7 +1241,7 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede \n" "encontrar el paquete %s" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1243,32 +1250,32 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque ninguna versin\n" "disponible del paquete %s satisface los requisitos de versin" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es " "demasiado nuevo" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "No se pudo satisfacer la dependencia %s para %s: %s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No se pudieron satisfacer las dependencias de construccin de %s." -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "No se pudieron procesar las dependencias de construccin" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "Mdulos soportados:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1587,7 +1594,7 @@ msgstr "El archivo %s/%s sobreescribe al que est #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "No pude leer %s" @@ -1820,7 +1827,7 @@ msgstr "La conexi msgid "Server closed the connection" msgstr "El servidor cerr la conexin" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "Error de lectura" @@ -1832,7 +1839,7 @@ msgstr "Una respuesta desbord msgid "Protocol corruption" msgstr "Corrupcin del protocolo" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "Error de escritura" @@ -1886,7 +1893,7 @@ msgstr "Expir msgid "Unable to accept connection" msgstr "No pude aceptar la conexin" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Hay problemas enlazando fichero" @@ -1913,39 +1920,39 @@ msgstr "Consulta" msgid "Unable to invoke " msgstr "No pude invocar " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Conectando a %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "No pude crear un socket para %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "No puedo iniciar la conexin a %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "No pude conectarme a %s:%s (%s), expir tiempo para conexin" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "No pude conectarme a %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Conectando a %s" @@ -2022,76 +2029,76 @@ msgstr "No pude abrir una tuber msgid "Read error from %s process" msgstr "Error de lectura de %s procesos" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Esperando las cabeceras" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Obtuve una sola lnea de cabecera arriba de %u caracteres" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Mala lnea de cabecera" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "El servidor de http envi una cabecera de respuesta invlida" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "El servidor de http envi una cabecera de Content-Length invlida" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "El servidor de http envi una cabecera de Content-Range invlida" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "ste servidor de http tiene el soporte de alcance roto" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Formato de fecha desconocido" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Fall la seleccin" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Expir la conexin" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Error escribiendo al archivo de salida" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Error escribiendo a archivo" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Error escribiendo al archivo" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Error leyendo del servidor, el lado remoto cerr la conexin." -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Error leyendo del servidor" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Mala cabecera Data" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "Fallo la conexin" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "Error interno" @@ -2230,6 +2237,7 @@ msgid "Unable to stat the mount point %s" msgstr "No se puede obtener informacin del punto de montaje %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "No se pudo cambiar a %s" @@ -2238,70 +2246,70 @@ msgstr "No se pudo cambiar a %s" msgid "Failed to stat the cdrom" msgstr "No pude montar el cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "No se utiliza bloqueos para el fichero de bloqueo de slo lectura %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "No se pudo abrir el fichero de bloqueo '%s'" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "No se utilizan bloqueos para el fichero de bloqueo de montaje nfs %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "No se pudo bloquear %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperaba %s pero no estaba all" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "El subproceso %s recibi un fallo de segmentacin." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "El subproceso %s devolvi un cdigo de error (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "El subproceso %s termin de forma inesperada" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "No pude abrir el fichero %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "ledos, todava deba leer %lu pero no queda nada" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "escritos, todava tena que escribir %lu pero no pude hacerlo" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "Problemas cerrando el archivo" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "Hay problemas desligando el fichero %s" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "Hay problemas sincronizando el fichero" @@ -2464,7 +2472,7 @@ msgstr "Tipo '%s' desconocido en la l msgid "Malformed line %u in source list %s (vendor id)" msgstr "Lnea %u mal formada en la lista de fuentes %s (id del fabricante)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2503,6 +2511,14 @@ msgstr "" "No se pudieron corregir los problemas, usted ha retenido paquetes\n" "rotos." +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Algunos archivos de ndice no se han podido descargar, se han ignorado,\n" +"o se ha utilizado unos antiguos en su lugar." + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2535,17 +2551,17 @@ msgstr "No se pudo encontrar el m msgid "Method %s did not start correctly" msgstr "El mtodo %s no se inici correctamente" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Por favor, inserte el disco %s en la unidad %s y presione Intro" -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "El sistema de paquetes '%s' no est soportado" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "No se pudo determinar un tipo de sistema de paquetes adecuado" @@ -2558,13 +2574,13 @@ msgstr "No se pudo leer %s." msgid "You must put some 'source' URIs in your sources.list" msgstr "Debe poner algunos URIs 'fuente' en su sources.list" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" "No se pudieron analizar o abrir las listas de paquetes o el archivo de " "estado." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "Tal vez quiera ejecutar 'apt-get update' para corregir estos problemas" @@ -2681,27 +2697,27 @@ msgstr "Recogiendo archivos que proveen" msgid "IO Error saving source cache" msgstr "Error de E/S guardando cach fuente" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "fall el cambio de nombre, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "La suma MD5 difiere" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 #, fuzzy msgid "Hash Sum mismatch" msgstr "La suma MD5 difiere" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" "No existe ninguna clave pblica disponible para los siguientes " "identificadores de clave:\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2711,7 +2727,7 @@ msgstr "" "que necesita arreglar manualmente este paquete (debido a que falta una " "arquitectura)" -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2720,7 +2736,7 @@ msgstr "" "No se pudo localizar un archivo para el paquete %s. Esto puede significar " "que necesita arreglar manualmente este paquete." -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2728,7 +2744,7 @@ msgstr "" "Los archivos de ndice de paquetes estn corrompidos. El campo 'Filename:' " "no existe para para el paquete %s." -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "El tamao difiere" @@ -2841,71 +2857,78 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "%i registros escritos con %i fichero de menos y %i ficheros mal emparejados\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Falta el directorio de listas %spartial." -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "Preparando %s" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "Desempaquetando %s" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "Preparndose para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "Configurando %s" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Error procesando el directorio %s" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "%s instalado" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "Preparndose para eliminar %s" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "Eliminando %s" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "%s eliminado" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparndose para eliminar completamente %s" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "Se borr completamente %s" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "No pude parchear el fichero" diff --git a/po/eu.po b/po/eu.po index dccb9c784..fd7e5b4fa 100644 --- a/po/eu.po +++ b/po/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_eu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2007-11-27 10:10+0000\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara \n" @@ -160,7 +160,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s %s-rentzat %s %s-ean konpilatua\n" @@ -654,7 +654,7 @@ msgstr "Huts egin du %s izenaren ordez %s ipintzean" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "Adierazpen erregularren konpilazio errorea - %s" @@ -815,12 +815,12 @@ msgstr "Paketeak ezabatu beharra dute baina Ezabatzea ezgaiturik dago." msgid "Internal error, Ordering didn't finish" msgstr "Barne errorea, ez da ordenatzeaz amaitu" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "Ezin da deskarga direktorioa blokeatu" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Ezin izan da Iturburu zerrenda irakurri." @@ -850,7 +850,7 @@ msgstr "Deskonprimitu ondoren, %sB gehiago erabiliko dira diskoan.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Deskonprimitu ondoren, %sB libratuko dira diskoan.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "Ezin da %s(e)n duzun leku librea atzeman." @@ -887,7 +887,7 @@ msgstr "Abortatu." msgid "Do you want to continue [Y/n]? " msgstr "Aurrera jarraitu nahi al duzu [B/e]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ezin da lortu %s %s\n" @@ -896,7 +896,7 @@ msgstr "Ezin da lortu %s %s\n" msgid "Some files failed to download" msgstr "Fitxategi batzuk ezin izan dira deskargatu" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "Deskarga amaituta eta deskarga soileko moduan" @@ -1001,19 +1001,11 @@ msgstr "Eguneratzeko komandoak ez du argumenturik hartzen" msgid "Unable to lock the list directory" msgstr "Ezin da zerrenda direktorioa blokeatu" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"Indize fitxategi batzuk ezin izan dira deskargatu; ez ikusi egin zaie, edo " -"zaharrak erabili dira haien ordez." - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Suposatu ez dugun zerbait ezabatuko da, ezin da AutoRemover abiarazi" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1021,11 +1013,11 @@ msgstr "" "Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago " "behar." -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "'apt-get autoremove' erabili ezabatzeko." -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1033,43 +1025,43 @@ msgstr "" "Hmm, dirudienez AutoRemover-ek gertatu behar ez zen apurtu du\n" "Mesedez programa errore txosten bat bete mesedez." -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "Informazio honek arazoa konpontzen lagun dezake:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 msgid "Internal Error, AutoRemover broke stuff" msgstr "Barne Errorea, AutoRemover-ek zerbait apurtu du" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, c-format msgid "Couldn't find task %s" msgstr "Ezin izan da %s zeregina aurkitu" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "Ezin izan da %s paketea aurkitu" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "%s eskuz instalatua bezala ezarri.\n" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1077,7 +1069,7 @@ msgstr "" "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo " "zehaztu konponbide bat)." -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1089,7 +1081,7 @@ msgstr "" "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n" "Sarrerakoetan (Incoming) egoten jarraituko dute." -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1098,117 +1090,132 @@ msgstr "" "Eragiketa soil bat eskatu duzunez, seguru asko paketea ez da instalagarria\n" "izango, eta pakete horren errorearen berri ematea komeni da." -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "Hautsitako paketeak" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "Ondorengo pakete gehigarriak instalatuko dira:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "Iradokitako paketeak:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "Gomendatutako paketeak:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "Berriketak kalkulatzen... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Huts egin du" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "Eginda" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "Ez daukazu nahikoa leku libre %s(e)n." -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Iturburu artxiboetako %sB/%sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "Eskuratu %s iturburua\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "Huts egin du zenbat artxibo lortzean." -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "Eraikitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "Prozesu umeak huts egin du" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "" "Gutxienez pakete bat zehaztu behar duzu eraikitze mendekotasunak egiaztatzeko" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ezin izan da %s(r)en eraikitze mendekotasunen informazioa eskuratu" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s: ez du eraikitze mendekotasunik.\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1216,7 +1223,7 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1225,32 +1232,32 @@ msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak " "betetzen dituen %3$s paketearen bertsio erabilgarririk" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s " "paketea berriegia da" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s(r)en eraikitze mendekotasunak ezin izan dira bete." -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "Huts egin du eraikitze mendekotasunak prozesatzean" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "Onartutako Moduluak:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1563,7 +1570,7 @@ msgstr "%s/%s fitxategiak %s paketekoa gainidazten du" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "Ezin da %s irakurri" @@ -1799,7 +1806,7 @@ msgstr "Konexioa denboraz kanpo" msgid "Server closed the connection" msgstr "Zerbitzariak konexioa itxi du" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "Irakurketa errorea" @@ -1811,7 +1818,7 @@ msgstr "Erantzun batek bufferrari gainez eragin dio." msgid "Protocol corruption" msgstr "Protokolo hondatzea" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "Idazketa errorea" @@ -1866,7 +1873,7 @@ msgstr "Datu-socket konexioak denbora muga gainditu du" msgid "Unable to accept connection" msgstr "Ezin da konexioa onartu" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Arazoa fitxategiaren hash egitean" @@ -1893,40 +1900,40 @@ msgstr "Kontsulta" msgid "Unable to invoke " msgstr "Ezin da deitu " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Konektatzen -> %s.(%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Ezin izan da socket-ik sortu honentzat: %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Ezin izan da konexioa hasi -> %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" "Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora muga gainditu du" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Ezin izan da konektatu -> %s:%s (%s)" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Konektatzen -> %s..." @@ -2001,76 +2008,76 @@ msgstr "Ezin izan da %s(r)en kanalizazioa ireki" msgid "Read error from %s process" msgstr "Irakurri errorea %s prozesutik" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Goiburuen zain" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Goiburu-lerro bakarra eskuratu da %u karaktereen gainean" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Okerreko goiburu-lerroa" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "http zerbitzariak erantzun goiburu baliogabe bat bidali du." -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "http zerbitzariak Content-Length buru baliogabe bat bidali du" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "http zerbitzariak Content-Range buru baliogabe bat bidali du" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "http zerbitzariak barruti onarpena apurturik du" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Datu formatu ezezaguna" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Hautapenak huts egin du" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Konexioaren denbora muga gainditu da" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Errorea irteerako fitxategian idaztean" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Errorea zerbitzaritik irakurtzean" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Goiburu data gaizki dago" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "Konexioak huts egin du" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "Barne errorea" @@ -2206,6 +2213,7 @@ msgid "Unable to stat the mount point %s" msgstr "Ezin da atzitu %s muntatze puntua" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "Ezin da %s(e)ra aldatu" @@ -2214,73 +2222,73 @@ msgstr "Ezin da %s(e)ra aldatu" msgid "Failed to stat the cdrom" msgstr "Huts egin du CDROMa atzitzean" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Ez da blokeorik erabiltzen ari irakurtzeko soilik den %s blokeo " "fitxategiarentzat" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "Ezin izan da %s blokeo fitxategia ireki" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo fitxategiarentzat" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "Ezin izan da %s blokeoa hartu" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s espero zen baina ez zegoen han" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "%s azpiprozesuak errore kode bat itzuli du (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "%s azpiprozesua ustekabean amaitu da" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "%s fitxategia ezin izan da ireki" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "irakurrita; oraindik %lu irakurtzeke, baina ez da ezer geratzen" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "idatzita; oraindik %lu idazteke, baina ezin da" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "Arazoa fitxategia ixtean" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "Arazoa fitxategia desestekatzean" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "Arazoa fitxategia sinkronizatzean" @@ -2443,7 +2451,7 @@ msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (hornitzaile id-a)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2479,6 +2487,14 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu." +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Indize fitxategi batzuk ezin izan dira deskargatu; ez ikusi egin zaie, edo " +"zaharrak erabili dira haien ordez." + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2511,17 +2527,17 @@ msgstr "Ezin izan da %s metodo kontrolatzailea aurkitu." msgid "Method %s did not start correctly" msgstr "%s metodoa ez da behar bezala abiarazi" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Mesedez sa ''%s' izeneko diska '%s' gailuan eta enter sakatu" -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "'%s' pakete sistema ez da onartzen" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Ezin da pakete sistemaren mota egokirik zehaztu" @@ -2534,11 +2550,11 @@ msgstr "Ezin da %s atzitu." msgid "You must put some 'source' URIs in your sources.list" msgstr "'Iturburu' URI batzuk jarri behar dituzu sources.list-en" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "Pakete zerrenda edo egoera fitxategia ezin dira analizatu edo ireki." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "Beharbada 'apt-get update' exekutatu nahiko duzu arazoak konpontzeko" @@ -2648,24 +2664,24 @@ msgstr "Fitxategiaren erreferentziak biltzen" msgid "IO Error saving source cache" msgstr "S/I errorea iturburu katxea gordetzean" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "huts egin du izen-aldaketak, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "MD5Sum ez dator bat" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 msgid "Hash Sum mismatch" msgstr "Egiaztapena ez dator bat" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "Ez dago gako publiko erabilgarririk hurrengo gako ID hauentzat:\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2674,7 +2690,7 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea. (arkitektura falta delako)" -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2683,7 +2699,7 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea." -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2691,7 +2707,7 @@ msgstr "" "Paketearen indize fitxategiak hondatuta daude. 'Filename:' eremurik ez %s " "paketearentzat." -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "Tamaina ez dator bat" @@ -2804,73 +2820,80 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik.\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, c-format msgid "Directory '%s' missing" msgstr "'%s' direktorioa falta da." -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "%s prestatzen" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "%s irekitzen" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "%s konfiguratzeko prestatzen" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "%s konfiguratzen" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, c-format msgid "Processing triggers for %s" msgstr "%s-ren abiarazleak prozesatzen" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "%s Instalatuta" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "%s kentzeko prestatzen" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "%s kentzen" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "%s kendurik" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "%s guztiz ezabatzeko prestatzen" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "%s guztiz ezabatu da" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Ezin da erregistroa idatzi, openpty() -ek huts egin du (/dev/pts ez dago " "muntaturik?)\n" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "Ezin izan zaio fitxategiari adabakia ezarri" diff --git a/po/fi.po b/po/fi.po index b674adc49..9ec8c25b2 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2006-09-29 16:06+0300\n" "Last-Translator: Tapio Lehtonen \n" "Language-Team: Finnish \n" @@ -160,7 +160,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s laitealustalle %s %s käännöksen päiväys %s %s\n" @@ -657,7 +657,7 @@ msgstr "Nimen muuttaminen %s -> %s ei onnistunut" msgid "Y" msgstr "K" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "Käännösvirhe lausekkeessa - %s" @@ -818,12 +818,12 @@ msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä." msgid "Internal error, Ordering didn't finish" msgstr "Tapahtui sisäinen virhe, järjestäminen keskeytyi" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "Noutokansiota ei saatu lukittua" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Lähteiden luetteloa ei pystynyt lukemaan." @@ -852,7 +852,7 @@ msgstr "Purkamisen jälkeen käytetään %st lisää levytilaa.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Purkamisen jälkeen vapautuu %st levytilaa.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kansion %s vapaan tilan määrä ei selvinnyt" @@ -890,7 +890,7 @@ msgstr "Keskeytä." msgid "Do you want to continue [Y/n]? " msgstr "Haluatko jatkaa [K/e]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Tiedoston %s nouto ei onnistunut %s\n" @@ -899,7 +899,7 @@ msgstr "Tiedoston %s nouto ei onnistunut %s\n" msgid "Some files failed to download" msgstr "Joidenkin tiedostojen nouto ei onnistunut" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "Nouto on valmis ja määrätty vain nouto" @@ -1004,73 +1004,65 @@ msgstr "Komento update ei käytä parametreja" msgid "Unable to lock the list directory" msgstr "Luettelokansiota ei voitu lukita" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"Joidenkin hakemistotiedostojen nouto ei onnistunut, ne on ohitettu tai " -"käytetty vanhoja. " - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Seuraavat UUDET paketit asennetaan:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Sisäinen virhe, resolver rikkoi jotain" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Pakettia %s ei löytynyt" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "Pakettia %s ei löytynyt" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "mutta %s on merkitty asennettavaksi" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1078,7 +1070,7 @@ msgstr "" "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" " "ilmanpaketteja (tai ratkaise itse)." -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1089,7 +1081,7 @@ msgstr "" "jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n" "vielä luotu tai siirretty Incoming-kansiosta." -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1099,116 +1091,131 @@ msgstr "" "paketti ei lainkaan ole asennettavissa ja olisi tehtävä vikailmoitus\n" "tuosta paketista." -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "Rikkinäiset paketit" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "Ehdotetut paketit:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "Suositellut paketit:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "Käsitellään päivitystä ... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Ei onnistunut" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "Valmis" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "Sisäinen virhe, resolver rikkoi jotain" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "Paketin %s lähdekoodipakettia ei löytynyt" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "On noudettava %st lähdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "Nouda lähdekoodi %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "Joidenkin arkistojen noutaminen ei onnistunut." -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Purkukomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "Paketointikomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "Lapsiprosessi kaatui" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "" "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Paketille %s ei ole saatavilla riippuvuustietoja" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1216,7 +1223,7 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1225,32 +1232,32 @@ msgstr "" "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio " "ei vastaa versioriippuvuuksia" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Riippuvutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian " "uusi" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää." -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "Paketointiriippuvuuksien käsittely ei onnistunut" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "Tuetut moduulit:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1561,7 +1568,7 @@ msgstr "Tiedosto %s/%s kirjoitetaan paketista %s tulleen päälle" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "Tiedostoa %s ei voi lukea" @@ -1793,7 +1800,7 @@ msgstr "Yhteys aikakatkaistiin" msgid "Server closed the connection" msgstr "Palvelin sulki yhteyden" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "Lukuvirhe" @@ -1805,7 +1812,7 @@ msgstr "Vastaus aiheutti puskurin ylivuodon." msgid "Protocol corruption" msgstr "Yhteyskäytäntö on turmeltunut" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "Virhe kirjoitettaessa" @@ -1859,7 +1866,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin" msgid "Unable to accept connection" msgstr "Yhteyttä ei voitu hyväksyä" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Pulmia tiedoston hajautuksessa" @@ -1886,39 +1893,39 @@ msgstr "Kysely" msgid "Unable to invoke " msgstr "Käynnistys ei onnistu" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Avataan yhteys %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Pistokeen luonti ei onnistu %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Yhteyden %s avaus ei onnistu: %s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s), yhteys aikakatkaistiin" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s)" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Avataan yhteys %s" @@ -1995,76 +2002,76 @@ msgstr "Putkea %s ei voitu avata" msgid "Read error from %s process" msgstr "Prosessi %s ilmoitti lukuvirheestä" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Odotetaan otsikoita" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Vastaanotettiin yksi otsikkorivi pituudeltaan yli %u merkkiä" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Virheellinen otsikkorivi" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP-palvelin lähetti virheellisen vastausotsikon" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP-palvelin lähetti virheellisen Content-Length-otsikon" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP-palvelin lähetti virheellisen Content-Range-otsikon" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "HTTP-palvelimen arvoaluetuki on rikki" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Tuntematon päiväysmuoto" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Select ei toiminut" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Yhteys aikakatkaistiin" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Tapahtui virhe luettaessa palvelimelta" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Virheellinen otsikkotieto" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "Yhteys ei toiminut" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "Sisäinen virhe" @@ -2199,6 +2206,7 @@ msgid "Unable to stat the mount point %s" msgstr "Komento stat ei toiminut liitoskohdalle %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "Kansioon %s vaihto ei onnistu" @@ -2207,70 +2215,70 @@ msgstr "Kansioon %s vaihto ei onnistu" msgid "Failed to stat the cdrom" msgstr "Komento stat ei toiminut rompulle" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Lukkoa ei käytetä kirjoitussuojatulle tiedostolle %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "Lukkotiedostoa %s ei voitu avata" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Lukitusta ei käytetä NFS-liitetylle tiedostolle %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "Lukkoa %s ei saada" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Odotettiin %s, mutta sitä ei ollut" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Aliprosessi %s aiheutti suojausvirheen." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Aliprosessi %s palautti virhekoodin (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Aliprosessi %s lopetti odottamatta" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "Tiedostoa %s ei voitu avata" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "read, vielä %lu lukematta mutta tiedosto loppui" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "write, vielä %lu kirjoittamatta mutta epäonnistui" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "Pulmia tiedoston sulkemisessa" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "Pulmia tehtäessä tiedostolle unlink" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "Pulmia tehtäessä tiedostolle sync" @@ -2434,7 +2442,7 @@ msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Rivi %u on väärän muotoinen lähdeluettelossa%s (toimittajan tunniste)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2468,6 +2476,14 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty." +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Joidenkin hakemistotiedostojen nouto ei onnistunut, ne on ohitettu tai " +"käytetty vanhoja. " + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2500,17 +2516,17 @@ msgstr "Menetelmän ajuria %s ei löytynyt" msgid "Method %s did not start correctly" msgstr "Menetelmä %s ei käynnistynyt oikein" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Pistä levy nimeltään: \"%s\" asemaan \"%s\" ja paina Enter." -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketointijärjestelmä \"%s\" ei ole tuettu" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Sopivaa paketointijärjestelmän tyyppiä ei saa selvitettyä" @@ -2523,12 +2539,12 @@ msgstr "stat %s ei onnistu." msgid "You must put some 'source' URIs in your sources.list" msgstr "Tiedostossa sources.list on oltava rivejä joissa \"lähde\"-URI" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Pakettiluettelonn tai tilatiedoston avaaminen tai jäsennys epäonnistui." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "Voit haluta suorittaa apt-get update näiden pulmien korjaamiseksi" @@ -2640,25 +2656,25 @@ msgstr "Kootaan tiedostojen tarjoamistietoja" msgid "IO Error saving source cache" msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "MD5Sum ei täsmää" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum ei täsmää" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2667,7 +2683,7 @@ msgstr "" "En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan " "tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)" -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2676,7 +2692,7 @@ msgstr "" "Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan " "tämän paketin itse." -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2684,7 +2700,7 @@ msgstr "" "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-" "kenttää." -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "Koko ei täsmää" @@ -2799,71 +2815,78 @@ msgstr "" "Kirjoitettiin %i tietuetta joissa oli %i puuttuvaa ja %i paritonta " "tiedostoa\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Luettelokansio %spartial puuttuu." -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "Valmistellaan %s" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "Puretaan %s" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "Valmistaudutaan tekemään asetukset: %s" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "Tehdään asetukset: %s" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Tapahtui virhe käsiteltäessa kansiota %s" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "%s asennettu" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "Valmistaudutaan poistamaan %s" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "Poistetaan %s" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "%s poistettu" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "Valmistaudutaan poistamaan %s kokonaan" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "%s poistettiin kokonaan" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "Tiedostoa %s ei voitu avata" diff --git a/po/fr.po b/po/fr.po index b8dc306e7..b55fcf440 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2007-12-17 10:42+0530\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" @@ -159,7 +159,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pour %s compilé sur %s %s\n" @@ -243,11 +243,13 @@ msgstr "" #: cmdline/apt-cdrom.cc:78 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "Veuillez indiquer le nom de ce disque, par exemple « Debian 2.1r1 Disk 1 »" +msgstr "" +"Veuillez indiquer le nom de ce disque, par exemple « Debian 2.1r1 Disk 1 »" #: cmdline/apt-cdrom.cc:93 msgid "Please insert a Disc in the drive and press enter" -msgstr "Veuillez insérer un disque dans le lecteur et appuyez sur la touche Entrée" +msgstr "" +"Veuillez insérer un disque dans le lecteur et appuyez sur la touche Entrée" #: cmdline/apt-cdrom.cc:117 msgid "Repeat this process for the rest of the CDs in your set." @@ -323,7 +325,8 @@ msgstr "Impossible d'écrire sur %s" #: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?" +msgstr "" +"Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?" #: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" @@ -438,7 +441,8 @@ msgstr "Aucune sélection ne correspond" #: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" -msgstr "Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »" +msgstr "" +"Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »" #: ftparchive/cachedb.cc:43 #, c-format @@ -661,7 +665,7 @@ msgstr "Impossible de changer le nom %s en %s" msgid "Y" msgstr "O" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "Erreur de compilation de l'expression rationnelle - %s" @@ -817,18 +821,19 @@ msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés #: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." -msgstr "Les paquets doivent être enlevés mais la désinstallation est désactivée." +msgstr "" +"Les paquets doivent être enlevés mais la désinstallation est désactivée." #: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" msgstr "Erreur interne. Le tri a été interrompu." -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "Impossible de verrouiller le répertoire de téléchargement" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "La liste des sources ne peut être lue." @@ -851,14 +856,15 @@ msgstr "Il est nécessaire de prendre %so dans les archives.\n" #: cmdline/apt-get.cc:847 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "Après cette opération, %so d'espace disque supplémentaires seront utilisés.\n" +msgstr "" +"Après cette opération, %so d'espace disque supplémentaires seront utilisés.\n" #: cmdline/apt-get.cc:850 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Après cette opération, %so d'espace disque seront libérés.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossible de déterminer l'espace disponible sur %s" @@ -899,7 +905,7 @@ msgstr "Annulation." msgid "Do you want to continue [Y/n]? " msgstr "Souhaitez-vous continuer [O/n] ? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossible de récupérer %s %s\n" @@ -908,7 +914,7 @@ msgstr "Impossible de récupérer %s %s\n" msgid "Some files failed to download" msgstr "Certains fichiers n'ont pu être téléchargés." -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "Téléchargement achevé et dans le mode téléchargement uniquement" @@ -922,7 +928,8 @@ msgstr "" #: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" -msgstr "l'option --fix-missing et l'échange de support ne sont pas encore reconnus." +msgstr "" +"l'option --fix-missing et l'échange de support ne sont pas encore reconnus." #: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." @@ -984,7 +991,8 @@ msgstr "Aucun paquet ne correspond au paquet %s" #: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n" +msgstr "" +"La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n" #: cmdline/apt-get.cc:1164 #, c-format @@ -1014,21 +1022,13 @@ msgstr "La commande de mise à jour ne prend pas d'argument" msgid "Unable to lock the list directory" msgstr "Impossible de verrouiller le répertoire de liste" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"Le téléchargement de quelques fichiers d'index a échoué, ils ont été " -"ignorés, ou les anciens ont été utilisés à la place." - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Aucune suppression n'est sensée se produire : impossible de lancer " "« Autoremover »" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1036,11 +1036,11 @@ msgstr "" "Les paquets suivants ont été installés automatiquement et ne sont plus " "nécessaires :" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "Veuillez utiliser « apt-get autoremove » pour les supprimer." -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1049,43 +1049,44 @@ msgstr "" "supprimé quelque chose, ce qui est inattendu. Veuillez envoyer un\n" "rapport de bogue pour le paquet « apt »." -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "L'information suivante devrait vous aider à résoudre la situation : " -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 msgid "Internal Error, AutoRemover broke stuff" -msgstr "Erreur interne, l'outil de suppression automatique a cassé quelque chose." +msgstr "" +"Erreur interne, l'outil de suppression automatique a cassé quelque chose." -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erreur interne, AllUpgrade a cassé le boulot !" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, c-format msgid "Couldn't find task %s" msgstr "Impossible de trouver la tâche %s" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "Impossible de trouver le paquet %s" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, sélectionne %s pour l'expression rationnelle « %s »\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, c-format msgid "%s set to manually installed.\n" msgstr "%s passé en « installé manuellement ».\n" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1093,7 +1094,7 @@ msgstr "" "Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n" "(ou indiquez une solution)." -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1105,7 +1106,7 @@ msgstr "" "la distribution unstable, que certains paquets n'ont pas encore\n" "été créés ou ne sont pas sortis d'Incoming." -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1114,119 +1115,134 @@ msgstr "" "Puisque vous n'avez demandé qu'une seule opération, le paquet n'est\n" "probablement pas installable et vous devriez envoyer un rapport de bogue." -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "Paquets défectueux" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "Les paquets supplémentaires suivants seront installés : " -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "Paquets suggérés :" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "Paquets recommandés :" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "Calcul de la mise à jour... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Échec" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "Fait" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "" "Erreur interne, la tentative de résolution du problème a cassé certaines " "parties" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "Vous devez spécifier au moins un paquet source" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossible de trouver une source de paquet pour %s" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saut du téléchargement du fichier « %s », déjà téléchargé\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "Pas assez d'espace disponible sur %s" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Nécessité de prendre %so/%so dans les sources.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Nécessité de prendre %so dans les sources.\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "Récupération des sources %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "Échec lors de la récupération de quelques archives." -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saut du décompactage des paquets sources déjà décompactés dans %s\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "La commande de décompactage « %s » a échoué.\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "La commande de construction « %s » a échoué.\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "Échec du processus fils" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "" "Il faut spécifier au moins un paquet pour vérifier les dépendances de " "construction" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossible d'obtenir les dépendances de construction pour %s" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s n'a pas de dépendance de construction.\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1235,7 +1251,7 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne " "peut être trouvé" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1244,32 +1260,33 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version " "du paquet %s ne peut satisfaire à la version requise" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Impossible de satisfaire la dépendance %s pour %s : le paquet installé %s " "est trop récent" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Impossible de satisfaire les dépendances %s pour %s : %s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "Les dépendances de compilation pour %s ne peuvent pas être satisfaites." +msgstr "" +"Les dépendances de compilation pour %s ne peuvent pas être satisfaites." -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "Impossible d'activer les dépendances de construction" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "Modules reconnus :" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1445,7 +1462,8 @@ msgstr "" "seules les erreurs" #: dselect/install:103 -msgid "above this message are important. Please fix them and run [I]nstall again" +msgid "" +"above this message are important. Please fix them and run [I]nstall again" msgstr "" "précédant ce message sont importantes. Veuillez les corriger et\n" "démarrer l'[I]nstallation une nouvelle fois." @@ -1585,7 +1603,7 @@ msgstr "Le fichier %s/%s écrase celui inclus dans le paquet %s" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "Impossible de lire %s" @@ -1703,7 +1721,9 @@ msgstr "Ce n'est pas une archive DEB valide, partie « %s » manquante" #: apt-inst/deb/debfile.cc:50 #, c-format msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" -msgstr "Ce n'est pas une archive DEB valide, elle n'a pas de membre « %s », « %s » ou « %s »" +msgstr "" +"Ce n'est pas une archive DEB valide, elle n'a pas de membre « %s », « %s » ou " +"« %s »" #: apt-inst/deb/debfile.cc:110 #, c-format @@ -1806,7 +1826,8 @@ msgstr "" #: methods/ftp.cc:265 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "La commande « %s » du script de connexion a échoué, le serveur a répondu : %s" +msgstr "" +"La commande « %s » du script de connexion a échoué, le serveur a répondu : %s" #: methods/ftp.cc:291 #, c-format @@ -1821,7 +1842,7 @@ msgstr "Dépassement du délai de connexion" msgid "Server closed the connection" msgstr "Le serveur a fermé la connexion" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "Erreur de lecture" @@ -1833,7 +1854,7 @@ msgstr "Une réponse a fait déborder le tampon." msgid "Protocol corruption" msgstr "Corruption du protocole" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "Erreur d'écriture" @@ -1843,7 +1864,8 @@ msgstr "Impossible de créer un connecteur" #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" -msgstr "Impossible de se connecter sur le port de données, délai de connexion dépassé" +msgstr "" +"Impossible de se connecter sur le port de données, délai de connexion dépassé" #: methods/ftp.cc:704 msgid "Could not connect passive socket." @@ -1887,7 +1909,7 @@ msgstr "Délai de connexion au port de données dépassé" msgid "Unable to accept connection" msgstr "Impossible d'accepter une connexion" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problème de hachage du fichier" @@ -1914,39 +1936,39 @@ msgstr "Requête" msgid "Unable to invoke " msgstr "Impossible d'invoquer " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Connexion à %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP : %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Impossible de créer de connexion pour %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Impossible d'initialiser la connexion à %s: %s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Connexion à %s: %s (%s) impossible, délai de connexion dépassé" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Connexion à %s: %s (%s) impossible." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Connexion à %s" @@ -1980,10 +2002,12 @@ msgstr "Impossible d'accéder au porte-clés : « %s »" #: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "E: liste de paramètres trop longue pour Acquire::gpgv::Options. Abandon." +msgstr "" +"E: liste de paramètres trop longue pour Acquire::gpgv::Options. Abandon." #: methods/gpgv.cc:205 -msgid "Internal error: Good signature, but could not determine key fingerprint?!" +msgid "" +"Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erreur interne : signature correcte, mais il est impossible de déterminer " "l'empreinte de la clé." @@ -2025,76 +2049,76 @@ msgstr "Ne parvient pas à ouvrir le tube pour %s" msgid "Read error from %s process" msgstr "Erreur de lecture du processus %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Attente des fichiers d'en-tête" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "J'ai une simple ligne d'en-tête au-dessus du caractère %u" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Mauvaise ligne d'en-tête" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Le serveur http a envoyé une réponse dont l'en-tête est invalide" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Le serveur http a envoyé un en-tête « Content-Length » invalide" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Le serveur http a envoyé un en-tête « Content-Range » invalide" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Ce serveur http possède un support des limites non-valide" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Format de date inconnu" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Sélection défaillante" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Délai de connexion dépassé" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Erreur d'écriture du fichier de sortie" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Erreur d'écriture sur un fichier" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Erreur d'écriture sur le fichier" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Erreur de lecture depuis le serveur distant et clôture de la connexion" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Erreur de lecture du serveur" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Mauvais en-tête de donnée" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "Échec de la connexion" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "Erreur interne" @@ -2231,6 +2255,7 @@ msgid "Unable to stat the mount point %s" msgstr "Impossible de localiser le point de montage %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "Impossible d'accéder à %s" @@ -2239,70 +2264,70 @@ msgstr "Impossible d'accéder à %s" msgid "Failed to stat the cdrom" msgstr "Impossible d'accéder au cédérom." -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Verrou non utilisé pour le fichier %s en lecture seule" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "Impossible d'ouvrir le fichier verrou %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Verrou non utilisé pour le fichier %s se situant sur une partition nfs" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "Impossible de verrouiller %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "A attendu %s mais il n'était pas présent" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Le sous-processus %s a commis une violation d'accès mémoire" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Le sous-processus %s a renvoyé un code d'erreur (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Le sous-processus %s s'est arrêté prématurément" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "Impossible de verrouiller %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "lu(s), %lu restant à lire, mais rien n'est disponible" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "écrit(s), %lu restant à écrire, mais l'écriture est impossible" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "Problème de fermeture du fichier" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "Problème d'effacement du fichier" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "Problème de synchronisation du fichier" @@ -2433,12 +2458,14 @@ msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)" #: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "Ligne %lu mal formée dans la liste des sources %s (distribution absolue)" +msgstr "" +"Ligne %lu mal formée dans la liste des sources %s (distribution absolue)" #: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)" +msgstr "" +"Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)" #: apt-pkg/sourcelist.cc:199 #, c-format @@ -2463,9 +2490,10 @@ msgstr "Le type « %s » est inconnu sur la ligne %u dans la liste des sources #: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "Ligne %u mal formée dans la liste des sources %s (identifiant du fournisseur)" +msgstr "" +"Ligne %u mal formée dans la liste des sources %s (identifiant du fournisseur)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2484,7 +2512,8 @@ msgstr "Le type de fichier d'index « %s » n'est pas accepté" #: apt-pkg/algorithms.cc:247 #, c-format -msgid "The package %s needs to be reinstalled, but I can't find an archive for it." +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" "Le paquet %s doit être réinstallé, mais je ne parviens pas à trouver son " "archive." @@ -2503,6 +2532,14 @@ msgstr "" "Impossible de corriger les problèmes, des paquets défecteux sont en mode " "« garder en l'état »." +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Le téléchargement de quelques fichiers d'index a échoué, ils ont été " +"ignorés, ou les anciens ont été utilisés à la place." + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2535,19 +2572,19 @@ msgstr "Le pilote pour la méthode %s n'a pu être trouvé." msgid "Method %s did not start correctly" msgstr "La méthode %s n'a pas démarré correctement" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Veuillez insérer le disque « %s » dans le lecteur « %s » et appuyez sur la " "touche Entrée." -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Le système de paquet « %s » n'est pas supporté" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Impossible de déterminer un type du système de paquets adéquat" @@ -2558,15 +2595,16 @@ msgstr "Impossible de localiser %s." #: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" -msgstr "Vous devez insérer quelques adresses « sources » dans votre sources.list" +msgstr "" +"Vous devez insérer quelques adresses « sources » dans votre sources.list" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Les listes de paquets ou le fichier « status » ne peuvent être analysés ou " "lus." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "Vous pouvez lancer « apt-get update » pour corriger ces problèmes." @@ -2686,26 +2724,28 @@ msgstr "Assemblage des fichiers listés dans les champs Provides" #: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" -msgstr "Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources" +msgstr "" +"Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "impossible de changer le nom, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "Somme de contrôle MD5 incohérente" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 msgid "Hash Sum mismatch" msgstr "Somme de contrôle de hachage incohérente" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" -msgstr "Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n" +msgstr "" +"Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2715,7 +2755,7 @@ msgstr "" "sans doute que vous devrez corriger ce paquet manuellement (absence " "d'architecture)." -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2724,14 +2764,15 @@ msgstr "" "Je ne suis pas parvenu à localiser un fichier du paquet %s. Ceci signifie " "que vous devrez corriger manuellement ce paquet." -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format -msgid "The package index files are corrupted. No Filename: field for package %s." +msgid "" +"The package index files are corrupted. No Filename: field for package %s." msgstr "" "Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » " "pour le paquet %s." -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "Taille incohérente" @@ -2845,73 +2886,80 @@ msgstr "" "%i enregistrements écrits avec %i fichiers manquants et %i qui ne " "correspondent pas\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, c-format msgid "Directory '%s' missing" msgstr "Répertoire %s inexistant" -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "Préparation de %s" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "Décompression de %s" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "Préparation de la configuration de %s" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "Configuration de %s" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, c-format msgid "Processing triggers for %s" msgstr "Traitement des déclencheurs (« triggers ») pour %s" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "%s installé" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "Préparation de la suppression de %s" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "Suppression de %s" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "%s supprimé" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "Préparation de la suppression complète de %s" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "%s complètement supprimé" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Impossible d'écrire le journal, échec d'openpty()\n" "(/dev/pts est-il monté ?)\n" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "Impossible de corriger le fichier" @@ -2919,4 +2967,3 @@ msgstr "Impossible de corriger le fichier" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Connexion fermée prématurément" - diff --git a/po/gl.po b/po/gl.po index d8f9c845e..82a97d267 100644 --- a/po/gl.po +++ b/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2007-10-29 14:02+0000\n" "Last-Translator: Jacobo Tarrío \n" "Language-Team: Galician \n" @@ -157,7 +157,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para %s compilado en %s %s\n" @@ -662,7 +662,7 @@ msgstr "Non se puido cambiar o nome de %s a %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "Erro na compilación da expresión regular - %s" @@ -823,12 +823,12 @@ msgstr "Hai que eliminar paquetes pero a eliminación está desactivada." msgid "Internal error, Ordering didn't finish" msgstr "Erro interno, a ordeación non rematou" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "Non se puido bloquear o directorio de descargas" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Non se puido ler a lista de orixes." @@ -857,7 +857,7 @@ msgstr "Despois de desempaquetar hanse ocupar %sB de disco adicionais.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Despois de desempaquetar hanse liberar %sB de disco.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "Non se puido determinar o espazo libre en %s" @@ -894,7 +894,7 @@ msgstr "Abortar." msgid "Do you want to continue [Y/n]? " msgstr "¿Quere continuar [S/n]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Non se puido obter %s %s\n" @@ -903,7 +903,7 @@ msgstr "Non se puido obter %s %s\n" msgid "Some files failed to download" msgstr "Non se puido descargar algúns ficheiros" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "Completouse a descarga no modo de só descargas" @@ -1010,32 +1010,24 @@ msgstr "A orde \"update\" non toma argumentos" msgid "Unable to lock the list directory" msgstr "Non se puido bloquear o directorio de listas" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"Non se puido descargar algúns ficheiros de índices; ignoráronse ou " -"empregáronse uns vellos no seu lugar." - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Non se supón que se deban eliminar cousas; non se pode iniciar o " "autoeliminador" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" "Os seguintes paquetes instaláronse automaticamente e xa non son necesarios:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "Empregue \"apt-get autoremove\" para eliminalos." -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1043,43 +1035,43 @@ msgstr "" "Hum, semella que o autoeliminadir destruiu algo, o que non debería\n" "ter ocorrido. Envíe un informe de erro sobre apt." -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "A seguinte información pode axudar a resolver a situación:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 msgid "Internal Error, AutoRemover broke stuff" msgstr "Erro interno, o autoeliminador rompeu cousas" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro interno, AllUpgrade rompeu cousas" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, c-format msgid "Couldn't find task %s" msgstr "Non se puido atopar a tarefa %s" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "Non se puido atopar o paquete %s" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, escóllese %s para a expresión regular \"%s\"\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "%s cambiado a instalado manualmente.\n" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Pode querer executar \"apt-get -f install\" corrixir isto:" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1087,7 +1079,7 @@ msgstr "" "Dependencias incumpridas. Probe \"apt-get -f install\" sen paquetes (ou " "especifique unha solución)." -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1098,7 +1090,7 @@ msgstr "" "unha situación imposible ou, se emprega a distribución inestable, que\n" "algúns paquetes solicitados aínda non se crearon ou moveron de Incoming." -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1107,118 +1099,133 @@ msgstr "" "Xa que só solicitou unha soa operación, é bastante probable que o\n" "paquete non sea instalable e que se deba informar dun erro no paquete." -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "Paquetes rotos" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "Hanse instalar os seguintes paquetes extra:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "Paquetes suxiridos:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "Paquetes recomendados:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "A calcular a actualización... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Fallou" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "Rematado" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "Erro interno, o resolvedor interno rompeu cousas" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "" "Ten que especificar alomenos un paquete para lle descargar o código fonte" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "Non se puido atopar un paquete fonte para %s" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Omítese o ficheiro xa descargado \"%s\"\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "Non hai espazo libre de abondo en %s" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Hai que recibir %sB/%sB de arquivos de fonte.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Hai que recibir %sB de arquivos de fonte.\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "Obter fonte %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "Non se puido recibir algúns arquivos." -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omítese o desempaquetamento do código fonte xa desempaquetado en %s\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fallou a orde de desempaquetamento \"%s\".\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comprobe que o paquete \"dpkg-dev\" estea instalado.\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fallou a codificación de %s.\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "O proceso fillo fallou" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "" "Ten que especificar alomenos un paquete para lle comprobar as dependencias " "de compilación" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Non se puido obter a información de dependencias de compilación de %s" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ten dependencias de compilación.\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1227,7 +1234,7 @@ msgstr "" "A dependencia \"%s\" de %s non se pode satisfacer porque non se pode atopar " "o paquete %s" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1236,32 +1243,32 @@ msgstr "" "A dependencia \"%s\" de %s non se pode satisfacer porque ningunha versión " "dispoñible do paquete %s satisfai os requirimentos de versión" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Non se puido satisfacer a dependencia \"%s\" de %s: O paquete instalado %s é " "novo de máis" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Non se puido satisfacer a dependencia \"%s\" de %s: %s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Non se puideron satisfacer as dependencias de compilación de %s." -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "Non se puido procesar as dependencias de compilación" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "Módulos soportados:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1578,7 +1585,7 @@ msgstr "O ficheiro %s/%s sobrescribe o do paquete %s" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "Non se pode ler %s" @@ -1811,7 +1818,7 @@ msgstr "Tempo esgotado para a conexión" msgid "Server closed the connection" msgstr "O servidor pechou a conexión" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "Erro de lectura" @@ -1823,7 +1830,7 @@ msgstr "Unha resposta desbordou o buffer." msgid "Protocol corruption" msgstr "Corrupción do protocolo" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "Erro de escritura" @@ -1878,7 +1885,7 @@ msgstr "A conexión do socket de datos esgotou o tempo" msgid "Unable to accept connection" msgstr "Non se pode aceptar a conexión" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema ao calcular o hash do ficheiro" @@ -1905,39 +1912,39 @@ msgstr "Petición" msgid "Unable to invoke " msgstr "Non se puido chamar a " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "A conectar a %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Non se puido crear un socket para %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Non se pode iniciar a conexión a %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Non se puido conectar a %s:%s (%s), a conexión esgotou o tempo" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Non se puido conectar a %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "A conectar a %s" @@ -2016,76 +2023,76 @@ msgstr "Non se puido abrir unha canle para %s" msgid "Read error from %s process" msgstr "Erro de lectura do proceso %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "A agardar polas cabeceiras" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Recibiuse unha soa liña de cabeceira en %u caracteres" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Liña de cabeceira incorrecta" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "O servidor HTTP enviou unha cabeceira de resposta non válida" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "O servidor HTTP enviou unha cabeceira Content-Length non válida" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "O servidor HTTP enviou unha cabeceira Content-Range non válida" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Este servidor HTTP ten un soporte de rangos roto" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Formato de data descoñecido" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Fallou a chamada a select" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "A conexión esgotou o tempo" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Erro ao escribir no ficheiro de saída" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Erro ao escribir nun ficheiro" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Erro ao escribir no ficheiro" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Erro ao ler do servidor. O extremo remoto pechou a conexión" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Erro ao ler do servidor" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Datos da cabeceira incorrectos" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "A conexión fallou" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "Erro interno" @@ -2221,6 +2228,7 @@ msgid "Unable to stat the mount point %s" msgstr "Non se pode analizar o punto de montaxe %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "Non se pode cambiar a %s" @@ -2229,70 +2237,70 @@ msgstr "Non se pode cambiar a %s" msgid "Failed to stat the cdrom" msgstr "Non se puido analizar o CD-ROM" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Non se empregan bloqueos para o ficheiro de bloqueo de só lectura %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "Non se puido abrir o ficheiro de bloqueo %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Non se empregan bloqueos para o ficheiro de bloqueo montado por NFS %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "Non se puido obter o bloqueo %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Agardouse por %s pero non estaba alí" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "O subproceso %s recibiu un fallo de segmento." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "O subproceso %s devolveu un código de erro (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "O subproceso %s saíu de xeito inesperado" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "Non se puido abrir o ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "lectura, aínda hai %lu para ler pero non queda ningún" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "escritura, aínda hai %lu para escribir pero non se puido" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "Problema ao pechar o ficheiro" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "Problema ao borrar o ficheiro" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "Problema ao sincronizar o ficheiro" @@ -2455,7 +2463,7 @@ msgstr "O tipo \"%s\" non se coñece na liña %u da lista de fontes %s" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Liña %u mal formada na lista de fontes %s (id de provedor)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2490,6 +2498,14 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Non se poden resolver os problemas, ten retidos paquetes rotos." +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Non se puido descargar algúns ficheiros de índices; ignoráronse ou " +"empregáronse uns vellos no seu lugar." + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2522,17 +2538,17 @@ msgstr "Non se puido atopar o controlador de métodos %s." msgid "Method %s did not start correctly" msgstr "O método %s non se iniciou correctamente" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Introduza o disco etiquetado: \"%s\" na unidade \"%s\" e prema Intro." -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "O sistema de empaquetamento \"%s\" non está soportado" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Non se puido determinar un tipo de sistema de empaquetamento axeitado" @@ -2545,12 +2561,12 @@ msgstr "Non se pode analizar %s." msgid "You must put some 'source' URIs in your sources.list" msgstr "Debe introducir algúns URIs fonte no seu ficheiro sources.list" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Non se puido analizar ou abrir as listas de paquetes ou ficheiro de estado." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "Pode querer executar apt-get update para corrixir estes problemas" @@ -2663,25 +2679,25 @@ msgstr "A recoller as provisións de ficheiros" msgid "IO Error saving source cache" msgstr "Erro de E/S ao gravar a caché de fontes" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "fallou o cambio de nome, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "Os MD5Sum non coinciden" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 msgid "Hash Sum mismatch" msgstr "Os \"hashes\" non coinciden" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Non hai unha clave pública dispoñible para os seguintes IDs de clave:\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2690,7 +2706,7 @@ msgstr "" "Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que " "ten que arranxar este paquete a man. (Falla a arquitectura)" -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2699,7 +2715,7 @@ msgstr "" "Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que " "ten que arranxar este paquete a man." -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2707,7 +2723,7 @@ msgstr "" "Os ficheiros de índices de paquetes están corrompidos. Non hai un campo " "Filename: para o paquete %s." -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "Os tamaños non coinciden" @@ -2821,73 +2837,80 @@ msgstr "" "Graváronse %i rexistros con %i ficheiros que fallan e %i ficheiros que non " "coinciden\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, c-format msgid "Directory '%s' missing" msgstr "O directorio \"%s\" falla" -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "A preparar %s" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "A desempaquetar %s" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "A se preparar para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "A configurar %s" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, c-format msgid "Processing triggers for %s" msgstr "A procesar os disparadores de %s" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "Instalouse %s" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "A se preparar para a eliminación de %s" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "A eliminar %s" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "Eliminouse %s" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "A se preparar para eliminar %s completamente" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "Eliminouse %s completamente" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Non se puido escribir no rexistro, a chamada a openpty() fallou (¿/dev/pts " "non estaba montado?)\n" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "Non se puido parchear o ficheiro" diff --git a/po/he.po b/po/he.po index ea1dd0542..e81cec165 100644 --- a/po/he.po +++ b/po/he.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.25\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2004-06-10 19:58+0300\n" "Last-Translator: Lior Kaplan \n" "Language-Team: Hebrew\n" @@ -156,7 +156,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s בשביל %s %s קומפל על %s %s\n" @@ -554,7 +554,7 @@ msgstr "כשלון בשינוי השם %s ל-%s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -717,12 +717,12 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "לא מצליח לנעול את ספרית ההורדה." -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "רשימת המקורות לא ניתנת לקריאה." @@ -750,7 +750,7 @@ msgstr "אחרי פריסה %sB נוספים יהיו בשימוש.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "אחרי פריסה %sB נוספים ישוחררו.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "אין לך מספיק מקום פנוי ב-%s." @@ -785,7 +785,7 @@ msgstr "בטל." msgid "Do you want to continue [Y/n]? " msgstr "האם אתה רוצה להמשיך? [Y/n]" -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "כשלון בהבאת %s %s\n" @@ -794,7 +794,7 @@ msgstr "כשלון בהבאת %s %s\n" msgid "Some files failed to download" msgstr "כשלון בהורדת חלק מהקבצים" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "ההורדה הסתיימה במסגרת מצב הורדה בלבד." @@ -894,77 +894,71 @@ msgstr "" msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "החבילות החדשות הבאות הולכות להיות מותקנות:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "שגיאה פנימית, כלשון ביצירת %s" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, c-format msgid "Couldn't find task %s" msgstr "" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "אבל %s הולכת להיות מותקנת" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -972,160 +966,175 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "שגיאה פנימית, כלשון ביצירת %s" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1382,7 +1391,7 @@ msgstr "" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "" @@ -1608,7 +1617,7 @@ msgstr "" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "" @@ -1620,7 +1629,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "" @@ -1674,7 +1683,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1701,39 +1710,39 @@ msgstr "" msgid "Unable to invoke " msgstr "" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "" -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "" @@ -1806,76 +1815,76 @@ msgstr "" msgid "Read error from %s process" msgstr "" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "" @@ -2010,6 +2019,7 @@ msgid "Unable to stat the mount point %s" msgstr "" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "" @@ -2018,70 +2028,70 @@ msgstr "" msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "" @@ -2244,7 +2254,7 @@ msgstr "" msgid "Malformed line %u in source list %s (vendor id)" msgstr "" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2273,6 +2283,12 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "" +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2305,17 +2321,17 @@ msgstr "" msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "" @@ -2328,11 +2344,11 @@ msgstr "" msgid "You must put some 'source' URIs in your sources.list" msgstr "" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "" @@ -2442,44 +2458,44 @@ msgstr "" msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 msgid "Hash Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "" @@ -2585,71 +2601,78 @@ msgstr "" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "שגיאה בעיבוד ספריה %s" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, fuzzy, c-format msgid "Installed %s" msgstr "מותקן:" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "" diff --git a/po/hu.po b/po/hu.po index 930b04f4c..3f311af0b 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2006-10-21 11:04+0100\n" "Last-Translator: SZERVÁC Attila \n" "Language-Team: Hungarian \n" @@ -161,7 +161,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s ehhez: %s %s fordítás ideje: %s %s\n" @@ -658,7 +658,7 @@ msgstr "Nem sikerült átnevezni %s-t erre: %s" msgid "Y" msgstr "I" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "Regex fordítási hiba - %s" @@ -819,12 +819,12 @@ msgstr "Csomagokat kellene eltávolítani, de az Eltávolítás nem engedélyeze msgid "Internal error, Ordering didn't finish" msgstr "Belső hiba, a rendezés nem zárult" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "Nem tudom zárolni a letöltési könyvtárat" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "A források listája olvashatatlan." @@ -852,7 +852,7 @@ msgstr "Kicsomagolás után %sB lemezterületet használok fel\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Kicsomagolás után %sB lemezterület szabadul fel.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nem határozható meg a szabad hely itt: %s" @@ -889,7 +889,7 @@ msgstr "Megszakítva." msgid "Do you want to continue [Y/n]? " msgstr "Folytatni akarod [Y/n]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Sikertelen letöltés: %s %s\n" @@ -898,7 +898,7 @@ msgstr "Sikertelen letöltés: %s %s\n" msgid "Some files failed to download" msgstr "Néhány fájlt nem sikerült letölteni" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "A letöltés befejeződött a 'csak letöltés' módban" @@ -1002,73 +1002,65 @@ msgstr "Az update parancsnak nincsenek argumentumai" msgid "Unable to lock the list directory" msgstr "Nem tudom a listakönyvtárat zárolni" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"Néhány index fájl letöltése meghiúsult, ezeket mellőzöm vagy régi " -"változatukat használom." - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Az alábbi ÚJ csomagok lesznek telepítve:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "Az alábbi információ segíthet megoldani a helyzetet:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Belső hiba, hibafeloldó gond" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "Belső hiba, AllUpgrade megsértett valamit" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Az alábbi csomag nem található: %s" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "Az alábbi csomag nem található: %s" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Megjegyzés: %s kiválasztása %s reguláris kifejezéshez\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "de csak %s telepíthető" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Próbáld futtatni az 'apt-get -f install'-t az alábbiak javításához:" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1076,7 +1068,7 @@ msgstr "" "Teljesítetlen függőségek. Próbáld az 'apt-get -f install'-t csomagok nélkül " "(vagy telepítsd a függőségeket is!)." -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1088,7 +1080,7 @@ msgstr "" "használod, akkor néhány igényelt csomag még nem készült el vagy ki\n" "lett mozdítva az Incoming-ból." -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1098,118 +1090,133 @@ msgstr "" "hogy a csomag egyszerűen nem telepíthető és egy hibajelentést kellene\n" "kitölteni a csomaghoz." -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "Törött csomagok" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "Az alábbi extra csomagok kerülnek telepítésre:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "Javasolt csomagok:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "Ajánlott csomagok:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "Frissítés kiszámítása... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Sikertelen" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "Kész" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "Belső hiba, hibafeloldó gond" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "" "Legalább egy csomagot meg kell adnod, aminek a forrását le kell tölteni" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "Nem található forráscsomag ehhez: %s" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "A már letöltött '%s' fájl kihagyása\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "Nincs elég szabad hely itt: %s" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB forrás-archívumot kell letölteni.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB forrás-archívumot kell letölteni.\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "Forrás letöltése: %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "Nem sikerült néhány archívumot letölteni." -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s' kibontási parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Ellenőrizd, hogy a 'dpkg-dev' csomag telepítve van-e.\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "'%s' elkészítési parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "Hiba a gyermekfolyamatnál" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "" "Legalább egy csomagot adj meg, aminek a fordítási függőségeit ellenőrizni " "kell" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nem lehet %s fordítási-függőség információját beszerezni" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "Nincs fordítási függősége a következőnek: %s.\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1218,7 +1225,7 @@ msgstr "" "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomag nem " "található" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1227,32 +1234,32 @@ msgstr "" "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomagnak nincs a " "verzió-követelményt kielégítő elérhető verziója." -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%s függőséget %s csomaghoz nem lehet kielégíteni: %s telepített csomag túl " "friss." -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s függőséget %s csomaghoz nem lehet kielégíteni: %s " -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s építési függőségei nem elégíthetőek ki." -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "Nem sikerült az építési függőségeket feldolgozni" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "Támogatott modulok:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1560,7 +1567,7 @@ msgstr "A(z) %s/%s fájl felülírja a(z) %s csomagban levőt" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "%s nem olvasható" @@ -1792,7 +1799,7 @@ msgstr "Időtúllépés a kapcsolatban" msgid "Server closed the connection" msgstr "A kiszolgáló lezárta a kapcsolatot" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "Olvasási hiba" @@ -1804,7 +1811,7 @@ msgstr "A válasz túlcsordította a puffert." msgid "Protocol corruption" msgstr "Protokoll hiba" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "Írási hiba" @@ -1858,7 +1865,7 @@ msgstr "Az adat sockethez kapcsolódás túllépte az időt" msgid "Unable to accept connection" msgstr "Nem lehet elfogadni a kapcsolatot" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Probléma a fájl hash értékének meghatározásakor" @@ -1885,39 +1892,39 @@ msgstr "Lekérdezés" msgid "Unable to invoke " msgstr "Nem lehet meghívni " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Csatlakozás: %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "socket létrehozása sikertelen ehhez: %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Kapcsolat létrehozása sikertelen ehhez: %s: %s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Időtúllépés miatt nem lehet kapcsolódni a következőhöz: %s: %s (%s)" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Nem tudtam kapcsolódni ehhez: %s: %s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Kapcsolódás: %s" @@ -1990,76 +1997,76 @@ msgstr "Nem lehet csövet nyitni ehhez: %s" msgid "Read error from %s process" msgstr "Olvasási hiba %s folyamattól" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Várakozás a fejlécekre" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Egyetlen fejléc sort kaptam, ami több mint %u karakteres" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Rossz fejléc sor" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "A http kiszolgáló egy érvénytelen válaszfejlécet küldött" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "A http kiszolgáló egy érvénytelen Content-Length fejlécet küldött" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "A http kiszolgáló egy érvénytelen Content-Range fejlécet küldött" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Ez a http szerver támogatja a sérült tartományokat " -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Ismeretlen dátum formátum" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Sikertelen kiválasztás" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Időtúllépés a kapcsolatban" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Hiba a kimeneti fájl írásakor" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Hiba fájl írásakor" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Hiba a fájl írásakor" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Hiba a kiszolgálóról olvasáskor" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Rossz fejlécadat" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "Sikertelen kapcsolódás" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "Belső hiba" @@ -2196,6 +2203,7 @@ msgid "Unable to stat the mount point %s" msgstr "%s csatolási pont nem érhető el" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "Nem sikerült ide váltani: %s" @@ -2204,70 +2212,70 @@ msgstr "Nem sikerült ide váltani: %s" msgid "Failed to stat the cdrom" msgstr "Nem sikerült elérni a CD-ROM-ot." -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Nem zárolom '%s' csak olvasható zárolási fájlt" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "%s zárolási fájl nem nyitható meg" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nem zárolom '%s' NFS-csatlakoztatású zárolási fájlt" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "Nem sikerült zárolni: %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s nem volt itt, ahogy vártam" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "%s alfolyamat szegmentálási hibát okozott." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "%s alfolyamat hibakóddal tért vissza (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "%s alfolyamat váratlanul kilépett" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "Nem lehet megnyitni %s fájlt" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "olvasás, még kellene %lu, de már az összes elfogyott" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "írás, még kiírandó %lu de ez nem lehetséges" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "Hiba a fájl bezárásakor" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "Hiba a fájl leválasztásával" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "Hiba a fájl szinkronizálásakor" @@ -2431,7 +2439,7 @@ msgstr "'%s' típus nem ismert a(z) %u. sorban a(z) %s forráslistában" msgid "Malformed line %u in source list %s (vendor id)" msgstr "A(z) %u. sor hibás %s forráslistában (terjesztő id)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2467,6 +2475,14 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "A problémák nem javíthatók, sérült visszafogott csomagok vannak a rendszeren." +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Néhány index fájl letöltése meghiúsult, ezeket mellőzöm vagy régi " +"változatukat használom." + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2499,17 +2515,17 @@ msgstr "A(z) %s metódus vezérlő nem található." msgid "Method %s did not start correctly" msgstr "A(z) %s metódus nem indult el helyesen" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Tedd be a(z) %s címkéjű lemezt a(z) %s meghajtóba és üss entert" -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "A(z) '%s' csomagrendszer nem támogatott" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "A megfelelő csomagrendszer típus nem határozható meg" @@ -2522,12 +2538,12 @@ msgstr "%s nem érhető el." msgid "You must put some 'source' URIs in your sources.list" msgstr "Néhány 'source' URI-t be kell tenned a sources.list fájlba" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" "A csomaglista vagy az állapot fájl nem dolgozható fel vagy nem olvasható." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "Próbáld futtatni az apt-get update -et, hogy javítsd e hibákat" @@ -2643,25 +2659,25 @@ msgstr "\"Előkészít\" kapcsolatok összegyűjtése" msgid "IO Error saving source cache" msgstr "IO hiba a forrás-gyorsítótár mentésekor" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "sikertelen átnevezés, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "Az MD5Sum nem megfelelő" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 #, fuzzy msgid "Hash Sum mismatch" msgstr "Az MD5Sum nem megfelelő" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "Nincs elérhető nyilvános kulcs az alábbi kulcs azonosítókhoz:\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2670,7 +2686,7 @@ msgstr "" "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel " "kell kijavítani a csomagot. (hiányzó arch. miatt)" -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2679,14 +2695,14 @@ msgstr "" "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel " "kell kijavítani a csomagot." -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "A csomagindex-fájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz." -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "A méret nem megfelelő" @@ -2797,71 +2813,78 @@ msgstr "%i rekord kiírva %i hibásan párosított fájllal\n" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "%i rekord kiírva %i hiányzó és %i hibásan párosított fájllal\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "%spartial listakönyvtár hiányzik." -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "%s előkészítése" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "%s kicsomagolása" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "%s konfigurálásának előkészítése" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "%s konfigurálása" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Hiba a(z) %s könyvtár feldolgozásakor" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "Telepített %s" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "%s eltávolításának előkészítése" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "%s eltávolítása" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "Eltávolított %s" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "%s teljes eltávolítása előkészítése" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "%s teljesen eltávolítva" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "%s fájl foltozása sikertelen" diff --git a/po/it.po b/po/it.po index e3ce6d544..915153202 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2006-10-12 09:27+0200\n" "Last-Translator: Samuele Giovanni Tonon \n" "Language-Team: Italian \n" @@ -157,7 +157,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s per %s %s compilato il %s %s\n" @@ -657,7 +657,7 @@ msgstr "Impossibile rinominare %s in %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "Errore di compilazione della regex - %s" @@ -821,12 +821,12 @@ msgstr "I pacchetti devono essere rimossi ma il remove msgid "Internal error, Ordering didn't finish" msgstr "Errore interno, l'ordinamento non terminato" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "Impossibile creare un lock sulla directory di download" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "La lista dei sorgenti non pu essere letta." @@ -856,7 +856,7 @@ msgstr "Dopo l'estrazione, verranno occupati %sB di spazio su disco.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Dopo l'estrazione, verranno liberati %sB di spazio su disco.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossibile determinare lo spazio libero su %s" @@ -895,7 +895,7 @@ msgstr "Interrotto." msgid "Do you want to continue [Y/n]? " msgstr "Continuare [S/n]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossibile ottenere %s %s\n" @@ -904,7 +904,7 @@ msgstr "Impossibile ottenere %s %s\n" msgid "Some files failed to download" msgstr "Il download di alcuni file fallito" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "Download completato e in modalit download-only" @@ -1011,74 +1011,66 @@ msgstr "Il comando update non accetta argomenti" msgid "Unable to lock the list directory" msgstr "Impossibile creare un lock sulla directory di list" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"Impossibile scaricare alcune file di indice, essi verranno ignorati, oppure " -"si useranno quelli precedenti." - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "I seguenti pacchetti NUOVI (NEW) saranno installati:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: " -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Errore interno, problem resolver ha rotto qualcosa" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "Errore interno, AllUpgrade ha rotto qualcosa" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Impossibile trovare %s" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "Impossibile trovare %s" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, si sta selezionando %s per la regex '%s'\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ma %s sta per essere installato" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" " consigliabile eseguire 'apt-get -f install' per correggere questi problemi:" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1086,7 +1078,7 @@ msgstr "" "Dipendenze non soddisfatte. Provare 'apt-get -f install' senza pacchetti (o " "specificare una soluzione)." -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1098,7 +1090,7 @@ msgstr "" "si sta usando la distribuzione \"unstable\", che alcuni pacchetti\n" "richiesti non sono ancora stati creati o rimossi da incoming." -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1108,117 +1100,132 @@ msgstr "" "il pacchetto semplicemente non sia installabile, si consiglia\n" "di inviare un \"bug report\" per tale pacchetto." -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "Pacchetto non integro" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "I seguenti pacchetti verranno inoltre installati:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "Pacchetti suggeriti:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "Pacchetti raccomandati:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "Calcolo dell'aggiornamento in corso... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Fallito" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "Fatto" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "Errore interno, problem resolver ha rotto qualcosa" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "Bisogna specificare almeno un pacchetto di cui scaricare il sorgente" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossibile trovare un pacchetto sorgente per %s" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Si saltato il file gi scaricato '%s'\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "Lo spazio libero in %s non sufficiente" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr " necessario prendere %sB/%sB di sorgenti.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr " necessario prendere %sB di sorgenti\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "Prelievo del sorgente %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "Non stato possibile scaricare alcuni archivi." -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Si saltata l'estrazione del sorgente gi estratto in %s\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando di estrazione '%s' fallito.\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verificare se il pacchetto 'dpkg-dev' installato.\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando di costruzione '%s' fallito.\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "Processo figlio fallito" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "" "Bisogna specificare almeno un pacchetto di cui controllare la generazione di " "dipendenze" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossibile ottenere informazioni di dipendenza di costruzione per %s" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ha dipendenze di costruzione.\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1227,7 +1234,7 @@ msgstr "" "%s dipendenze per %s non possono essere soddisfatte perch non si trova il " "pacchetto %s" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1236,32 +1243,32 @@ msgstr "" "%s dipendenze per %s non possono essere soddisfatte perch nessuna versione " "del pacchetto %s pu soddisfare le richieste di versione" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "La dipendenza %s per %s non stata soddisfatta: il pacchetto installato %s " " troppo nuovo" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "La dipendenza %s per %s: %s fallita" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Non stato possibile soddisfare le dipendenze di costruzione per %s." -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "Il calcolo delle dipendenze per la costruzione fallito" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "Moduli supportati:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1581,7 +1588,7 @@ msgstr "Il file %s/%s sovrascrive quello nel pacchetto %s" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "Impossibile leggere %s" @@ -1813,7 +1820,7 @@ msgstr "Timeout della connessione" msgid "Server closed the connection" msgstr "Il server ha chiuso la connessione" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "Errore di lettura" @@ -1825,7 +1832,7 @@ msgstr "Una risposta ha superato le dimensioni del buffer." msgid "Protocol corruption" msgstr "Corruzione nel protocollo" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "Errore di scrittura" @@ -1880,7 +1887,7 @@ msgstr "Tempo limite di connessione esaurito per il socket dati" msgid "Unable to accept connection" msgstr "Impossibile accettare connessioni" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problemi nella creazione dell'hash del file" @@ -1907,40 +1914,40 @@ msgstr "Query" msgid "Unable to invoke " msgstr "Impossibile invocare " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Connessione a %s (%s) in corso" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Impossibile creare un socket per %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Impossibile iniziare la connessione a %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" "Impossibile connettersi a %s:%s (%s), tempo limite di connessione esaurito" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Impossibile connettersi a %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Connessione a %s in corso" @@ -2018,77 +2025,77 @@ msgstr "Impossibile aprire una pipe per %s" msgid "Read error from %s process" msgstr "Errore di lettura dal processo %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "In attesa degli header" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Si ottenuto una singola linea di header su %u caratteri" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Linea nell'header non corretta" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Il server HTTP ha inviato un header di risposta non valido" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Il server HTTP ha inviato un Content-Length non valido" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Il server HTTP ha inviato un Content-Range non valido" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Questo server HTTP ha il supporto del range bacato" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Formato della data sconosciuto" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Select fallito" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Tempo limite per la connessione esaurito" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Errore nella scrittura del file di output" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Errore nella scrittura nel file" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Errore nella scrittura nel file" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "" "Errore nella lettura dal server. Il lato remoto ha chiuso la connessione" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Errore nella lettura dal server" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Header dei dati malformato" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "Connessione fallita" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "Errore interno" @@ -2227,6 +2234,7 @@ msgid "Unable to stat the mount point %s" msgstr "Impossibile accedere al mount point %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "Impossibile raggiungere %s" @@ -2235,70 +2243,70 @@ msgstr "Impossibile raggiungere %s" msgid "Failed to stat the cdrom" msgstr "Impossibile accedere al cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Locking disabilitato per il file di lock in sola lettura %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "Impossibile aprire il file di lock %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Lock disabilitato per il file di lock %s nfs montato" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "Impossibile ottenere il lock %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "In attesa per %s ma non presente" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Il sottoprocesso %s ha ricevuto un segmentation fault." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Il sottoprocesso %s ha ritornato un codice d'errore (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Il sottoprocesso %s uscito inaspettatamente" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "Impossibile aprire il file %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "letto, c'erano ancora %lu da leggere ma non e' stato lasciato nulla" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "scrittura, c'erano ancora %lu da scrivere ma non era possibile" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "Si verificato un problema chiudendo il file" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "Si verificato un problema rimuovendo il file" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "Si verificato un problema sincronizzando il file" @@ -2463,7 +2471,7 @@ msgstr "Il tipo '%s' non msgid "Malformed line %u in source list %s (vendor id)" msgstr "La linea %u in %s (vendor id) non corretta" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2499,6 +2507,14 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Impossibile correggere i problemi, ci sono pacchetti rotti bloccati" +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Impossibile scaricare alcune file di indice, essi verranno ignorati, oppure " +"si useranno quelli precedenti." + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2531,19 +2547,19 @@ msgstr "Non msgid "Method %s did not start correctly" msgstr "Il metodo %s non partito correttamente" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Per favore inserire il disco chiamato '%s' nel dispositivo '%s' e premere " "invio." -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Il sistema di archiviazione (packaging) '%s' non supportato" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti" @@ -2556,12 +2572,12 @@ msgstr "Impossibile analizzare %s." msgid "You must put some 'source' URIs in your sources.list" msgstr "Bisogna inserire alcuni URI di tipo 'source' in sources.list" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" "La lista dei pacchetti o il file di status non possono essere letti o aperti." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr " consigliabile eseguire apt-get update per correggere questi problemi" @@ -2681,26 +2697,26 @@ msgstr "Il File Collezionato Fornisce" msgid "IO Error saving source cache" msgstr "Errore di I/O nel salvataggio del cache sorgente" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "rename() fallita: %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "Somma MD5 non corrispondente" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 #, fuzzy msgid "Hash Sum mismatch" msgstr "Somma MD5 non corrispondente" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Non esiste una chiave pubblica disponibile per i seguenti ID di chiave:\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2710,7 +2726,7 @@ msgstr "" "che bisogna correggere manualmente l'errore. (a causa di un'architettura " "mancante)" -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2719,7 +2735,7 @@ msgstr "" "Non stato possibile trovare file per il pacchetto %s. Questo significa che " "bisogna correggere manualmente l'errore." -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2727,7 +2743,7 @@ msgstr "" "I file indice dei pacchetti sono corrotti. Non c' un campo Filename: per il " "pacchetto %s." -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "Le Dimensioni non corrispondono" @@ -2838,71 +2854,78 @@ msgstr "Scritti %i record con %i file senza match\n" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Scritti %i record con %i file mancanti e %i file senza match\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Manca la directory di liste %spartial." -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "Preparazione di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "Scompattamento di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "Preparazione alla configurazione di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "Configurazione di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Errore durante l'analisi della directory %s" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "%s Installato" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "Preparazione per la rimozione di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "Rimozione di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "%s rimosso" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparazione alla rimozione totale di %s in corso" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "Rimozione totale completata %s" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "Impossibile aprire il file %s" diff --git a/po/ja.po b/po/ja.po index f82d4b9e3..890b7ff10 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2007-12-18 21:13+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian Japanese List \n" @@ -157,7 +157,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s コンパイル日時: %s %s\n" @@ -655,7 +655,7 @@ msgstr "%s を %s に名前変更できませんでした" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "正規表現の展開エラー - %s" @@ -818,12 +818,12 @@ msgstr "パッケージを削除しなければなりませんが、削除が無 msgid "Internal error, Ordering didn't finish" msgstr "内部エラー、調整が終わっていません" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "ダウンロードディレクトリをロックできません" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "ソースのリストを読むことができません。" @@ -852,7 +852,7 @@ msgstr "この操作後に追加で %sB のディスク容量が消費されま msgid "After this operation, %sB disk space will be freed.\n" msgstr "この操作後に %sB のディスク容量が解放されます。\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s の空き領域を測定できません" @@ -889,7 +889,7 @@ msgstr "中断しました。" msgid "Do you want to continue [Y/n]? " msgstr "続行しますか [Y/n]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s の取得に失敗しました %s\n" @@ -898,7 +898,7 @@ msgstr "%s の取得に失敗しました %s\n" msgid "Some files failed to download" msgstr "いくつかのファイルの取得に失敗しました" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました" @@ -1005,31 +1005,23 @@ msgstr "update コマンドは引数をとりません" msgid "Unable to lock the list directory" msgstr "list ディレクトリをロックできません" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"いくつかのインデックスファイルのダウンロードに失敗しました。これらは無視され" -"るか、古いものが代わりに使われます。" - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "一連のものを削除するようになっていないので、AutoRemover を開始できません" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" "以下のパッケージが自動でインストールされましたが、もう必要とされていません:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "これらを削除するには 'apt-get autoremove' を利用してください。" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1037,45 +1029,45 @@ msgstr "" "AutoRemover が、本来起きるべきでない何かを壊したようです。\n" "apt にバグ報告を送ってください。" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "以下の情報がこの問題を解決するために役立つかもしれません:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 msgid "Internal Error, AutoRemover broke stuff" msgstr "内部エラー、AutoRemover が何かを破壊しました" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "内部エラー、AllUpgrade が何かを破壊しました" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, c-format msgid "Couldn't find task %s" msgstr "タスク %s が見つかりません" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "パッケージ %s が見つかりません" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意: 正規表現 '%2$s' に対して %1$s を選択しました\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, c-format msgid "%s set to manually installed.\n" msgstr "%s は手動でインストールしたと設定されました。\n" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ" "ません:" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1083,7 +1075,7 @@ msgstr "" "未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法" "を明示してください)。" -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1095,7 +1087,7 @@ msgstr "" "であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n" "動されていないことが考えられます。" -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1105,118 +1097,133 @@ msgstr "" "可能性が高いです。そのため、このパッケージへのバグレポートを送ってくだ\n" "さい。" -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "壊れたパッケージ" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "以下の特別パッケージがインストールされます:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "提案パッケージ:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "推奨パッケージ:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "アップグレードパッケージを検出しています ... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "失敗" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "完了" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "内部エラー、問題リゾルバが何かを破壊しました" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "" "ソースを取得するには少なくともひとつのパッケージ名を指定する必要があります" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "%s のソースパッケージが見つかりません" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "すでにダウンロードされたファイル '%s' をスキップします\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "%s に充分な空きスペースがありません" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB のソースアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "ソース %s を取得\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "いくつかのアーカイブの取得に失敗しました。" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "展開コマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" "'dpkg-dev' パッケージがインストールされていることを確認してください。\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "ビルドコマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "子プロセスが失敗しました" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "" "ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s のビルド依存情報を取得できません" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s にはビルド依存情報が指定されていません。\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1225,7 +1232,7 @@ msgstr "" "パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと" "ができません" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1234,32 +1241,32 @@ msgstr "" "入手可能な %3$s はいずれもバージョンについての要求を満たせないため、%2$s に対" "する %1$s の依存関係を満たすことができません" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%2$s の依存関係 %1$s を満たすことができません: インストールされた %3$s パッ" "ケージは新しすぎます" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s のビルド依存関係を満たすことができませんでした。" -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "ビルド依存関係の処理に失敗しました" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "サポートされているモジュール:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1573,7 +1580,7 @@ msgstr "ファイル %s/%s がパッケージ %s のものを上書きします" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "%s を読み込むことができません" @@ -1807,7 +1814,7 @@ msgstr "接続タイムアウト" msgid "Server closed the connection" msgstr "サーバが接続を切断しました" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "読み込みエラー" @@ -1819,7 +1826,7 @@ msgstr "レスポンスがバッファをオーバフローさせました。" msgid "Protocol corruption" msgstr "プロトコルが壊れています" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "書き込みエラー" @@ -1873,7 +1880,7 @@ msgstr "データソケット接続タイムアウト" msgid "Unable to accept connection" msgstr "接続を accept できません" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "ファイルのハッシュでの問題" @@ -1900,39 +1907,39 @@ msgstr "問い合わせ" msgid "Unable to invoke " msgstr "呼び出せません" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "%s (%s) へ接続しています" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "%s (f=%u t=%u p=%u) に対するソケットを作成できません" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "%s:%s (%s) への接続を開始できません。" -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "%s:%s (%s) へ接続できませんでした。接続がタイムアウトしました" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "%s:%s (%s) へ接続できませんでした。" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "%s へ接続しています" @@ -2006,76 +2013,76 @@ msgstr "%s に対してパイプを開けませんでした" msgid "Read error from %s process" msgstr "%s プロセスからの読み込みエラー" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "ヘッダの待機中です" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "%u 文字を超える 1 行のヘッダを取得しました" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "不正なヘッダ行です" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "http サーバが不正なリプライヘッダを送信してきました" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "http サーバが不正な Content-Length ヘッダを送信してきました" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "http サーバが不正な Content-Range ヘッダを送信してきました" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "http サーバのレンジサポートが壊れています" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "不明な日付フォーマットです" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "select に失敗しました" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "接続タイムアウト" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "出力ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "サーバからの読み込みに失敗しました" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "不正なヘッダです" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "接続失敗" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "内部エラー" @@ -2210,6 +2217,7 @@ msgid "Unable to stat the mount point %s" msgstr "マウントポイント %s の状態を取得できません" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "%s へ変更することができません" @@ -2218,70 +2226,70 @@ msgstr "%s へ変更することができません" msgid "Failed to stat the cdrom" msgstr "cdrom の状態を取得するのに失敗しました" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "読み込み専用のロックファイル %s にロックは使用しません" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "ロックファイル %s をオープンできません" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "nfs マウントされたロックファイル %s にはロックを使用しません" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "ロック %s が取得できませんでした" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s を待ちましたが、そこにはありませんでした" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "子プロセス %s がセグメンテーション違反を受け取りました。" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "子プロセス %s がエラーコード (%u) を返しました" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "子プロセス %s が予期せず終了しました" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "ファイル %s をオープンできませんでした" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "読み込みが %lu 残っているはずですが、何も残っていません" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "あと %lu 書き込む必要がありますが、書き込むことができませんでした" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "ファイルのクローズ中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "ファイルの削除中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "ファイルの同期中に問題が発生しました" @@ -2444,7 +2452,7 @@ msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明 msgid "Malformed line %u in source list %s (vendor id)" msgstr "ソースリスト %2$s の %1$u 行目が不正です (vendor id)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2480,6 +2488,14 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。" +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"いくつかのインデックスファイルのダウンロードに失敗しました。これらは無視され" +"るか、古いものが代わりに使われます。" + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2512,19 +2528,19 @@ msgstr "メソッドドライバ %s が見つかりません。" msgid "Method %s did not start correctly" msgstr "メソッド %s が正常に開始しませんでした" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "'%s' とラベルの付いたディスクをドライブ '%s' に入れて enter を押してくださ" "い。" -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "パッケージングシステム '%s' はサポートされていません" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "適切なパッケージシステムタイプを特定できません" @@ -2537,13 +2553,13 @@ msgstr "%s の状態を取得できません。" msgid "You must put some 'source' URIs in your sources.list" msgstr "sources.list に 'ソース' URI を指定する必要があります" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" "パッケージリストまたはステータスファイルを解釈またはオープンすることができま" "せん。" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "" "これらの問題を解決するためには apt-get update を実行する必要があるかもしれま" @@ -2657,24 +2673,24 @@ msgstr "ファイル提供情報を収集しています" msgid "IO Error saving source cache" msgstr "ソースキャッシュの保存中に IO エラーが発生しました" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "名前の変更に失敗しました。%s (%s -> %s)" -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "MD5Sum が適合しません" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 msgid "Hash Sum mismatch" msgstr "ハッシュサムが適合しません" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2683,7 +2699,7 @@ msgstr "" "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります (存在しないアーキテクチャのため)。" -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2692,7 +2708,7 @@ msgstr "" "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります。" -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2700,7 +2716,7 @@ msgstr "" "パッケージインデックスファイルが壊れています。パッケージ %s に Filename: " "フィールドがありません。" -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "サイズが適合しません" @@ -2814,73 +2830,80 @@ msgstr "" "%i レコードを書き込みました。%i 個のファイルが見つからず、%i 個の適合しない" "ファイルがあります。\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, c-format msgid "Directory '%s' missing" msgstr "ディレクトリ '%s' が見つかりません" -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "%s を準備しています" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "%s を展開しています" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "%s の設定を準備しています" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "%s を設定しています" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, c-format msgid "Processing triggers for %s" msgstr "%s のトリガーを処理しています" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "%s をインストールしました" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "%s の削除を準備しています" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "%s を削除しています" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "%s を削除しました" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "%s を完全に削除する準備をしています" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "%s を完全に削除しました" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "ログに書き込めません。openpty() に失敗しました (/dev/pts がマウントされていな" "い?)\n" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "ファイルにパッチできませんでした" diff --git a/po/km.po b/po/km.po index 611f24263..57320d56f 100644 --- a/po/km.po +++ b/po/km.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_km\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2006-10-10 09:48+0700\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer \n" @@ -162,7 +162,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s សម្រាប់ %s %s បាន​ចងក្រងនៅលើ​%s %s\n" @@ -658,7 +658,7 @@ msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "Regex កំហុស​ការចងក្រង​ - %s" @@ -819,12 +819,12 @@ msgstr "កញ្ចប់ ​ត្រូវការឲ្យ​យក​ច msgid "Internal error, Ordering didn't finish" msgstr "កំហុស​ខាងក្នុង​ ការ​រៀប​តាម​លំដាប់​មិន​បាន​បញ្ចប់ឡើយ" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "មិន​អាច​ចាក់​សោ​ថត​ទាញ​យក​បាន​ឡើយ" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "មិន​អាច​អាន​បញ្ជី​ប្រភព​បាន​ឡើយ​ ។" @@ -852,7 +852,7 @@ msgstr "បន្ទាប់​ពី​ពន្លា​ %sB នៃ​កា msgid "After this operation, %sB disk space will be freed.\n" msgstr "បន្ទាប់​ពី​ពន្លា​ %sB ទំហំ​ថាសនឹង​​ទំនេរ ។ \n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "មិន​អាច​កំណត់​ទំហំ​ទំនេរ​ក្នុង​ %s បានឡើយ" @@ -889,7 +889,7 @@ msgstr "បោះបង់ ។" msgid "Do you want to continue [Y/n]? " msgstr "តើ​អ្នក​ចង់​បន្តឬ​ [បាទ ចាស/ទេ​] ? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s %s\n" @@ -898,7 +898,7 @@ msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រម msgid "Some files failed to download" msgstr "ឯកសារ​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​ទាញ​យក​" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "បានបញ្ចប់ការទាញ​យក​ ហើយ​តែ​ក្នុង​របៀប​​ទាញ​យក​ប៉ុណ្ណោះ" @@ -1003,79 +1003,72 @@ msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ msgid "Unable to lock the list directory" msgstr "មិន​អាច​ចាក់​សោ​ថត​បញ្ជីបានឡើយ" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"ឯកសារ​លិបិក្រម​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​​ទាញ​យក ​ពួកវាត្រូវបាន​មិន​អើពើ​ ឬ ប្រើ​​ឯកសារ​ចាស់​ជំនួសវិញ ​​។" - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "ព័ត៌មាន​ដូចតទៅនេះ អាចជួយ​ដោះស្រាយ​ស្ថានភាព​បាន ៖" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "កំហុស​ខាងក្នុង ការធ្វើឲ្យប្រសើរ​ទាំងអស់បានធ្វើឲ្យ​ឧបករណ៍​ខូច" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "ចំណាំ កំពុង​ជ្រើស​ %s សម្រាប់ regex '%s'\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "អ្នក​ប្រហែល​ជា​ចង់​រត់ `apt-get -f install' ដើម្បី​កែ​ពួក​វា​ទាំង​នេះ ៖" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" "ភាពអស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ 'apt-get -f install' ដោយ​គ្មាន​កញ្ចប់ (ឬ បញ្ជាក់​ដំណោះស្រាយ) ។" -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1087,7 +1080,7 @@ msgstr "" "ដែលបាន​ទាមទារនឹងមិនទាន់បានបង្កើត​ឡើយ​\n" " ឬ ​បានយក​ចេញ​ពីការមកដល់ ។" -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1097,122 +1090,137 @@ msgstr "" "កញ្ចប់ដែលមិនអាចដំឡើងបានដោយងាយ ហើយនិង​ការប្រឆាំងនឹង​របាយការណ៍​កំហុស\n" "កញ្ចប់​នោះ​ គួរតែត្រូវបានបរាជ័យ ។" -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "កញ្ចប់​ដែល​បាន​ខូច​" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "កញ្ចប់​បន្ថែម​ដូចតទៅនេះ នឹងត្រូវបាន​ដំឡើង ៖" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​យោបល់ ៖" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​អនុសាសន៍ ៖" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "បាន​បរាជ័យ" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "ធ្វើរួច​" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "មិន​អាច​រក​កញ្ចប់ប្រភព​​សម្រាប់ %s បានឡើយ" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "កំពុង​រំលង​ឯកសារ​ដែល​បាន​ទាញយក​រួច​ '%s'\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "អ្នក​ពុំ​មាន​ទំហំ​ទំនេរ​គ្រប់គ្រាន់​ទេ​នៅក្នុង​ %s ឡើយ" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "ត្រូវការ​យក​ %sB/%sB នៃ​ប័ណ្ណសារ​ប្រភព ។\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "ត្រូវការ​យក​ %sB នៃ​ប័ណ្ណសារ​ប្រភព​ ។\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "ទៅប្រមូល​ប្រភព​ %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "បរាជ័យ​ក្នុងការទៅប្រមូលយក​ប័ណ្ណសារ​មួយចំនួន ។" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "កំពុង​រំលង​ការស្រាយ​នៃប្រភព​ដែលបានស្រាយរួច​នៅក្នុង %s\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "ពាក្យ​បញ្ជា​ស្រាយ '%s' បាន​បរាជ័យ​ ។\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "សាងសង​ពាក្យ​បញ្ជា​ '%s' បានបរាជ័យ​ ។\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "ដំណើរ​ការ​កូន​បាន​បរាជ័យ​" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "ត្រូវតែ​បញ្ជាក់​យ៉ាងហោចណាស់​មួយកញ្ចប់ដើម្បីពិនិត្យ builddeps សម្រាប់" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "មិន​អាច​សាងសង់​​ព័ត៌មាន​ភាពអស្រ័យ​សម្រាប់ %s" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s មិនមានភាពអាស្រ័យ​ស្ថាបនាឡើយ​ ។\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ " -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1221,30 +1229,30 @@ msgstr "" "ភាពអាស្រ័យ %s សម្រាប់ %s មិនអាច​តម្រូវចិត្តបានទេ ព្រោះ មិនមាន​កំណែ​នៃកញ្ចប់ %s ដែលអាច​តម្រូវចិត្ត​" "តម្រូវការ​កំណែបានឡើយ" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺថ្មីពេក" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s: %s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ភាពអាស្រ័យ​ដែល​បង្កើត​ %s មិន​អាច​បំពេញ​សេចក្ដី​ត្រូវការ​បាន​ទេ ។" -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើត​ភាព​អាស្រ័យ" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ " -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1553,7 +1561,7 @@ msgstr "ឯកសារ​ %s/%s សរសេរជាន់​ពីលើ​ #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "មិន​អាច​អាន​ %s បានឡើយ" @@ -1783,7 +1791,7 @@ msgstr "អស់ពេល​ក្នុងការតភ្ជាប់​" msgid "Server closed the connection" msgstr "ម៉ាស៊ីន​បម្រើ​បាន​បិទ​ការតភ្ជាប់​" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "ការអាន​មានកំហុស" @@ -1795,7 +1803,7 @@ msgstr "ឆ្លើយតប​សតិ​បណ្តោះអាសន្ន msgid "Protocol corruption" msgstr "ការបង្ខូច​ពិធីការ​" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "ការសរសេរ​មានកំហុស" @@ -1849,7 +1857,7 @@ msgstr "ការតភ្ជាប់​រន្ធ​​ទិន្នន័ msgid "Unable to accept connection" msgstr "មិនអាច​ទទួលយក​ការតភ្ជាប់​បានឡើយ" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "បញ្ហា​ធ្វើឲ្យខូច​ឯកសារ" @@ -1876,39 +1884,39 @@ msgstr "សំណួរ​" msgid "Unable to invoke " msgstr "មិន​អាច​ហៅ​ " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "កំពុង​តភ្ជាប់​ទៅ​កាន់​ %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP ៖ %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "មិន​អាច​បង្កើត​រន្ធ​សម្រាប់ %s (f=%u t=%u p=%u) បានឡើយ" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "មិនអាច​ចាប់ផ្ដើម​ការតភ្ជាប់​​ទៅ​កាន់​ %s:%s (%s) បានឡើយ ។" -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "មិន​អាច​តភ្ជាប់​ទៅ​កាន់​ %s:%s (%s) បានឡើយ ការ​តភ្ជាប់​បានអស់​ពេល​" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​ %s:%s (%s) បានឡើយ ។" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "កំពុង​តភ្ជាប់​ទៅកាន់ %s" @@ -1980,76 +1988,76 @@ msgstr "មិន​អាច​បើក​បំពុង​សម្រាប msgid "Read error from %s process" msgstr "អាចន​កំហុស​ពី​ដំណើរការ %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "កំពុង​រង់ចាំ​បឋមកថា" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "យកបន្ទាត់​បឋមកថា​តែមួយ​​ ដែលលើស %u តួអក្សរ" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "ជួរ​បឋមកថា​ខូច​" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើបឋមកថាចម្លើយតបមិនត្រឹមត្រូវ" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើ​​បឋមកថាប្រវែង​​​មាតិកា​មិនត្រឹមត្រូវ​" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើ​បឋមកថា​ជួរ​មាតិកា​មិន​ត្រឹមត្រូវ​" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "ម៉ាស៊ីន​បម្រើ HTTP នេះបាន​ខូច​​​ជួរ​គាំទ្រ​" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "មិនស្គាល់​ទ្រង់ទ្រាយ​កាលបរិច្ឆេទ" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "ជ្រើស​បាន​បរាជ័យ​" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "ការតភ្ជាប់​បាន​អស់ពេល​" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារលទ្ធផល" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារ" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "កំហុសក្នុងការ​សរសេរ​ទៅកាន់​ឯកសារ" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "កំហុស​ក្នុងការ​អាន​ពី​ម៉ាស៊ីនបម្រើ ។ ការបញ្ចប់​ពីចម្ងាយ​បានបិទការតភ្ជាប់" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "កំហុស​ក្នុងការអាន​ពី​ម៉ាស៊ីន​បម្រើ" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "ទិន្នន័យ​បឋមកថា​ខូច" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "កំហុស​ខាង​ក្នុង​" @@ -2184,6 +2192,7 @@ msgid "Unable to stat the mount point %s" msgstr "មិនអាច​ថ្លែង ចំណុចម៉ោន %s បានឡើយ" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "មិនអាច​ប្ដូរទៅ %s បានឡើយ" @@ -2192,70 +2201,70 @@ msgstr "មិនអាច​ប្ដូរទៅ %s បានឡើយ" msgid "Failed to stat the cdrom" msgstr "បរាជ័យក្នុងការ​ថ្លែង ស៊ីឌីរ៉ូម" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "មិន​ប្រើប្រាស់​ការចាក់សោ សម្រាប់តែឯកសារចាក់សោ​ដែលបានតែអានប៉ុណ្ណោះ %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "មិន​អាច​បើក​ឯកសារ​ចាក់សោ​ %s បានឡើយ" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "មិនប្រើ​ការចាក់សោ សម្រាប់ nfs ឯកសារ​ចាក់សោដែលបានម៉ោន%s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "មិន​អាច​ចាក់សោ %s បានឡើយ" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "រង់ចាំប់​ %s ប៉ុន្តែ ​វា​មិន​នៅទីនោះ" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "ដំណើរការ​រង​ %s បានត្រឡប់​ទៅកាន់​កូដ​មាន​កំហុស​ (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "ដំណើរការ​រង​ %s បានចេញ ដោយ​មិន​រំពឹង​ទុក​ " -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "អាន​, នៅតែ​មាន %lu ដើម្បី​អាន​ ប៉ុន្តែ​គ្មាន​អ្វី​នៅសល់" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "សរសេរ​, នៅតែមាន​ %lu ដើម្បី​សរសេរ​ ប៉ុន្តែ​មិន​អាច​" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ​ឯកសារ" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​" @@ -2419,7 +2428,7 @@ msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើប msgid "Malformed line %u in source list %s (vendor id)" msgstr "បន្ទាត់​ Malformed %u ក្នុង​បញ្ជី​ប្រភព​ %s (លេខសម្គាល់​ក្រុមហ៊ុន​លក់)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2453,6 +2462,13 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "មិន​អាច​កែ​បញ្ហាបានទេេ អ្កបានទុក​កញ្ចប់​ដែល​ខូច ។។" +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"ឯកសារ​លិបិក្រម​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​​ទាញ​យក ​ពួកវាត្រូវបាន​មិន​អើពើ​ ឬ ប្រើ​​ឯកសារ​ចាស់​ជំនួសវិញ ​​។" + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2485,17 +2501,17 @@ msgstr "មិនអាច​រកឃើញ​កម្មវិធី​បញ msgid "Method %s did not start correctly" msgstr "វិធីសាស្ត្រ​ %s មិន​អាច​ចាប់​ផ្តើម​ត្រឹមត្រូវ​ទេ​" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "សូម​បញ្ចូល​ស្លាក​ឌីស​ ៖ '%s' ក្នុង​ដ្រាយ​ '%s' ហើយ​សង្កត់​ចូល ។" -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "មិន​គាំទ្រ​ប្រព័ន្ធ​កញ្ចប់'%s' ឡើយ" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "មិនអាច​កំណត់​ប្រភេទ​ប្រព័ន្ធ​កញ្ចប់​ដែល​សមរម្យ​បានឡើយ" @@ -2508,11 +2524,11 @@ msgstr "មិនអាច​ថ្លែង %s បានឡើយ ។" msgid "You must put some 'source' URIs in your sources.list" msgstr "អ្នកត្រូវតែដាក់ 'ប្រភព' URIs មួយចំនួន​នៅក្នុង sources.list របស់អ្នក" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "បញ្ជី​កញ្ចប់​ ឬ ឯកសារ​ស្ថានភាព​មិន​អាចត្រូវបាន​​ញែក ​​ឬ ត្រូវបាន​បើកបានឡើយ​​ ។" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "អ្នកប្រហែលជា​ចង់ភាពទាន់សម័យ apt-get ដើម្បី​កែ​បញ្ហា​ទាំងនេះ" @@ -2623,25 +2639,25 @@ msgstr "ការផ្ដល់​ឯកសារ​ប្រមូលផ្ដ msgid "IO Error saving source cache" msgstr "IO កំហុសក្នុងការររក្សាទុក​ឃ្លាំង​សម្ងាត់​ប្រភព​" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "ប្តូរ​ឈ្មោះ​បានបរាជ័យ​, %s (%s -> %s) ។" -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "MD5Sum មិន​ផ្គួផ្គង​" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum មិន​ផ្គួផ្គង​" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "គ្មាន​កូនសោ​សាធារណៈ​អាច​រក​បាន​ក្នុងកូនសោ IDs ខាងក្រោម​នេះទេ ៖\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2650,7 +2666,7 @@ msgstr "" "ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។ " "(ដោយសារ​​បាត់​ស្ថាបត្យកម្ម)" -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2658,13 +2674,13 @@ msgid "" msgstr "" "ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បានទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។" -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "កញ្ចប់​ឯកសារ​លិបិក្រម​ត្រូវ​បាន​ខូច ។ គ្មាន​ឈ្មោះ​ឯកសារ ៖ វាល​សម្រាប់​កញ្ចប់នេះ​ទេ​ %s ។" -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​" @@ -2775,71 +2791,78 @@ msgstr "បានសរសេរ​ %i កំណត់ត្រា​ជាម msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់​ និង​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​ ​\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។" -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "កំពុងរៀបចំ​ %s" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "កំពុង​ស្រាយ %s" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "កំពុងរៀបចំ​កំណត់រចនាសម្ព័ន្ធ %s" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "កំពុង​កំណត់​រចនា​សម្ព័ន្ធ %s" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "​កំហុស​ដំណើរការ​ថត​ %s" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "បាន​ដំឡើង %s" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "កំពុងរៀបចំដើម្បី​ការយក​ចេញ​នៃ %s" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "កំពុង​យក %s ចេញ" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "បាន​យក %s ចេញ" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "កំពុង​រៀបចំ​យក %s ចេញ​ទាំង​ស្រុង" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 #, fuzzy msgid "Could not patch file" diff --git a/po/ko.po b/po/ko.po index ffbd11b50..a875085ec 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2007-10-29 13:10-0400\n" "Last-Translator: Sunjae Park \n" "Language-Team: Korean \n" @@ -154,7 +154,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s(%s), 컴파일 시각 %s %s\n" @@ -652,7 +652,7 @@ msgstr "%s 파일의 이름을 %s(으)로 바꾸는 데 실패했습니다" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "정규식 컴파일 오류 - %s" @@ -814,12 +814,12 @@ msgstr "꾸러미를 지워야 하지만 지우기가 금지되어 있습니다. msgid "Internal error, Ordering didn't finish" msgstr "내부 오류. 순서변경작업이 끝나지 않았습니다" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "내려받기 디렉토리를 잠글 수 없습니다" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "소스 목록을 읽을 수 없습니다." @@ -849,7 +849,7 @@ msgstr "압축을 풀면 %s바이트의 디스크 공간을 더 사용하게 됩 msgid "After this operation, %sB disk space will be freed.\n" msgstr "압축을 풀면 %s바이트의 디스크 공간이 비워집니다.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다" @@ -889,7 +889,7 @@ msgstr "중단." msgid "Do you want to continue [Y/n]? " msgstr "계속 하시겠습니까 [Y/n]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s 파일을 받는 데 실패했습니다 %s\n" @@ -898,7 +898,7 @@ msgstr "%s 파일을 받는 데 실패했습니다 %s\n" msgid "Some files failed to download" msgstr "일부 파일을 받는 데 실패했습니다" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "내려받기를 마쳤고 내려받기 전용 모드입니다" @@ -1004,31 +1004,23 @@ msgstr "update 명령은 인수를 받지 않습니다" msgid "Unable to lock the list directory" msgstr "목록 디렉토리를 잠글 수 없습니다" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"일부 인덱스 파일을 내려받는 데 실패했습니다. 해당 파일을 무시하거나 과거의 버" -"전을 대신 사용합니다." - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "이 프로그램은 이것저것 지우지 못하게 되어 있으므로 AutoRemover 실행하지 못합" "니다" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "다음 새 꾸러미가 전에 자동으로 설치되었지만 더 이상 필요하지 않습니다:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "이들을 지우기 위해서는 'apt-get autoremove'를 사용하십시오." -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1036,44 +1028,44 @@ msgstr "" "음.. AutoRemover가 뭔가를 부수었는데 이 문제는 실제 나타나서는\n" "안되는 문제입니다. apt에 버그 보고를 해주십시오." -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 msgid "Internal Error, AutoRemover broke stuff" msgstr "내부 오류, 문제 해결 프로그램이 사고쳤습니다" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "내부 오류, AllUpgrade 프로그램이 사고쳤습니다" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, c-format msgid "Couldn't find task %s" msgstr "%s 작업를 찾을 수 없습니다" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "%s 꾸러미를 찾을 수 없습니다" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "주의, 정규식 '%2$s'에 대하여 %1$s을(를) 선택합니다\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "%s 꾸러미 수동설치로 지정합니다.\n" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "다음을 바로잡으려면 `apt-get -f install'을 실행해 보십시오:" # FIXME: specify a solution? 무슨 솔루션? -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1081,7 +1073,7 @@ msgstr "" "의존성이 맞지 않습니다. 꾸러미 없이 'apt-get -f install'을 시도해 보십시오 " "(아니면 해결 방법을 지정하십시오)." -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1092,7 +1084,7 @@ msgstr "" "불안정 배포판을 사용해서 일부 필요한 꾸러미를 아직 만들지 않았거나,\n" "아직 Incoming에서 나오지 않은 경우일 수도 있습니다." -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1101,115 +1093,130 @@ msgstr "" "한 가지 작업만을 요청하셨으므로, 아마도 이 꾸러미를 설치할 수\n" "없는 경우일 것이고 이 꾸러미에 버그 보고서를 제출해야 합니다." -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "망가진 꾸러미" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "다음 꾸러미를 더 설치할 것입니다:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "제안하는 꾸러미:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "추천하는 꾸러미:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "업그레이드를 계산하는 중입니다... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "실패" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "완료" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "내부 오류, 문제 해결 프로그램이 사고쳤습니다" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "해당되는 소스 꾸러미를 가져올 꾸러미를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "%s의 소스 꾸러미를 찾을 수 없습니다" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "%s에 충분한 공간이 없습니다" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "%s 소스를 가져옵니다\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "일부 아카이브를 가져오는 데 실패했습니다." -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "압축 풀기 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' 꾸러미가 설치되었는지를 확인해주십시오.\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "빌드 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "하위 프로세스가 실패했습니다" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "해당되는 빌드 의존성을 검사할 꾸러미를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s 꾸러미에 빌드 의존성이 없습니다.\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1218,7 +1225,7 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1227,32 +1234,32 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미의 사용 가능한 버" "전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: 설치한 %3$s 꾸러미가 너" "무 최근 버전입니다" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: %3$s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s의 빌드 의존성을 만족시키지 못했습니다." -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "빌드 의존성을 처리하는 데 실패했습니다" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "지원하는 모듈:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1564,7 +1571,7 @@ msgstr "%s/%s 파일은 %s 꾸러미에 있는 파일을 덮어 씁니다" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "%s을(를) 읽을 수 없습니다" @@ -1795,7 +1802,7 @@ msgstr "연결 시간 초과" msgid "Server closed the connection" msgstr "서버에서 연결을 닫았습니다" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "읽기 오류" @@ -1807,7 +1814,7 @@ msgstr "응답이 버퍼 크기를 넘어갔습니다." msgid "Protocol corruption" msgstr "프로토콜이 틀렸습니다" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "쓰기 오류" @@ -1861,7 +1868,7 @@ msgstr "데이터 소켓 연결 시간 초과" msgid "Unable to accept connection" msgstr "연결을 받을 수 없습니다" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "파일 해싱에 문제가 있습니다" @@ -1888,39 +1895,39 @@ msgstr "질의" msgid "Unable to invoke " msgstr "다음을 실행할 수 없습니다: " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "%s(%s)에 연결하는 중입니다" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "%s에 대한 소켓을 만들 수 없습니다 (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "%s:%s에 연결을 초기화할 수 없습니다 (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "%s:%s에 연결할 수 없습니다 (%s). 연결 제한 시간이 초과했습니다" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "%s:%s에 연결할 수 없습니다 (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "%s에 연결하는 중입니다" @@ -1992,76 +1999,76 @@ msgstr "%s에 대한 파이프를 열 수 없습니다" msgid "Read error from %s process" msgstr "%s 프로세스에서 읽는 데 오류가 발생했습니다" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "헤더를 기다리는 중입니다" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "헤더 한 줄에 %u개가 넘는 문자가 들어 있습니다" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "헤더 줄이 잘못되었습니다" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP 서버에서 잘못된 응답 헤더를 보냈습니다" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP 서버에서 잘못된 Content-Length 헤더를 보냈습니다" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP 서버에서 잘못된 Content-Range 헤더를 보냈습니다" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "데이터 형식을 알 수 없습니다" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "select가 실패했습니다" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "연결 시간이 초과했습니다" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "출력 파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "해당 파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "서버에서 읽고 연결을 닫는 데 오류가 발생했습니다" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "서버에서 읽는 데 오류가 발생했습니다" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "헤더 데이터가 잘못되었습니다" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "연결이 실패했습니다" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "내부 오류" @@ -2196,6 +2203,7 @@ msgid "Unable to stat the mount point %s" msgstr "마운트 위치 %s의 정보를 읽을 수 없습니다" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "%s 디렉토리로 이동할 수 없습니다" @@ -2204,70 +2212,70 @@ msgstr "%s 디렉토리로 이동할 수 없습니다" msgid "Failed to stat the cdrom" msgstr "CD-ROM의 정보를 읽을 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "읽기 전용 잠금 파일 %s에 대해 잠금을 사용하지 않습니다" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "잠금 파일 %s 파일을 열 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "NFS로 마운트된 잠금 파일 %s에 대해 잠금을 사용하지 않습니다" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "%s 잠금 파일을 얻을 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "하위 프로세스 %s 프로세스가 세그멘테이션 오류를 받았습니다." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "하위 프로세스 %s 프로세스가 오류 코드(%u)를 리턴했습니다" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "하위 프로세스 %s 프로세스가 예상치 못하게 끝났습니다" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "%s 파일을 열 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "%lu만큼 더 읽어야 하지만 더 이상 읽을 데이터가 없습니다" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "%lu만큼 더 써야 하지만 더 이상 쓸 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "파일을 닫는 데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "파일을 지우는 데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "파일을 동기화하는 데 문제가 있습니다" @@ -2430,7 +2438,7 @@ msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니 msgid "Malformed line %u in source list %s (vendor id)" msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (벤더 ID)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2465,6 +2473,14 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "문제를 바로잡을 수 없습니다, 망가진 고정 꾸러미가 있습니다." +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"일부 인덱스 파일을 내려받는 데 실패했습니다. 해당 파일을 무시하거나 과거의 버" +"전을 대신 사용합니다." + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2497,18 +2513,18 @@ msgstr "설치 방법 드라이버 %s을(를) 찾을 수 없습니다." msgid "Method %s did not start correctly" msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "'%2$s' 드라이브에 '%1$s'(으)로 표기된 디스크를 삽입하고 엔터를 눌러주십시오." -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "꾸러미 시스템 '%s'을(를) 지원하지 않습니다" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "올바른 꾸러미 시스템 타입을 알아낼 수 없습니다" @@ -2521,11 +2537,11 @@ msgstr "%s의 정보를 읽을 수 없습니다." msgid "You must put some 'source' URIs in your sources.list" msgstr "sources.list에 '소스' URI를 써 넣어야 합니다" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "꾸러미 목록이나 상태 파일을 파싱할 수 없거나 열 수 없습니다." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "apt-get update를 실행하면 이 문제를 바로잡을 수도 있습니다." @@ -2635,24 +2651,24 @@ msgstr "파일에서 제공하는 것을 모으는 중입니다" msgid "IO Error saving source cache" msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "MD5Sum이 맞지 않습니다" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 msgid "Hash Sum mismatch" msgstr "해쉬 합계가 서로 다릅니다" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "다음 키 ID의 공개키가 없습니다:\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2661,7 +2677,7 @@ msgstr "" "%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습" "니다. (아키텍쳐가 빠졌기 때문입니다)" -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2670,14 +2686,14 @@ msgstr "" "%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습" "니다." -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "꾸러미 인덱스 파일이 손상되었습니다. %s 꾸러미에 Filename: 필드가 없습니다." -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "크기가 맞지 않습니다" @@ -2787,72 +2803,79 @@ msgstr "레코드 %i개를 파일 %i개가 맞지 않은 상태로 썼습니다\ msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "레코드 %i개를 파일 %i개가 빠지고 %i개가 맞지 않은 상태로 썼습니다\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, c-format msgid "Directory '%s' missing" msgstr "디렉토리 '%s' 없습니다." -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "%s 준비 중" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "%s을(를) 푸는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "%s을(를) 설정할 준비를 하는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "%s 설정 중" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, c-format msgid "Processing triggers for %s" msgstr "%s의 트리거를 처리하는 중" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "%s 설치했음" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "%s을(를) 삭제할 준비 중" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "%s 지우는 중" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "%s 지움" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "%s을(를) 완전히 지울 준비를 하는 중입니다" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "%s을(를) 완전히 지웠습니다" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "로그에 쓰는데 실패. openpty() 실패(/dev/pts가 마운트되어있지 않습니까?)\n" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "%s 파일을 열 수 없습니다" diff --git a/po/ku.po b/po/ku.po index b510192e7..7de94e2e9 100644 --- a/po/ku.po +++ b/po/ku.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-26 07:15+0200\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2006-09-16 17:51+0100\n" "Last-Translator: Erdal Ronahi \n" "Language-Team: Kurdish \n" @@ -15,1244 +15,1304 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: methods/cdrom.cc:114 -#, fuzzy, c-format -msgid "Unable to read the cdrom database %s" +#: cmdline/apt-cache.cc:143 +#, c-format +msgid "Package %s version %s has an unmet dep:\n" +msgstr "" + +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 +#, c-format +msgid "Unable to locate package %s" msgstr "Pakêt nehate dîtin %s" -#: methods/cdrom.cc:123 -msgid "" -"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " -"cannot be used to add new CD-ROMs" -msgstr "" +#: cmdline/apt-cache.cc:247 +msgid "Total package names : " +msgstr "Navên paketan bi giştî :" -#: methods/cdrom.cc:131 -msgid "Wrong CD-ROM" -msgstr "" +#: cmdline/apt-cache.cc:287 +msgid " Normal packages: " +msgstr " Pakêtên normal:" -#: methods/cdrom.cc:166 -#, c-format -msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "" +#: cmdline/apt-cache.cc:288 +msgid " Pure virtual packages: " +msgstr " Pakêtên farazî yên safî:" -#: methods/cdrom.cc:171 -#, fuzzy -msgid "Disk not found." -msgstr "(nehate dîtin)" +#: cmdline/apt-cache.cc:289 +msgid " Single virtual packages: " +msgstr " Pakêta tenê ya farazî:" -#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 -#, fuzzy -msgid "File not found" -msgstr "(nehate dîtin)" +#: cmdline/apt-cache.cc:290 +msgid " Mixed virtual packages: " +msgstr " Pakêtên hevbeş yên farazî:" -#: methods/copy.cc:43 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 -#, fuzzy -msgid "Failed to stat" -msgstr "%s venebû" +#: cmdline/apt-cache.cc:291 +msgid " Missing: " +msgstr " Winda: " -#: methods/copy.cc:80 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 -msgid "Failed to set modification time" -msgstr "" +#: cmdline/apt-cache.cc:293 +msgid "Total distinct versions: " +msgstr "Guhertoyên vekirî yên giştî:" -#: methods/file.cc:44 -msgid "Invalid URI, local URIS must not start with //" -msgstr "" +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Guhertoyên vekirî yên giştî:" -#. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:162 -msgid "Logging in" -msgstr "" +#: cmdline/apt-cache.cc:297 +msgid "Total dependencies: " +msgstr "Bindestên giştî:" -#: methods/ftp.cc:168 -msgid "Unable to determine the peer name" +#: cmdline/apt-cache.cc:300 +msgid "Total ver/file relations: " msgstr "" -#: methods/ftp.cc:173 +#: cmdline/apt-cache.cc:302 #, fuzzy -msgid "Unable to determine the local name" -msgstr "Nivîsandin ji bo %s ne pêkane" +msgid "Total Desc/File relations: " +msgstr "Guhertoyên vekirî yên giştî:" -#: methods/ftp.cc:204 methods/ftp.cc:232 -#, c-format -msgid "The server refused the connection and said: %s" +#: cmdline/apt-cache.cc:304 +msgid "Total Provides mappings: " msgstr "" -#: methods/ftp.cc:210 -#, c-format -msgid "USER failed, server said: %s" +#: cmdline/apt-cache.cc:316 +msgid "Total globbed strings: " msgstr "" -#: methods/ftp.cc:217 -#, c-format -msgid "PASS failed, server said: %s" +#: cmdline/apt-cache.cc:330 +msgid "Total dependency version space: " msgstr "" -#: methods/ftp.cc:237 -msgid "" -"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " -"is empty." -msgstr "" +#: cmdline/apt-cache.cc:335 +msgid "Total slack space: " +msgstr "Cihê giştî yê sist:" -#: methods/ftp.cc:265 -#, c-format -msgid "Login script command '%s' failed, server said: %s" -msgstr "" +#: cmdline/apt-cache.cc:343 +msgid "Total space accounted for: " +msgstr "Cihê giştî yê veqetandî: " -#: methods/ftp.cc:291 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format -msgid "TYPE failed, server said: %s" -msgstr "" +msgid "Package file %s is out of sync." +msgstr "Pakêta dosya %s li derveyî demê ye." -#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 -msgid "Connection timeout" -msgstr "" +#: cmdline/apt-cache.cc:1293 +msgid "You must give exactly one pattern" +msgstr "Pêwist e tu mînakekê bidî" -#: methods/ftp.cc:335 -msgid "Server closed the connection" -msgstr "" +#: cmdline/apt-cache.cc:1447 +msgid "No packages found" +msgstr "Pakêt nayên dîtin" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 -msgid "Read error" -msgstr "" +#: cmdline/apt-cache.cc:1524 +msgid "Package files:" +msgstr "Pelgehên Pakêt:" -#: methods/ftp.cc:345 methods/rsh.cc:197 -msgid "A response overflowed the buffer." +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 +msgid "Cache is out of sync, can't x-ref a package file" msgstr "" -#: methods/ftp.cc:362 methods/ftp.cc:374 -msgid "Protocol corruption" -msgstr "" +#: cmdline/apt-cache.cc:1532 +#, c-format +msgid "%4i %s\n" +msgstr "%4i %s\n" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 -msgid "Write error" +#. Show any packages have explicit pins +#: cmdline/apt-cache.cc:1544 +msgid "Pinned packages:" msgstr "" -#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 -msgid "Could not create a socket" -msgstr "" +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 +msgid "(not found)" +msgstr "(nehate dîtin)" -#: methods/ftp.cc:698 -msgid "Could not connect data socket, connection timed out" -msgstr "" +#. Installed version +#: cmdline/apt-cache.cc:1577 +msgid " Installed: " +msgstr " Sazkirî: " -#: methods/ftp.cc:702 methods/connect.cc:101 -msgid "Failed" -msgstr "Serneket" +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 +msgid "(none)" +msgstr "(ne tiştek)" -#: methods/ftp.cc:704 -msgid "Could not connect passive socket." -msgstr "" +#. Candidate Version +#: cmdline/apt-cache.cc:1584 +msgid " Candidate: " +msgstr " Berendam: " -#: methods/ftp.cc:722 -msgid "getaddrinfo was unable to get a listening socket" -msgstr "" +#: cmdline/apt-cache.cc:1594 +msgid " Package pin: " +msgstr " Destika pakêtê:" -#: methods/ftp.cc:736 -msgid "Could not bind a socket" -msgstr "" +#. Show the priority tables +#: cmdline/apt-cache.cc:1603 +msgid " Version table:" +msgstr " Tabloya guhertoyan:" -#: methods/ftp.cc:740 -msgid "Could not listen on the socket" -msgstr "" +#: cmdline/apt-cache.cc:1618 +#, c-format +msgid " %4i %s\n" +msgstr " %4i %s\n" -#: methods/ftp.cc:747 -msgid "Could not determine the socket's name" -msgstr "" +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 +#, fuzzy, c-format +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s ji bo %s %s komkirî di %s %s de\n" -#: methods/ftp.cc:779 -msgid "Unable to send PORT command" +#: cmdline/apt-cache.cc:1721 +msgid "" +"Usage: apt-cache [options] command\n" +" apt-cache [options] add file1 [file2 ...]\n" +" apt-cache [options] showpkg pkg1 [pkg2 ...]\n" +" apt-cache [options] showsrc pkg1 [pkg2 ...]\n" +"\n" +"apt-cache is a low-level tool used to manipulate APT's binary\n" +"cache files, and query information from them\n" +"\n" +"Commands:\n" +" add - Add a package file to the source cache\n" +" gencaches - Build both the package and source cache\n" +" showpkg - Show some general information for a single package\n" +" showsrc - Show source records\n" +" stats - Show some basic statistics\n" +" dump - Show the entire file in a terse form\n" +" dumpavail - Print an available file to stdout\n" +" unmet - Show unmet dependencies\n" +" search - Search the package list for a regex pattern\n" +" show - Show a readable record for the package\n" +" depends - Show raw dependency information for a package\n" +" rdepends - Show reverse dependency information for a package\n" +" pkgnames - List the names of all packages\n" +" dotty - Generate package graphs for GraphVis\n" +" xvcg - Generate package graphs for xvcg\n" +" policy - Show policy settings\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -p=? The package cache.\n" +" -s=? The source cache.\n" +" -q Disable progress indicator.\n" +" -i Show only important deps for the unmet command.\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" -#: methods/ftp.cc:789 -#, c-format -msgid "Unknown address family %u (AF_*)" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "Ji kerema xwe re navekî li vî Dîsketî bike, wekî 'Debian 2.1r1 Disk 1'" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." msgstr "" -#: methods/ftp.cc:798 -#, c-format -msgid "EPRT failed, server said: %s" +#: cmdline/apt-config.cc:41 +msgid "Arguments not in pairs" msgstr "" -#: methods/ftp.cc:818 -msgid "Data socket connect timed out" +#: cmdline/apt-config.cc:76 +msgid "" +"Usage: apt-config [options] command\n" +"\n" +"apt-config is a simple tool to read the APT config file\n" +"\n" +"Commands:\n" +" shell - Shell mode\n" +" dump - Show the configuration\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" +"Bikaranîn: apt-config [vebijark] ferman\n" +"apt-config, amûra xwendina dosyeya mîhengên APTê ye\n" +"\n" +"Ferman\n" +" shell - moda shell\n" +" dump - Mîhengan nîşan dide\n" +"\n" +"Vebijark:\n" +" -h Ev dosyeya alîkariyê ye.\n" +" -c=? Dosyeya mîhengan nîşan dide\n" +" -o=? Rê li ber vedike ku tu karibe li gorî dilê xwe vebijarkan diyar bike. " +"mînak -o dir::cache=/tmp\n" -#: methods/ftp.cc:825 -msgid "Unable to accept connection" -msgstr "" +#: cmdline/apt-extracttemplates.cc:98 +#, c-format +msgid "%s not a valid DEB package." +msgstr "%s ne paketeke DEB ya derbasdar e." -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 -msgid "Problem hashing file" +#: cmdline/apt-extracttemplates.cc:232 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: methods/ftp.cc:877 -#, fuzzy, c-format -msgid "Unable to fetch file, server said '%s'" -msgstr "Danegira %s nehate vekirin: %s" +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 +#, c-format +msgid "Unable to write to %s" +msgstr "Nivîsandin ji bo %s ne pêkane" -#: methods/ftp.cc:892 methods/rsh.cc:322 -msgid "Data socket timed out" -msgstr "" +#: cmdline/apt-extracttemplates.cc:310 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Guhertoya debconf nehate stendin. debconf sazkirî ye?" -#: methods/ftp.cc:922 +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 +msgid "Package extension list is too long" +msgstr "Lîsteya dirêjahiya pakêtê zêde dirêj e" + +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format -msgid "Data transfer failed, server said '%s'" -msgstr "" +msgid "Error processing directory %s" +msgstr "Di şixulandina pêrista %s de çewtî" -#. Get the files information -#: methods/ftp.cc:997 -msgid "Query" -msgstr "" +#: ftparchive/apt-ftparchive.cc:251 +msgid "Source extension list is too long" +msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e" -#: methods/ftp.cc:1109 -#, fuzzy -msgid "Unable to invoke " -msgstr "%s venebû" +#: ftparchive/apt-ftparchive.cc:368 +msgid "Error writing header to contents file" +msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" -#: methods/connect.cc:64 +#: ftparchive/apt-ftparchive.cc:398 #, c-format -msgid "Connecting to %s (%s)" +msgid "Error processing contents %s" +msgstr "Dema şixulandina naveroka %s çewtî" + +#: ftparchive/apt-ftparchive.cc:553 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" msgstr "" -#: methods/connect.cc:71 -#, c-format -msgid "[IP: %s %s]" +#: ftparchive/apt-ftparchive.cc:759 +msgid "No selections matched" msgstr "" -#: methods/connect.cc:80 +#: ftparchive/apt-ftparchive.cc:832 #, c-format -msgid "Could not create a socket for %s (f=%u t=%u p=%u)" -msgstr "" +msgid "Some files are missing in the package file group `%s'" +msgstr "Di koma pelgehên pakêta '%s' de hin pelgeh kêm in" -#: methods/connect.cc:86 +#: ftparchive/cachedb.cc:43 #, c-format -msgid "Cannot initiate the connection to %s:%s (%s)." -msgstr "" +msgid "DB was corrupted, file renamed to %s.old" +msgstr "DB xerabe ye, navê dosyeyê weke %s.old hate guherandin" -#: methods/connect.cc:93 +#: ftparchive/cachedb.cc:61 #, c-format -msgid "Could not connect to %s:%s (%s), connection timed out" +msgid "DB is old, attempting to upgrade %s" +msgstr "Danegir kevn e, ji bo bilindkirina %s hewl dide" + +#: ftparchive/cachedb.cc:72 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." msgstr "" -#: methods/connect.cc:108 +#: ftparchive/cachedb.cc:77 #, c-format -msgid "Could not connect to %s:%s (%s)." -msgstr "" +msgid "Unable to open DB file %s: %s" +msgstr "Danegira %s nehate vekirin: %s" -#. We say this mainly because the pause here is for the -#. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 #, c-format -msgid "Connecting to %s" +msgid "Failed to stat %s" msgstr "" -#: methods/connect.cc:167 -#, fuzzy, c-format -msgid "Could not resolve '%s'" -msgstr "%s ji hev nehate veçirandin" +#: ftparchive/cachedb.cc:238 +msgid "Archive has no control record" +msgstr "Tomara kontrola arşîvê tuneye" -#: methods/connect.cc:173 -#, c-format -msgid "Temporary failure resolving '%s'" +#: ftparchive/cachedb.cc:444 +msgid "Unable to get a cursor" msgstr "" -#: methods/connect.cc:176 +#: ftparchive/writer.cc:76 #, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" -msgstr "" - -#: methods/connect.cc:223 -#, fuzzy, c-format -msgid "Unable to connect to %s %s:" -msgstr "Nivîsandin ji bo %s ne pêkane" +msgid "W: Unable to read directory %s\n" +msgstr "W: pelrêça %s nayê xwendin\n" -#: methods/gpgv.cc:65 +#: ftparchive/writer.cc:81 #, c-format -msgid "Couldn't access keyring: '%s'" +msgid "W: Unable to stat %s\n" msgstr "" -#: methods/gpgv.cc:100 -msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "" +#: ftparchive/writer.cc:132 +msgid "E: " +msgstr "E: " -#: methods/gpgv.cc:204 -msgid "" -"Internal error: Good signature, but could not determine key fingerprint?!" -msgstr "" +#: ftparchive/writer.cc:134 +msgid "W: " +msgstr "W: " -#: methods/gpgv.cc:209 -msgid "At least one invalid signature was encountered." +#: ftparchive/writer.cc:141 +msgid "E: Errors apply to file " msgstr "" -#: methods/gpgv.cc:213 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr "" +msgid "Failed to resolve %s" +msgstr "%s ji hev nehate veçirandin" -#: methods/gpgv.cc:218 -msgid "Unknown error executing gpgv" +#: ftparchive/writer.cc:170 +msgid "Tree walking failed" msgstr "" -#: methods/gpgv.cc:249 -#, fuzzy -msgid "The following signatures were invalid:\n" -msgstr "Ev pakêtên NÛ dê werine sazkirin:" - -#: methods/gpgv.cc:256 -msgid "" -"The following signatures couldn't be verified because the public key is not " -"available:\n" -msgstr "" +#: ftparchive/writer.cc:195 +#, c-format +msgid "Failed to open %s" +msgstr "%s venebû" -#: methods/gpgv.cc:272 +#: ftparchive/writer.cc:254 #, c-format -msgid "Failed to stat %s" +msgid " DeLink %s [%s]\n" msgstr "" -#: methods/gzip.cc:64 +#: ftparchive/writer.cc:262 #, c-format -msgid "Couldn't open pipe for %s" +msgid "Failed to readlink %s" msgstr "" -#: methods/gzip.cc:109 +#: ftparchive/writer.cc:266 #, c-format -msgid "Read error from %s process" +msgid "Failed to unlink %s" msgstr "" -#: methods/http.cc:377 -msgid "Waiting for headers" +#: ftparchive/writer.cc:273 +#, c-format +msgid "*** Failed to link %s to %s" msgstr "" -#: methods/http.cc:523 +#: ftparchive/writer.cc:283 #, c-format -msgid "Got a single header line over %u chars" +msgid " DeLink limit of %sB hit.\n" msgstr "" -#: methods/http.cc:531 -msgid "Bad header line" +#: ftparchive/writer.cc:387 +msgid "Archive had no package field" +msgstr "Di arşîvê de qada pakêtê tuneye" + +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#, c-format +msgid " %s has no override entry\n" msgstr "" -#: methods/http.cc:550 methods/http.cc:557 -msgid "The HTTP server sent an invalid reply header" +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#, c-format +msgid " %s maintainer is %s not %s\n" msgstr "" -#: methods/http.cc:586 -msgid "The HTTP server sent an invalid Content-Length header" +#: ftparchive/writer.cc:620 +#, c-format +msgid " %s has no source override entry\n" msgstr "" -#: methods/http.cc:601 -msgid "The HTTP server sent an invalid Content-Range header" +#: ftparchive/writer.cc:624 +#, c-format +msgid " %s has no binary override entry either\n" msgstr "" -#: methods/http.cc:603 -msgid "This HTTP server has broken range support" +#: ftparchive/contents.cc:321 +#, c-format +msgid "Internal error, could not locate member %s" msgstr "" -#: methods/http.cc:627 -msgid "Unknown date format" +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 +msgid "realloc - Failed to allocate memory" msgstr "" -#: methods/http.cc:774 -#, fuzzy -msgid "Select failed" -msgstr " neserketî." +#: ftparchive/override.cc:34 ftparchive/override.cc:142 +#, c-format +msgid "Unable to open %s" +msgstr "%s venebû" -#: methods/http.cc:779 -msgid "Connection timed out" +#: ftparchive/override.cc:60 ftparchive/override.cc:166 +#, c-format +msgid "Malformed override %s line %lu #1" msgstr "" -#: methods/http.cc:802 -#, fuzzy -msgid "Error writing to output file" -msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" - -#: methods/http.cc:833 -#, fuzzy -msgid "Error writing to file" -msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" +#: ftparchive/override.cc:74 ftparchive/override.cc:178 +#, c-format +msgid "Malformed override %s line %lu #2" +msgstr "" -#: methods/http.cc:861 -#, fuzzy -msgid "Error writing to the file" -msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" +#: ftparchive/override.cc:88 ftparchive/override.cc:191 +#, c-format +msgid "Malformed override %s line %lu #3" +msgstr "" -#: methods/http.cc:875 -msgid "Error reading from server. Remote end closed connection" +#: ftparchive/override.cc:127 ftparchive/override.cc:201 +#, c-format +msgid "Failed to read the override file %s" msgstr "" -#: methods/http.cc:877 -msgid "Error reading from server" +#: ftparchive/multicompress.cc:72 +#, c-format +msgid "Unknown compression algorithm '%s'" msgstr "" -#: methods/http.cc:1104 -msgid "Bad header data" +#: ftparchive/multicompress.cc:102 +#, c-format +msgid "Compressed output %s needs a compression set" msgstr "" -#: methods/http.cc:1121 methods/http.cc:1176 -msgid "Connection failed" +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 +msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: methods/http.cc:1228 -msgid "Internal error" +#: ftparchive/multicompress.cc:195 +msgid "Failed to create FILE*" msgstr "" -#: apt-pkg/contrib/mmap.cc:80 -msgid "Can't mmap an empty file" +#: ftparchive/multicompress.cc:198 +msgid "Failed to fork" msgstr "" -#: apt-pkg/contrib/mmap.cc:85 -#, c-format -msgid "Couldn't make mmap of %lu bytes" +#: ftparchive/multicompress.cc:212 +msgid "Compress child" msgstr "" -#: apt-pkg/contrib/strutl.cc:978 +#: ftparchive/multicompress.cc:235 #, c-format -msgid "Selection %s not found" +msgid "Internal error, failed to create %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:434 -#, c-format -msgid "Unrecognized type abbreviation: '%c'" +#: ftparchive/multicompress.cc:286 +msgid "Failed to create subprocess IPC" msgstr "" -#: apt-pkg/contrib/configuration.cc:492 -#, c-format -msgid "Opening configuration file %s" +#: ftparchive/multicompress.cc:321 +msgid "Failed to exec compressor " msgstr "" -#: apt-pkg/contrib/configuration.cc:510 -#, c-format -msgid "Line %d too long (max %u)" +#: ftparchive/multicompress.cc:360 +msgid "decompressor" msgstr "" -#: apt-pkg/contrib/configuration.cc:606 -#, c-format -msgid "Syntax error %s:%u: Block starts with no name." +#: ftparchive/multicompress.cc:403 +msgid "IO to subprocess/file failed" msgstr "" -#: apt-pkg/contrib/configuration.cc:625 -#, c-format -msgid "Syntax error %s:%u: Malformed tag" +#: ftparchive/multicompress.cc:455 +msgid "Failed to read while computing MD5" msgstr "" -#: apt-pkg/contrib/configuration.cc:642 +#: ftparchive/multicompress.cc:472 #, c-format -msgid "Syntax error %s:%u: Extra junk after value" +msgid "Problem unlinking %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:682 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format -msgid "Syntax error %s:%u: Directives can only be done at the top level" +msgid "Failed to rename %s to %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:689 +#: cmdline/apt-get.cc:124 +msgid "Y" +msgstr "E" + +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format -msgid "Syntax error %s:%u: Too many nested includes" +msgid "Regex compilation error - %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 -#, c-format -msgid "Syntax error %s:%u: Included from here" +#: cmdline/apt-get.cc:241 +msgid "The following packages have unmet dependencies:" msgstr "" -#: apt-pkg/contrib/configuration.cc:702 +#: cmdline/apt-get.cc:331 #, c-format -msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "" +msgid "but %s is installed" +msgstr "lê %s sazkirî ye" -#: apt-pkg/contrib/configuration.cc:736 +#: cmdline/apt-get.cc:333 #, c-format -msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "" +msgid "but %s is to be installed" +msgstr "lê %s dê were sazkirin" -#: apt-pkg/contrib/configuration.cc:748 apt-pkg/contrib/cdromutl.cc:150 -#: apt-pkg/sourcelist.cc:320 apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 -#, fuzzy, c-format -msgid "Unable to read %s" -msgstr "%s venebû" +#: cmdline/apt-get.cc:340 +msgid "but it is not installable" +msgstr "lê sazkirina wê ne gengaz e" -#: apt-pkg/contrib/progress.cc:153 -#, c-format -msgid "%c%s... Error!" -msgstr "" +#: cmdline/apt-get.cc:342 +msgid "but it is a virtual package" +msgstr "lê paketeke farazî ye" -#: apt-pkg/contrib/progress.cc:155 -#, c-format -msgid "%c%s... Done" +#: cmdline/apt-get.cc:345 +msgid "but it is not installed" +msgstr "lê ne sazkirî ye" + +#: cmdline/apt-get.cc:345 +msgid "but it is not going to be installed" +msgstr "lê dê neyê sazkirin" + +#: cmdline/apt-get.cc:350 +msgid " or" +msgstr " û" + +#: cmdline/apt-get.cc:379 +msgid "The following NEW packages will be installed:" +msgstr "Ev pakêtên NÛ dê werine sazkirin:" + +#: cmdline/apt-get.cc:405 +msgid "The following packages will be REMOVED:" +msgstr "Ev pakêt dê werine RAKIRIN:" + +#: cmdline/apt-get.cc:427 +msgid "The following packages have been kept back:" msgstr "" -#: apt-pkg/contrib/cmndline.cc:77 -#, c-format -msgid "Command line option '%c' [from %s] is not known." +#: cmdline/apt-get.cc:448 +msgid "The following packages will be upgraded:" +msgstr "Ev paket dê werine bilindkirin:" + +#: cmdline/apt-get.cc:469 +msgid "The following packages will be DOWNGRADED:" msgstr "" -#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 -#: apt-pkg/contrib/cmndline.cc:119 -#, c-format -msgid "Command line option %s is not understood" +#: cmdline/apt-get.cc:489 +msgid "The following held packages will be changed:" msgstr "" -#: apt-pkg/contrib/cmndline.cc:124 +#: cmdline/apt-get.cc:542 #, c-format -msgid "Command line option %s is not boolean" +msgid "%s (due to %s) " +msgstr "%s (ji ber %s)" + +#: cmdline/apt-get.cc:550 +msgid "" +"WARNING: The following essential packages will be removed.\n" +"This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 +#: cmdline/apt-get.cc:581 #, c-format -msgid "Option %s requires an argument." +msgid "%lu upgraded, %lu newly installed, " msgstr "" -#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 +#: cmdline/apt-get.cc:585 #, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "" +msgid "%lu reinstalled, " +msgstr "%lu ji nû ve sazkirî" -#: apt-pkg/contrib/cmndline.cc:234 +#: cmdline/apt-get.cc:587 #, c-format -msgid "Option %s requires an integer argument, not '%s'" +msgid "%lu downgraded, " msgstr "" -#: apt-pkg/contrib/cmndline.cc:265 -#, fuzzy, c-format -msgid "Option '%s' is too long" -msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e" - -#: apt-pkg/contrib/cmndline.cc:298 +#: cmdline/apt-get.cc:589 #, c-format -msgid "Sense %s is not understood, try true or false." +msgid "%lu to remove and %lu not upgraded.\n" msgstr "" -#: apt-pkg/contrib/cmndline.cc:348 +#: cmdline/apt-get.cc:593 #, c-format -msgid "Invalid operation %s" +msgid "%lu not fully installed or removed.\n" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:52 -#, fuzzy, c-format -msgid "Unable to stat the mount point %s" -msgstr "Nivîsandin ji bo %s ne pêkane" +#: cmdline/apt-get.cc:667 +msgid "Correcting dependencies..." +msgstr "Bindestî tên serrastkirin..." -#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 -#, fuzzy, c-format -msgid "Unable to change to %s" -msgstr "Nivîsandin ji bo %s ne pêkane" +#: cmdline/apt-get.cc:670 +msgid " failed." +msgstr " neserketî." -#: apt-pkg/contrib/cdromutl.cc:187 -msgid "Failed to stat the cdrom" +#: cmdline/apt-get.cc:673 +msgid "Unable to correct dependencies" msgstr "" -#: apt-pkg/contrib/fileutl.cc:82 -#, c-format -msgid "Not using locking for read only lock file %s" +#: cmdline/apt-get.cc:676 +msgid "Unable to minimize the upgrade set" msgstr "" -#: apt-pkg/contrib/fileutl.cc:87 -#, fuzzy, c-format -msgid "Could not open lock file %s" -msgstr "Danegira %s nehate vekirin: %s" +#: cmdline/apt-get.cc:678 +msgid " Done" +msgstr " Temam" -#: apt-pkg/contrib/fileutl.cc:105 -#, c-format -msgid "Not using locking for nfs mounted lock file %s" +#: cmdline/apt-get.cc:682 +msgid "You might want to run `apt-get -f install' to correct these." msgstr "" -#: apt-pkg/contrib/fileutl.cc:109 -#, c-format -msgid "Could not get lock %s" +#: cmdline/apt-get.cc:685 +msgid "Unmet dependencies. Try using -f." msgstr "" -#: apt-pkg/contrib/fileutl.cc:377 -#, c-format -msgid "Waited for %s but it wasn't there" +#: cmdline/apt-get.cc:707 +msgid "WARNING: The following packages cannot be authenticated!" msgstr "" -#: apt-pkg/contrib/fileutl.cc:387 -#, c-format -msgid "Sub-process %s received a segmentation fault." +#: cmdline/apt-get.cc:711 +msgid "Authentication warning overridden.\n" msgstr "" -#: apt-pkg/contrib/fileutl.cc:390 -#, c-format -msgid "Sub-process %s returned an error code (%u)" +#: cmdline/apt-get.cc:718 +msgid "Install these packages without verification [y/N]? " msgstr "" -#: apt-pkg/contrib/fileutl.cc:392 -#, c-format -msgid "Sub-process %s exited unexpectedly" +#: cmdline/apt-get.cc:720 +msgid "Some packages could not be authenticated" msgstr "" -#: apt-pkg/contrib/fileutl.cc:436 -#, fuzzy, c-format -msgid "Could not open file %s" -msgstr "Danegira %s nehate vekirin: %s" - -#: apt-pkg/contrib/fileutl.cc:492 -#, c-format -msgid "read, still have %lu to read but none left" +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 +msgid "There are problems and -y was used without --force-yes" msgstr "" -#: apt-pkg/contrib/fileutl.cc:522 -#, c-format -msgid "write, still have %lu to write but couldn't" +#: cmdline/apt-get.cc:773 +msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: apt-pkg/contrib/fileutl.cc:597 -msgid "Problem closing the file" +#: cmdline/apt-get.cc:782 +msgid "Packages need to be removed but remove is disabled." msgstr "" -#: apt-pkg/contrib/fileutl.cc:603 -msgid "Problem unlinking the file" +#: cmdline/apt-get.cc:793 +msgid "Internal error, Ordering didn't finish" msgstr "" -#: apt-pkg/contrib/fileutl.cc:614 -msgid "Problem syncing the file" -msgstr "" +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 +msgid "Unable to lock the download directory" +msgstr "Pelrêça daxistinê nayê quflekirin" -#: apt-pkg/pkgcache.cc:132 -msgid "Empty package cache" +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 +msgid "The list of sources could not be read." msgstr "" -#: apt-pkg/pkgcache.cc:138 -msgid "The package cache file is corrupted" +#: cmdline/apt-get.cc:834 +msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: apt-pkg/pkgcache.cc:143 -msgid "The package cache file is an incompatible version" +#: cmdline/apt-get.cc:839 +#, c-format +msgid "Need to get %sB/%sB of archives.\n" msgstr "" -#: apt-pkg/pkgcache.cc:148 +#: cmdline/apt-get.cc:842 #, c-format -msgid "This APT does not support the versioning system '%s'" +msgid "Need to get %sB of archives.\n" msgstr "" -#: apt-pkg/pkgcache.cc:153 -msgid "The package cache was built for a different architecture" +#: cmdline/apt-get.cc:847 +#, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" -#: apt-pkg/pkgcache.cc:224 -msgid "Depends" +#: cmdline/apt-get.cc:850 +#, c-format +msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: apt-pkg/pkgcache.cc:224 -msgid "PreDepends" +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 +#, c-format +msgid "Couldn't determine free space in %s" msgstr "" -#: apt-pkg/pkgcache.cc:224 -msgid "Suggests" +#: cmdline/apt-get.cc:871 +#, c-format +msgid "You don't have enough free space in %s." msgstr "" -#: apt-pkg/pkgcache.cc:225 -#, fuzzy -msgid "Recommends" -msgstr "Paketên tên tawsiyê kirin:" - -#: apt-pkg/pkgcache.cc:225 -msgid "Conflicts" +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 +msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: apt-pkg/pkgcache.cc:225 -msgid "Replaces" +#: cmdline/apt-get.cc:889 +msgid "Yes, do as I say!" msgstr "" -#: apt-pkg/pkgcache.cc:226 -msgid "Obsoletes" +#: cmdline/apt-get.cc:891 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " msgstr "" -#: apt-pkg/pkgcache.cc:226 -msgid "Breaks" +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 +msgid "Abort." msgstr "" -#: apt-pkg/pkgcache.cc:237 -msgid "important" +#: cmdline/apt-get.cc:912 +msgid "Do you want to continue [Y/n]? " msgstr "" -#: apt-pkg/pkgcache.cc:237 -msgid "required" +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 +#, c-format +msgid "Failed to fetch %s %s\n" msgstr "" -#: apt-pkg/pkgcache.cc:237 -msgid "standard" +#: cmdline/apt-get.cc:1002 +msgid "Some files failed to download" msgstr "" -#: apt-pkg/pkgcache.cc:238 -msgid "optional" +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 +msgid "Download complete and in download only mode" msgstr "" -#: apt-pkg/pkgcache.cc:238 -msgid "extra" +#: cmdline/apt-get.cc:1009 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" msgstr "" -#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 -msgid "Building dependency tree" +#: cmdline/apt-get.cc:1013 +msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: apt-pkg/depcache.cc:122 -#, fuzzy -msgid "Candidate versions" -msgstr " Berendam: " - -#: apt-pkg/depcache.cc:151 -msgid "Dependency generation" +#: cmdline/apt-get.cc:1018 +msgid "Unable to correct missing packages." msgstr "" -#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 -msgid "Reading state information" +#: cmdline/apt-get.cc:1019 +msgid "Aborting install." msgstr "" -#: apt-pkg/depcache.cc:219 -#, fuzzy, c-format -msgid "Failed to open StateFile %s" -msgstr "%s venebû" - -#: apt-pkg/depcache.cc:225 -#, fuzzy, c-format -msgid "Failed to write temporary StateFile %s" -msgstr "%s ji hev nehate veçirandin" - -#: apt-pkg/tagfile.cc:102 -#, fuzzy, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Pakêt nehate dîtin %s" - -#: apt-pkg/tagfile.cc:189 -#, fuzzy, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Pakêt nehate dîtin %s" - -#: apt-pkg/sourcelist.cc:90 +#: cmdline/apt-get.cc:1053 #, c-format -msgid "Malformed line %lu in source list %s (URI)" +msgid "Note, selecting %s instead of %s\n" msgstr "" -#: apt-pkg/sourcelist.cc:92 +#: cmdline/apt-get.cc:1063 #, c-format -msgid "Malformed line %lu in source list %s (dist)" +msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: apt-pkg/sourcelist.cc:95 +#: cmdline/apt-get.cc:1081 #, c-format -msgid "Malformed line %lu in source list %s (URI parse)" +msgid "Package %s is not installed, so not removed\n" msgstr "" -#: apt-pkg/sourcelist.cc:101 +#: cmdline/apt-get.cc:1092 #, c-format -msgid "Malformed line %lu in source list %s (absolute dist)" +msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: apt-pkg/sourcelist.cc:108 -#, c-format -msgid "Malformed line %lu in source list %s (dist parse)" +#: cmdline/apt-get.cc:1104 +msgid " [Installed]" +msgstr " [Sazkirî]" + +#: cmdline/apt-get.cc:1109 +msgid "You should explicitly select one to install." msgstr "" -#: apt-pkg/sourcelist.cc:199 +#: cmdline/apt-get.cc:1114 #, c-format -msgid "Opening %s" +msgid "" +"Package %s is not available, but is referred to by another package.\n" +"This may mean that the package is missing, has been obsoleted, or\n" +"is only available from another source\n" msgstr "" -#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 -#, c-format -msgid "Line %u too long in source list %s." +#: cmdline/apt-get.cc:1133 +msgid "However the following packages replace it:" msgstr "" -#: apt-pkg/sourcelist.cc:236 +#: cmdline/apt-get.cc:1136 #, c-format -msgid "Malformed line %u in source list %s (type)" +msgid "Package %s has no installation candidate" msgstr "" -#: apt-pkg/sourcelist.cc:240 +#: cmdline/apt-get.cc:1156 #, c-format -msgid "Type '%s' is not known on line %u in source list %s" +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 +#: cmdline/apt-get.cc:1164 #, c-format -msgid "Malformed line %u in source list %s (vendor id)" +msgid "%s is already the newest version.\n" msgstr "" -#: apt-pkg/packagemanager.cc:399 +#: cmdline/apt-get.cc:1193 #, c-format -msgid "" -"This installation run will require temporarily removing the essential " -"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " -"you really want to do it, activate the APT::Force-LoopBreak option." +msgid "Release '%s' for '%s' was not found" msgstr "" -#: apt-pkg/pkgrecords.cc:32 +#: cmdline/apt-get.cc:1195 #, c-format -msgid "Index file type '%s' is not supported" +msgid "Version '%s' for '%s' was not found" msgstr "" -#: apt-pkg/algorithms.cc:247 +#: cmdline/apt-get.cc:1201 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." +msgid "Selected version %s (%s) for %s\n" msgstr "" -#: apt-pkg/algorithms.cc:1105 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." +#: cmdline/apt-get.cc:1338 +msgid "The update command takes no arguments" msgstr "" -#: apt-pkg/algorithms.cc:1107 -msgid "Unable to correct problems, you have held broken packages." +#: cmdline/apt-get.cc:1351 +msgid "Unable to lock the list directory" msgstr "" -#: apt-pkg/acquire.cc:59 -#, c-format -msgid "Lists directory %spartial is missing." +#: cmdline/apt-get.cc:1402 +msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: apt-pkg/acquire.cc:63 -#, c-format -msgid "Archive directory %spartial is missing." +#: cmdline/apt-get.cc:1434 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "Ev pakêtên NÛ dê werine sazkirin:" + +#: cmdline/apt-get.cc:1436 +msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:827 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" +#: cmdline/apt-get.cc:1441 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." msgstr "" -#: apt-pkg/acquire.cc:829 -#, c-format -msgid "Retrieving file %li of %li" +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 +msgid "The following information may help to resolve the situation:" msgstr "" -#: apt-pkg/acquire-worker.cc:110 -#, c-format -msgid "The method driver %s could not be found." +#: cmdline/apt-get.cc:1448 +msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: apt-pkg/acquire-worker.cc:159 -#, c-format -msgid "Method %s did not start correctly" +#: cmdline/apt-get.cc:1467 +msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: apt-pkg/acquire-worker.cc:398 +#: cmdline/apt-get.cc:1514 #, fuzzy, c-format -msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne" +msgid "Couldn't find task %s" +msgstr "Danegira %s nehate vekirin: %s" -#: apt-pkg/init.cc:124 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format -msgid "Packaging system '%s' is not supported" +msgid "Couldn't find package %s" msgstr "" -#: apt-pkg/init.cc:140 -msgid "Unable to determine a suitable packaging system type" +#: cmdline/apt-get.cc:1652 +#, c-format +msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: apt-pkg/clean.cc:57 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format -msgid "Unable to stat %s." -msgstr "Nivîsandin ji bo %s ne pêkane" +msgid "%s set to manually installed.\n" +msgstr "lê %s dê were sazkirin" -#: apt-pkg/srcrecords.cc:44 -msgid "You must put some 'source' URIs in your sources.list" +#: cmdline/apt-get.cc:1696 +msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: apt-pkg/cachefile.cc:63 -msgid "The list of sources could not be read." +#: cmdline/apt-get.cc:1699 +msgid "" +"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " +"solution)." msgstr "" -#: apt-pkg/cachefile.cc:69 -msgid "The package lists or status file could not be parsed or opened." +#: cmdline/apt-get.cc:1711 +msgid "" +"Some packages could not be installed. This may mean that you have\n" +"requested an impossible situation or if you are using the unstable\n" +"distribution that some required packages have not yet been created\n" +"or been moved out of Incoming." msgstr "" -#: apt-pkg/cachefile.cc:73 -msgid "You may want to run apt-get update to correct these problems" +#: cmdline/apt-get.cc:1719 +msgid "" +"Since you only requested a single operation it is extremely likely that\n" +"the package is simply not installable and a bug report against\n" +"that package should be filed." msgstr "" -#: apt-pkg/policy.cc:267 -msgid "Invalid record in the preferences file, no Package header" +#: cmdline/apt-get.cc:1727 +msgid "Broken packages" +msgstr "Paketên şikestî" + +#: cmdline/apt-get.cc:1756 +msgid "The following extra packages will be installed:" msgstr "" -#: apt-pkg/policy.cc:289 -#, c-format -msgid "Did not understand pin type %s" +#: cmdline/apt-get.cc:1845 +msgid "Suggested packages:" +msgstr "Paketên tên pêşniyaz kirin:" + +#: cmdline/apt-get.cc:1846 +msgid "Recommended packages:" +msgstr "Paketên tên tawsiyê kirin:" + +#: cmdline/apt-get.cc:1874 +msgid "Calculating upgrade... " msgstr "" -#: apt-pkg/policy.cc:297 -msgid "No priority (or zero) specified for pin" +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 +msgid "Failed" +msgstr "Serneket" + +#: cmdline/apt-get.cc:1882 +msgid "Done" +msgstr "Temam" + +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 +msgid "Internal error, problem resolver broke stuff" msgstr "" -#: apt-pkg/pkgcachegen.cc:72 -msgid "Cache has an incompatible versioning system" +#: cmdline/apt-get.cc:2057 +msgid "Must specify at least one package to fetch source for" msgstr "" -#: apt-pkg/pkgcachegen.cc:115 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format -msgid "Error occurred while processing %s (NewPackage)" +msgid "Unable to find a source package for %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:130 +#: cmdline/apt-get.cc:2103 #, c-format -msgid "Error occurred while processing %s (UsePackage1)" +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" msgstr "" -#: apt-pkg/pkgcachegen.cc:153 +#: cmdline/apt-get.cc:2108 #, c-format -msgid "Error occurred while processing %s (NewFileDesc1)" +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" msgstr "" -#: apt-pkg/pkgcachegen.cc:178 +#: cmdline/apt-get.cc:2163 #, c-format -msgid "Error occurred while processing %s (UsePackage2)" +msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: apt-pkg/pkgcachegen.cc:182 +#: cmdline/apt-get.cc:2191 #, c-format -msgid "Error occurred while processing %s (NewFileVer1)" +msgid "You don't have enough free space in %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:213 +#: cmdline/apt-get.cc:2197 #, c-format -msgid "Error occurred while processing %s (NewVersion1)" +msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: apt-pkg/pkgcachegen.cc:217 +#: cmdline/apt-get.cc:2200 #, c-format -msgid "Error occurred while processing %s (UsePackage3)" +msgid "Need to get %sB of source archives.\n" msgstr "" -#: apt-pkg/pkgcachegen.cc:221 +#: cmdline/apt-get.cc:2206 #, c-format -msgid "Error occurred while processing %s (NewVersion2)" +msgid "Fetch source %s\n" msgstr "" -#: apt-pkg/pkgcachegen.cc:245 +#: cmdline/apt-get.cc:2237 +msgid "Failed to fetch some archives." +msgstr "" + +#: cmdline/apt-get.cc:2265 #, c-format -msgid "Error occurred while processing %s (NewFileDesc2)" +msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: apt-pkg/pkgcachegen.cc:251 -msgid "Wow, you exceeded the number of package names this APT is capable of." +#: cmdline/apt-get.cc:2277 +#, c-format +msgid "Unpack command '%s' failed.\n" msgstr "" -#: apt-pkg/pkgcachegen.cc:254 -msgid "Wow, you exceeded the number of versions this APT is capable of." +#: cmdline/apt-get.cc:2278 +#, c-format +msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: apt-pkg/pkgcachegen.cc:257 -msgid "Wow, you exceeded the number of descriptions this APT is capable of." +#: cmdline/apt-get.cc:2295 +#, c-format +msgid "Build command '%s' failed.\n" msgstr "" -#: apt-pkg/pkgcachegen.cc:260 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." +#: cmdline/apt-get.cc:2314 +msgid "Child process failed" msgstr "" -#: apt-pkg/pkgcachegen.cc:288 -#, c-format -msgid "Error occurred while processing %s (FindPkg)" +#: cmdline/apt-get.cc:2330 +msgid "Must specify at least one package to check builddeps for" msgstr "" -#: apt-pkg/pkgcachegen.cc:301 +#: cmdline/apt-get.cc:2358 #, c-format -msgid "Error occurred while processing %s (CollectFileProvides)" +msgid "Unable to get build-dependency information for %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:307 +#: cmdline/apt-get.cc:2378 #, c-format -msgid "Package %s %s was not found while processing file dependencies" +msgid "%s has no build depends.\n" msgstr "" -#: apt-pkg/pkgcachegen.cc:678 +#: cmdline/apt-get.cc:2430 #, c-format -msgid "Couldn't stat source package list %s" +msgid "" +"%s dependency for %s cannot be satisfied because the package %s cannot be " +"found" msgstr "" -#. Build the status cache -#: apt-pkg/pkgcachegen.cc:748 apt-pkg/pkgcachegen.cc:817 -#: apt-pkg/pkgcachegen.cc:822 apt-pkg/pkgcachegen.cc:945 -#, fuzzy -msgid "Reading package lists" -msgstr "Paketên şikestî" - -#: apt-pkg/pkgcachegen.cc:763 -msgid "Collecting File Provides" +#: cmdline/apt-get.cc:2483 +#, c-format +msgid "" +"%s dependency for %s cannot be satisfied because no available versions of " +"package %s can satisfy version requirements" msgstr "" -#: apt-pkg/pkgcachegen.cc:815 +#: cmdline/apt-get.cc:2519 #, c-format -msgid "Unable to write to %s" -msgstr "Nivîsandin ji bo %s ne pêkane" - -#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 -msgid "IO Error saving source cache" +msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: apt-pkg/acquire-item.cc:127 +#: cmdline/apt-get.cc:2544 #, c-format -msgid "rename failed, %s (%s -> %s)." +msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:401 -msgid "MD5Sum mismatch" +#: cmdline/apt-get.cc:2558 +#, c-format +msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1399 -msgid "Hash Sum mismatch" +#: cmdline/apt-get.cc:2562 +msgid "Failed to process build dependencies" msgstr "" -#: apt-pkg/acquire-item.cc:1091 -msgid "There is no public key available for the following key IDs:\n" +#: cmdline/apt-get.cc:2594 +msgid "Supported modules:" msgstr "" -#: apt-pkg/acquire-item.cc:1204 -#, c-format +#: cmdline/apt-get.cc:2635 msgid "" -"I wasn't able to locate a file for the %s package. This might mean you need " -"to manually fix this package. (due to missing arch)" +"Usage: apt-get [options] command\n" +" apt-get [options] install|remove pkg1 [pkg2 ...]\n" +" apt-get [options] source pkg1 [pkg2 ...]\n" +"\n" +"apt-get is a simple command line interface for downloading and\n" +"installing packages. The most frequently used commands are update\n" +"and install.\n" +"\n" +"Commands:\n" +" update - Retrieve new lists of packages\n" +" upgrade - Perform an upgrade\n" +" install - Install new packages (pkg is libc6 not libc6.deb)\n" +" remove - Remove packages\n" +" autoremove - Remove all automatic unused packages\n" +" purge - Remove and purge packages\n" +" source - Download source archives\n" +" build-dep - Configure build-dependencies for source packages\n" +" dist-upgrade - Distribution upgrade, see apt-get(8)\n" +" dselect-upgrade - Follow dselect selections\n" +" clean - Erase downloaded archive files\n" +" autoclean - Erase old downloaded archive files\n" +" check - Verify that there are no broken dependencies\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -qq No output except for errors\n" +" -d Download only - do NOT install or unpack archives\n" +" -s No-act. Perform ordering simulation\n" +" -y Assume Yes to all queries and do not prompt\n" +" -f Attempt to continue if the integrity check fails\n" +" -m Attempt to continue if archives are unlocatable\n" +" -u Show a list of upgraded packages as well\n" +" -b Build the source package after fetching it\n" +" -V Show verbose version numbers\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n" +"pages for more information and options.\n" +" This APT has Super Cow Powers.\n" msgstr "" -#: apt-pkg/acquire-item.cc:1263 -#, c-format -msgid "" -"I wasn't able to locate file for the %s package. This might mean you need to " -"manually fix this package." +#: cmdline/acqprogress.cc:55 +msgid "Hit " msgstr "" -#: apt-pkg/acquire-item.cc:1304 -#, c-format -msgid "" -"The package index files are corrupted. No Filename: field for package %s." +#: cmdline/acqprogress.cc:79 +msgid "Get:" msgstr "" -#: apt-pkg/acquire-item.cc:1391 -msgid "Size mismatch" +#: cmdline/acqprogress.cc:110 +msgid "Ign " msgstr "" -#: apt-pkg/vendorlist.cc:66 -#, c-format -msgid "Vendor block %s contains no fingerprint" +#: cmdline/acqprogress.cc:114 +msgid "Err " msgstr "" -#: apt-pkg/cdrom.cc:529 +#: cmdline/acqprogress.cc:135 #, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" - -#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 -msgid "Identifying.. " +msgid "Fetched %sB in %s (%sB/s)\n" msgstr "" -#: apt-pkg/cdrom.cc:563 +#: cmdline/acqprogress.cc:225 #, c-format -msgid "Stored label: %s\n" -msgstr "" +msgid " [Working]" +msgstr " [Dixebite]" -#: apt-pkg/cdrom.cc:583 +#: cmdline/acqprogress.cc:271 #, c-format -msgid "Using CD-ROM mount point %s\n" +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" msgstr "" -#: apt-pkg/cdrom.cc:601 -msgid "Unmounting CD-ROM\n" +#: cmdline/apt-sortpkgs.cc:86 +msgid "Unknown package record!" msgstr "" -#: apt-pkg/cdrom.cc:605 -msgid "Waiting for disc...\n" +#: cmdline/apt-sortpkgs.cc:150 +msgid "" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#. Mount the new CDROM -#: apt-pkg/cdrom.cc:613 -msgid "Mounting CD-ROM...\n" +#: dselect/install:32 +msgid "Bad default setting!" msgstr "" -#: apt-pkg/cdrom.cc:631 -msgid "Scanning disc for index files..\n" +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 +#: dselect/install:104 dselect/update:45 +msgid "Press enter to continue." msgstr "" -#: apt-pkg/cdrom.cc:671 -#, c-format -msgid "" -"Found %u package indexes, %u source indexes, %u translation indexes and %u " -"signatures\n" +#: dselect/install:100 +msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "" -#: apt-pkg/cdrom.cc:708 -#, c-format -msgid "Found label '%s'\n" +#: dselect/install:101 +msgid "packages that were installed. This may result in duplicate errors" msgstr "" -#: apt-pkg/cdrom.cc:737 -msgid "That is not a valid name, try again.\n" +#: dselect/install:102 +msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" -#: apt-pkg/cdrom.cc:753 -#, c-format +#: dselect/install:103 msgid "" -"This disc is called: \n" -"'%s'\n" +"above this message are important. Please fix them and run [I]nstall again" msgstr "" -#: apt-pkg/cdrom.cc:757 -msgid "Copying package lists..." +#: dselect/update:30 +msgid "Merging available information" msgstr "" -#: apt-pkg/cdrom.cc:783 -msgid "Writing new source list\n" -msgstr "" +#: apt-inst/contrib/extracttar.cc:114 +#, fuzzy +msgid "Failed to create pipes" +msgstr "%s ji hev nehate veçirandin" -#: apt-pkg/cdrom.cc:792 -msgid "Source list entries for this disc are:\n" -msgstr "" +#: apt-inst/contrib/extracttar.cc:141 +#, fuzzy +msgid "Failed to exec gzip " +msgstr "%s ji hev nehate veçirandin" -#: apt-pkg/cdrom.cc:834 -msgid "Unmounting CD-ROM...\n" +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 +msgid "Corrupted archive" msgstr "" -#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 -#, c-format -msgid "Wrote %i records.\n" +#: apt-inst/contrib/extracttar.cc:193 +msgid "Tar checksum failed, archive corrupted" msgstr "" -#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 +#: apt-inst/contrib/extracttar.cc:296 #, c-format -msgid "Wrote %i records with %i missing files.\n" +msgid "Unknown TAR header type %u, member %s" msgstr "" -#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 -#, c-format -msgid "Wrote %i records with %i mismatched files\n" +#: apt-inst/contrib/arfile.cc:70 +msgid "Invalid archive signature" msgstr "" -#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831 -#, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" +#: apt-inst/contrib/arfile.cc:78 +msgid "Error reading archive member header" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:510 -#, c-format -msgid "Directory '%s' missing" +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 +msgid "Invalid archive member header" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:572 -#, c-format -msgid "Preparing %s" -msgstr "" +#: apt-inst/contrib/arfile.cc:128 +#, fuzzy +msgid "Archive is too short" +msgstr "Tomara kontrola arşîvê tuneye" -#: apt-pkg/deb/dpkgpm.cc:573 -#, c-format -msgid "Unpacking %s" +#: apt-inst/contrib/arfile.cc:132 +msgid "Failed to read the archive headers" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:578 -#, c-format -msgid "Preparing to configure %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:579 -#, c-format -msgid "Configuring %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:581 apt-pkg/deb/dpkgpm.cc:582 -#, fuzzy, c-format -#| msgid "Error processing directory %s" -msgid "Processing triggers for %s" -msgstr "Di şixulandina pêrista %s de çewtî" - -#: apt-pkg/deb/dpkgpm.cc:584 -#, fuzzy, c-format -msgid "Installed %s" -msgstr " Sazkirî: " - -#: apt-pkg/deb/dpkgpm.cc:589 apt-pkg/deb/dpkgpm.cc:591 -#: apt-pkg/deb/dpkgpm.cc:592 -#, c-format -msgid "Preparing for removal of %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:594 -#, c-format -msgid "Removing %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:595 -#, c-format -msgid "Removed %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:600 -#, c-format -msgid "Preparing to completely remove %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:601 -#, c-format -msgid "Completely removed %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:749 -msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" -msgstr "" - -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "Danegira %s nehate vekirin: %s" - -#: methods/rsh.cc:91 -msgid "Failed to create IPC pipe to subprocess" -msgstr "" - -#: methods/rsh.cc:330 -msgid "Connection closed prematurely" -msgstr "" - -#: apt-inst/contrib/extracttar.cc:114 -#, fuzzy -msgid "Failed to create pipes" -msgstr "%s ji hev nehate veçirandin" - -#: apt-inst/contrib/extracttar.cc:141 -#, fuzzy -msgid "Failed to exec gzip " -msgstr "%s ji hev nehate veçirandin" - -#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 -msgid "Corrupted archive" -msgstr "" - -#: apt-inst/contrib/extracttar.cc:193 -msgid "Tar checksum failed, archive corrupted" -msgstr "" - -#: apt-inst/contrib/extracttar.cc:296 -#, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "" - -#: apt-inst/contrib/arfile.cc:70 -msgid "Invalid archive signature" -msgstr "" - -#: apt-inst/contrib/arfile.cc:78 -msgid "Error reading archive member header" -msgstr "" - -#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 -msgid "Invalid archive member header" -msgstr "" - -#: apt-inst/contrib/arfile.cc:128 -#, fuzzy -msgid "Archive is too short" -msgstr "Tomara kontrola arşîvê tuneye" - -#: apt-inst/contrib/arfile.cc:132 -msgid "Failed to read the archive headers" -msgstr "" - -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" msgstr "" #: apt-inst/filelist.cc:412 @@ -1318,11 +1378,6 @@ msgstr "" msgid "The diversion path is too long" msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e" -#: apt-inst/extract.cc:185 -#, c-format -msgid "Failed to rename %s to %s" -msgstr "" - #: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" @@ -1346,6 +1401,13 @@ msgstr "" msgid "File %s/%s overwrites the one in the package %s" msgstr "" +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 +#, fuzzy, c-format +msgid "Unable to read %s" +msgstr "%s venebû" + #: apt-inst/extract.cc:491 #, fuzzy, c-format msgid "Unable to stat %s" @@ -1370,6 +1432,14 @@ msgstr "%s venebû" msgid "The info and temp directories need to be on the same filesystem" msgstr "" +#. Build the status cache +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 +#, fuzzy +msgid "Reading package lists" +msgstr "Paketên şikestî" + #: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" @@ -1466,1218 +1536,1173 @@ msgstr "" msgid "Unparsable control file" msgstr "" -#: cmdline/apt-cache.cc:143 -#, c-format -msgid "Package %s version %s has an unmet dep:\n" -msgstr "" - -#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 -#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 -#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 -#, c-format -msgid "Unable to locate package %s" +#: methods/cdrom.cc:114 +#, fuzzy, c-format +msgid "Unable to read the cdrom database %s" msgstr "Pakêt nehate dîtin %s" -#: cmdline/apt-cache.cc:247 -msgid "Total package names : " -msgstr "Navên paketan bi giştî :" +#: methods/cdrom.cc:123 +msgid "" +"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " +"cannot be used to add new CD-ROMs" +msgstr "" -#: cmdline/apt-cache.cc:287 -msgid " Normal packages: " -msgstr " Pakêtên normal:" +#: methods/cdrom.cc:131 +msgid "Wrong CD-ROM" +msgstr "" -#: cmdline/apt-cache.cc:288 -msgid " Pure virtual packages: " -msgstr " Pakêtên farazî yên safî:" +#: methods/cdrom.cc:166 +#, c-format +msgid "Unable to unmount the CD-ROM in %s, it may still be in use." +msgstr "" -#: cmdline/apt-cache.cc:289 -msgid " Single virtual packages: " -msgstr " Pakêta tenê ya farazî:" +#: methods/cdrom.cc:171 +#, fuzzy +msgid "Disk not found." +msgstr "(nehate dîtin)" -#: cmdline/apt-cache.cc:290 -msgid " Mixed virtual packages: " -msgstr " Pakêtên hevbeş yên farazî:" +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 +#, fuzzy +msgid "File not found" +msgstr "(nehate dîtin)" -#: cmdline/apt-cache.cc:291 -msgid " Missing: " -msgstr " Winda: " +#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 +#: methods/rred.cc:234 methods/rred.cc:243 +#, fuzzy +msgid "Failed to stat" +msgstr "%s venebû" -#: cmdline/apt-cache.cc:293 -msgid "Total distinct versions: " -msgstr "Guhertoyên vekirî yên giştî:" +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +msgid "Failed to set modification time" +msgstr "" -#: cmdline/apt-cache.cc:295 -#, fuzzy -msgid "Total Distinct Descriptions: " -msgstr "Guhertoyên vekirî yên giştî:" +#: methods/file.cc:44 +msgid "Invalid URI, local URIS must not start with //" +msgstr "" -#: cmdline/apt-cache.cc:297 -msgid "Total dependencies: " -msgstr "Bindestên giştî:" +#. Login must be before getpeername otherwise dante won't work. +#: methods/ftp.cc:162 +msgid "Logging in" +msgstr "" -#: cmdline/apt-cache.cc:300 -msgid "Total ver/file relations: " +#: methods/ftp.cc:168 +msgid "Unable to determine the peer name" msgstr "" -#: cmdline/apt-cache.cc:302 +#: methods/ftp.cc:173 #, fuzzy -msgid "Total Desc/File relations: " -msgstr "Guhertoyên vekirî yên giştî:" +msgid "Unable to determine the local name" +msgstr "Nivîsandin ji bo %s ne pêkane" -#: cmdline/apt-cache.cc:304 -msgid "Total Provides mappings: " +#: methods/ftp.cc:204 methods/ftp.cc:232 +#, c-format +msgid "The server refused the connection and said: %s" msgstr "" -#: cmdline/apt-cache.cc:316 -msgid "Total globbed strings: " +#: methods/ftp.cc:210 +#, c-format +msgid "USER failed, server said: %s" msgstr "" -#: cmdline/apt-cache.cc:330 -msgid "Total dependency version space: " +#: methods/ftp.cc:217 +#, c-format +msgid "PASS failed, server said: %s" msgstr "" -#: cmdline/apt-cache.cc:335 -msgid "Total slack space: " -msgstr "Cihê giştî yê sist:" - -#: cmdline/apt-cache.cc:343 -msgid "Total space accounted for: " -msgstr "Cihê giştî yê veqetandî: " +#: methods/ftp.cc:237 +msgid "" +"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " +"is empty." +msgstr "" -#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 +#: methods/ftp.cc:265 #, c-format -msgid "Package file %s is out of sync." -msgstr "Pakêta dosya %s li derveyî demê ye." - -#: cmdline/apt-cache.cc:1293 -msgid "You must give exactly one pattern" -msgstr "Pêwist e tu mînakekê bidî" +msgid "Login script command '%s' failed, server said: %s" +msgstr "" -#: cmdline/apt-cache.cc:1447 -msgid "No packages found" -msgstr "Pakêt nayên dîtin" +#: methods/ftp.cc:291 +#, c-format +msgid "TYPE failed, server said: %s" +msgstr "" -#: cmdline/apt-cache.cc:1524 -msgid "Package files:" -msgstr "Pelgehên Pakêt:" +#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 +msgid "Connection timeout" +msgstr "" -#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 -msgid "Cache is out of sync, can't x-ref a package file" +#: methods/ftp.cc:335 +msgid "Server closed the connection" msgstr "" -#: cmdline/apt-cache.cc:1532 -#, c-format -msgid "%4i %s\n" -msgstr "%4i %s\n" +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +msgid "Read error" +msgstr "" -#. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1544 -msgid "Pinned packages:" +#: methods/ftp.cc:345 methods/rsh.cc:197 +msgid "A response overflowed the buffer." msgstr "" -#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 -msgid "(not found)" -msgstr "(nehate dîtin)" +#: methods/ftp.cc:362 methods/ftp.cc:374 +msgid "Protocol corruption" +msgstr "" -#. Installed version -#: cmdline/apt-cache.cc:1577 -msgid " Installed: " -msgstr " Sazkirî: " +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +msgid "Write error" +msgstr "" -#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 -msgid "(none)" -msgstr "(ne tiştek)" +#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 +msgid "Could not create a socket" +msgstr "" -#. Candidate Version -#: cmdline/apt-cache.cc:1584 -msgid " Candidate: " -msgstr " Berendam: " +#: methods/ftp.cc:698 +msgid "Could not connect data socket, connection timed out" +msgstr "" -#: cmdline/apt-cache.cc:1594 -msgid " Package pin: " -msgstr " Destika pakêtê:" +#: methods/ftp.cc:704 +msgid "Could not connect passive socket." +msgstr "" -#. Show the priority tables -#: cmdline/apt-cache.cc:1603 -msgid " Version table:" -msgstr " Tabloya guhertoyan:" +#: methods/ftp.cc:722 +msgid "getaddrinfo was unable to get a listening socket" +msgstr "" -#: cmdline/apt-cache.cc:1618 +#: methods/ftp.cc:736 +msgid "Could not bind a socket" +msgstr "" + +#: methods/ftp.cc:740 +msgid "Could not listen on the socket" +msgstr "" + +#: methods/ftp.cc:747 +msgid "Could not determine the socket's name" +msgstr "" + +#: methods/ftp.cc:779 +msgid "Unable to send PORT command" +msgstr "" + +#: methods/ftp.cc:789 #, c-format -msgid " %4i %s\n" -msgstr " %4i %s\n" +msgid "Unknown address family %u (AF_*)" +msgstr "" -#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2588 cmdline/apt-sortpkgs.cc:144 +#: methods/ftp.cc:798 +#, c-format +msgid "EPRT failed, server said: %s" +msgstr "" + +#: methods/ftp.cc:818 +msgid "Data socket connect timed out" +msgstr "" + +#: methods/ftp.cc:825 +msgid "Unable to accept connection" +msgstr "" + +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 +msgid "Problem hashing file" +msgstr "" + +#: methods/ftp.cc:877 #, fuzzy, c-format -msgid "%s %s for %s compiled on %s %s\n" -msgstr "%s %s ji bo %s %s komkirî di %s %s de\n" +msgid "Unable to fetch file, server said '%s'" +msgstr "Danegira %s nehate vekirin: %s" -#: cmdline/apt-cache.cc:1721 -msgid "" -"Usage: apt-cache [options] command\n" -" apt-cache [options] add file1 [file2 ...]\n" -" apt-cache [options] showpkg pkg1 [pkg2 ...]\n" -" apt-cache [options] showsrc pkg1 [pkg2 ...]\n" -"\n" -"apt-cache is a low-level tool used to manipulate APT's binary\n" -"cache files, and query information from them\n" -"\n" -"Commands:\n" -" add - Add a package file to the source cache\n" -" gencaches - Build both the package and source cache\n" -" showpkg - Show some general information for a single package\n" -" showsrc - Show source records\n" -" stats - Show some basic statistics\n" -" dump - Show the entire file in a terse form\n" -" dumpavail - Print an available file to stdout\n" -" unmet - Show unmet dependencies\n" -" search - Search the package list for a regex pattern\n" -" show - Show a readable record for the package\n" -" depends - Show raw dependency information for a package\n" -" rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" -" xvcg - Generate package graphs for xvcg\n" -" policy - Show policy settings\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -p=? The package cache.\n" -" -s=? The source cache.\n" -" -q Disable progress indicator.\n" -" -i Show only important deps for the unmet command.\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" +#: methods/ftp.cc:892 methods/rsh.cc:322 +msgid "Data socket timed out" msgstr "" -#: cmdline/apt-cdrom.cc:78 -msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "Ji kerema xwe re navekî li vî Dîsketî bike, wekî 'Debian 2.1r1 Disk 1'" +#: methods/ftp.cc:922 +#, c-format +msgid "Data transfer failed, server said '%s'" +msgstr "" -#: cmdline/apt-cdrom.cc:93 -msgid "Please insert a Disc in the drive and press enter" -msgstr "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne" +#. Get the files information +#: methods/ftp.cc:997 +msgid "Query" +msgstr "" -#: cmdline/apt-cdrom.cc:117 -msgid "Repeat this process for the rest of the CDs in your set." +#: methods/ftp.cc:1109 +#, fuzzy +msgid "Unable to invoke " +msgstr "%s venebû" + +#: methods/connect.cc:65 +#, c-format +msgid "Connecting to %s (%s)" msgstr "" -#: cmdline/apt-config.cc:41 -msgid "Arguments not in pairs" +#: methods/connect.cc:72 +#, c-format +msgid "[IP: %s %s]" msgstr "" -#: cmdline/apt-config.cc:76 -msgid "" -"Usage: apt-config [options] command\n" -"\n" -"apt-config is a simple tool to read the APT config file\n" -"\n" -"Commands:\n" -" shell - Shell mode\n" -" dump - Show the configuration\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: methods/connect.cc:79 +#, c-format +msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "" -"Bikaranîn: apt-config [vebijark] ferman\n" -"apt-config, amûra xwendina dosyeya mîhengên APTê ye\n" -"\n" -"Ferman\n" -" shell - moda shell\n" -" dump - Mîhengan nîşan dide\n" -"\n" -"Vebijark:\n" -" -h Ev dosyeya alîkariyê ye.\n" -" -c=? Dosyeya mîhengan nîşan dide\n" -" -o=? Rê li ber vedike ku tu karibe li gorî dilê xwe vebijarkan diyar bike. " -"mînak -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:98 +#: methods/connect.cc:85 #, c-format -msgid "%s not a valid DEB package." -msgstr "%s ne paketeke DEB ya derbasdar e." +msgid "Cannot initiate the connection to %s:%s (%s)." +msgstr "" -#: cmdline/apt-extracttemplates.cc:232 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: methods/connect.cc:92 +#, c-format +msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" -#: cmdline/apt-extracttemplates.cc:310 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Guhertoya debconf nehate stendin. debconf sazkirî ye?" +#: methods/connect.cc:107 +#, c-format +msgid "Could not connect to %s:%s (%s)." +msgstr "" -#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 -msgid "Package extension list is too long" -msgstr "Lîsteya dirêjahiya pakêtê zêde dirêj e" +#. We say this mainly because the pause here is for the +#. ssh connection that is still going +#: methods/connect.cc:135 methods/rsh.cc:425 +#, c-format +msgid "Connecting to %s" +msgstr "" -#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 -#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 -#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 +#: methods/connect.cc:167 +#, fuzzy, c-format +msgid "Could not resolve '%s'" +msgstr "%s ji hev nehate veçirandin" + +#: methods/connect.cc:173 #, c-format -msgid "Error processing directory %s" -msgstr "Di şixulandina pêrista %s de çewtî" +msgid "Temporary failure resolving '%s'" +msgstr "" -#: ftparchive/apt-ftparchive.cc:251 -msgid "Source extension list is too long" -msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e" +#: methods/connect.cc:176 +#, c-format +msgid "Something wicked happened resolving '%s:%s' (%i)" +msgstr "" -#: ftparchive/apt-ftparchive.cc:368 -msgid "Error writing header to contents file" -msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" +#: methods/connect.cc:223 +#, fuzzy, c-format +msgid "Unable to connect to %s %s:" +msgstr "Nivîsandin ji bo %s ne pêkane" -#: ftparchive/apt-ftparchive.cc:398 +#: methods/gpgv.cc:65 #, c-format -msgid "Error processing contents %s" -msgstr "Dema şixulandina naveroka %s çewtî" +msgid "Couldn't access keyring: '%s'" +msgstr "" -#: ftparchive/apt-ftparchive.cc:553 +#: methods/gpgv.cc:101 +msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." +msgstr "" + +#: methods/gpgv.cc:205 msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" +"Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: ftparchive/apt-ftparchive.cc:759 -msgid "No selections matched" +#: methods/gpgv.cc:210 +msgid "At least one invalid signature was encountered." msgstr "" -#: ftparchive/apt-ftparchive.cc:832 +#: methods/gpgv.cc:214 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "Di koma pelgehên pakêta '%s' de hin pelgeh kêm in" +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgstr "" -#: ftparchive/cachedb.cc:43 -#, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "DB xerabe ye, navê dosyeyê weke %s.old hate guherandin" +#: methods/gpgv.cc:219 +msgid "Unknown error executing gpgv" +msgstr "" -#: ftparchive/cachedb.cc:61 -#, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "Danegir kevn e, ji bo bilindkirina %s hewl dide" +#: methods/gpgv.cc:250 +#, fuzzy +msgid "The following signatures were invalid:\n" +msgstr "Ev pakêtên NÛ dê werine sazkirin:" -#: ftparchive/cachedb.cc:72 +#: methods/gpgv.cc:257 msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " -"remove and re-create the database." +"The following signatures couldn't be verified because the public key is not " +"available:\n" msgstr "" -#: ftparchive/cachedb.cc:77 +#: methods/gzip.cc:64 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Danegira %s nehate vekirin: %s" +msgid "Couldn't open pipe for %s" +msgstr "" -#: ftparchive/cachedb.cc:238 -msgid "Archive has no control record" -msgstr "Tomara kontrola arşîvê tuneye" +#: methods/gzip.cc:109 +#, c-format +msgid "Read error from %s process" +msgstr "" -#: ftparchive/cachedb.cc:444 -msgid "Unable to get a cursor" +#: methods/http.cc:376 +msgid "Waiting for headers" msgstr "" -#: ftparchive/writer.cc:76 +#: methods/http.cc:522 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "W: pelrêça %s nayê xwendin\n" +msgid "Got a single header line over %u chars" +msgstr "" + +#: methods/http.cc:530 +msgid "Bad header line" +msgstr "" + +#: methods/http.cc:549 methods/http.cc:556 +msgid "The HTTP server sent an invalid reply header" +msgstr "" + +#: methods/http.cc:585 +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "" + +#: methods/http.cc:600 +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "" + +#: methods/http.cc:602 +msgid "This HTTP server has broken range support" +msgstr "" + +#: methods/http.cc:626 +msgid "Unknown date format" +msgstr "" + +#: methods/http.cc:773 +#, fuzzy +msgid "Select failed" +msgstr " neserketî." + +#: methods/http.cc:778 +msgid "Connection timed out" +msgstr "" + +#: methods/http.cc:801 +#, fuzzy +msgid "Error writing to output file" +msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" + +#: methods/http.cc:832 +#, fuzzy +msgid "Error writing to file" +msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" + +#: methods/http.cc:860 +#, fuzzy +msgid "Error writing to the file" +msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" -#: ftparchive/writer.cc:81 -#, c-format -msgid "W: Unable to stat %s\n" +#: methods/http.cc:874 +msgid "Error reading from server. Remote end closed connection" msgstr "" -#: ftparchive/writer.cc:132 -msgid "E: " -msgstr "E: " +#: methods/http.cc:876 +msgid "Error reading from server" +msgstr "" -#: ftparchive/writer.cc:134 -msgid "W: " -msgstr "W: " +#: methods/http.cc:1106 +msgid "Bad header data" +msgstr "" -#: ftparchive/writer.cc:141 -msgid "E: Errors apply to file " +#: methods/http.cc:1123 methods/http.cc:1178 +msgid "Connection failed" msgstr "" -#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 -#, c-format -msgid "Failed to resolve %s" -msgstr "%s ji hev nehate veçirandin" +#: methods/http.cc:1230 +msgid "Internal error" +msgstr "" -#: ftparchive/writer.cc:170 -msgid "Tree walking failed" +#: apt-pkg/contrib/mmap.cc:80 +msgid "Can't mmap an empty file" msgstr "" -#: ftparchive/writer.cc:195 +#: apt-pkg/contrib/mmap.cc:85 #, c-format -msgid "Failed to open %s" -msgstr "%s venebû" +msgid "Couldn't make mmap of %lu bytes" +msgstr "" -#: ftparchive/writer.cc:254 +#: apt-pkg/contrib/strutl.cc:978 #, c-format -msgid " DeLink %s [%s]\n" +msgid "Selection %s not found" msgstr "" -#: ftparchive/writer.cc:262 +#: apt-pkg/contrib/configuration.cc:439 #, c-format -msgid "Failed to readlink %s" +msgid "Unrecognized type abbreviation: '%c'" msgstr "" -#: ftparchive/writer.cc:266 +#: apt-pkg/contrib/configuration.cc:497 #, c-format -msgid "Failed to unlink %s" +msgid "Opening configuration file %s" msgstr "" -#: ftparchive/writer.cc:273 +#: apt-pkg/contrib/configuration.cc:515 #, c-format -msgid "*** Failed to link %s to %s" +msgid "Line %d too long (max %u)" msgstr "" -#: ftparchive/writer.cc:283 +#: apt-pkg/contrib/configuration.cc:611 #, c-format -msgid " DeLink limit of %sB hit.\n" +msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: ftparchive/writer.cc:387 -msgid "Archive had no package field" -msgstr "Di arşîvê de qada pakêtê tuneye" - -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: apt-pkg/contrib/configuration.cc:630 #, c-format -msgid " %s has no override entry\n" +msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: apt-pkg/contrib/configuration.cc:647 #, c-format -msgid " %s maintainer is %s not %s\n" +msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: ftparchive/writer.cc:620 +#: apt-pkg/contrib/configuration.cc:687 #, c-format -msgid " %s has no source override entry\n" +msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: ftparchive/writer.cc:624 +#: apt-pkg/contrib/configuration.cc:694 #, c-format -msgid " %s has no binary override entry either\n" +msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: ftparchive/contents.cc:317 +#: apt-pkg/contrib/configuration.cc:698 apt-pkg/contrib/configuration.cc:703 #, c-format -msgid "Internal error, could not locate member %s" +msgid "Syntax error %s:%u: Included from here" msgstr "" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 -msgid "realloc - Failed to allocate memory" +#: apt-pkg/contrib/configuration.cc:707 +#, c-format +msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: ftparchive/override.cc:34 ftparchive/override.cc:142 +#: apt-pkg/contrib/configuration.cc:741 #, c-format -msgid "Unable to open %s" -msgstr "%s venebû" +msgid "Syntax error %s:%u: Extra junk at end of file" +msgstr "" -#: ftparchive/override.cc:60 ftparchive/override.cc:166 +#: apt-pkg/contrib/progress.cc:153 #, c-format -msgid "Malformed override %s line %lu #1" +msgid "%c%s... Error!" msgstr "" -#: ftparchive/override.cc:74 ftparchive/override.cc:178 +#: apt-pkg/contrib/progress.cc:155 #, c-format -msgid "Malformed override %s line %lu #2" +msgid "%c%s... Done" msgstr "" -#: ftparchive/override.cc:88 ftparchive/override.cc:191 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format -msgid "Malformed override %s line %lu #3" +msgid "Command line option '%c' [from %s] is not known." msgstr "" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format -msgid "Failed to read the override file %s" +msgid "Command line option %s is not understood" msgstr "" -#: ftparchive/multicompress.cc:71 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format -msgid "Unknown compression algorithm '%s'" +msgid "Command line option %s is not boolean" msgstr "" -#: ftparchive/multicompress.cc:101 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format -msgid "Compressed output %s needs a compression set" +msgid "Option %s requires an argument." msgstr "" -#: ftparchive/multicompress.cc:194 -msgid "Failed to create FILE*" +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 +#, c-format +msgid "Option %s: Configuration item specification must have an =." msgstr "" -#: ftparchive/multicompress.cc:197 -msgid "Failed to fork" +#: apt-pkg/contrib/cmndline.cc:234 +#, c-format +msgid "Option %s requires an integer argument, not '%s'" msgstr "" -#: ftparchive/multicompress.cc:211 -msgid "Compress child" -msgstr "" +#: apt-pkg/contrib/cmndline.cc:265 +#, fuzzy, c-format +msgid "Option '%s' is too long" +msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e" -#: ftparchive/multicompress.cc:234 +#: apt-pkg/contrib/cmndline.cc:298 #, c-format -msgid "Internal error, failed to create %s" -msgstr "" - -#: ftparchive/multicompress.cc:285 -msgid "Failed to create subprocess IPC" +msgid "Sense %s is not understood, try true or false." msgstr "" -#: ftparchive/multicompress.cc:320 -msgid "Failed to exec compressor " +#: apt-pkg/contrib/cmndline.cc:348 +#, c-format +msgid "Invalid operation %s" msgstr "" -#: ftparchive/multicompress.cc:359 -msgid "decompressor" -msgstr "" +#: apt-pkg/contrib/cdromutl.cc:52 +#, fuzzy, c-format +msgid "Unable to stat the mount point %s" +msgstr "Nivîsandin ji bo %s ne pêkane" -#: ftparchive/multicompress.cc:402 -msgid "IO to subprocess/file failed" -msgstr "" +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 +#, fuzzy, c-format +msgid "Unable to change to %s" +msgstr "Nivîsandin ji bo %s ne pêkane" -#: ftparchive/multicompress.cc:454 -msgid "Failed to read while computing MD5" +#: apt-pkg/contrib/cdromutl.cc:187 +msgid "Failed to stat the cdrom" msgstr "" -#: ftparchive/multicompress.cc:471 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format -msgid "Problem unlinking %s" +msgid "Not using locking for read only lock file %s" msgstr "" -#: cmdline/apt-get.cc:121 -msgid "Y" -msgstr "E" +#: apt-pkg/contrib/fileutl.cc:152 +#, fuzzy, c-format +msgid "Could not open lock file %s" +msgstr "Danegira %s nehate vekirin: %s" -#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format -msgid "Regex compilation error - %s" +msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: cmdline/apt-get.cc:238 -msgid "The following packages have unmet dependencies:" +#: apt-pkg/contrib/fileutl.cc:174 +#, c-format +msgid "Could not get lock %s" msgstr "" -#: cmdline/apt-get.cc:328 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format -msgid "but %s is installed" -msgstr "lê %s sazkirî ye" +msgid "Waited for %s but it wasn't there" +msgstr "" -#: cmdline/apt-get.cc:330 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format -msgid "but %s is to be installed" -msgstr "lê %s dê were sazkirin" - -#: cmdline/apt-get.cc:337 -msgid "but it is not installable" -msgstr "lê sazkirina wê ne gengaz e" - -#: cmdline/apt-get.cc:339 -msgid "but it is a virtual package" -msgstr "lê paketeke farazî ye" - -#: cmdline/apt-get.cc:342 -msgid "but it is not installed" -msgstr "lê ne sazkirî ye" - -#: cmdline/apt-get.cc:342 -msgid "but it is not going to be installed" -msgstr "lê dê neyê sazkirin" - -#: cmdline/apt-get.cc:347 -msgid " or" -msgstr " û" - -#: cmdline/apt-get.cc:376 -msgid "The following NEW packages will be installed:" -msgstr "Ev pakêtên NÛ dê werine sazkirin:" +msgid "Sub-process %s received a segmentation fault." +msgstr "" -#: cmdline/apt-get.cc:402 -msgid "The following packages will be REMOVED:" -msgstr "Ev pakêt dê werine RAKIRIN:" +#: apt-pkg/contrib/fileutl.cc:455 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "" -#: cmdline/apt-get.cc:424 -msgid "The following packages have been kept back:" +#: apt-pkg/contrib/fileutl.cc:457 +#, c-format +msgid "Sub-process %s exited unexpectedly" msgstr "" -#: cmdline/apt-get.cc:445 -msgid "The following packages will be upgraded:" -msgstr "Ev paket dê werine bilindkirin:" +#: apt-pkg/contrib/fileutl.cc:501 +#, fuzzy, c-format +msgid "Could not open file %s" +msgstr "Danegira %s nehate vekirin: %s" -#: cmdline/apt-get.cc:466 -msgid "The following packages will be DOWNGRADED:" +#: apt-pkg/contrib/fileutl.cc:557 +#, c-format +msgid "read, still have %lu to read but none left" msgstr "" -#: cmdline/apt-get.cc:486 -msgid "The following held packages will be changed:" +#: apt-pkg/contrib/fileutl.cc:587 +#, c-format +msgid "write, still have %lu to write but couldn't" msgstr "" -#: cmdline/apt-get.cc:539 -#, c-format -msgid "%s (due to %s) " -msgstr "%s (ji ber %s)" +#: apt-pkg/contrib/fileutl.cc:662 +msgid "Problem closing the file" +msgstr "" -#: cmdline/apt-get.cc:547 -msgid "" -"WARNING: The following essential packages will be removed.\n" -"This should NOT be done unless you know exactly what you are doing!" +#: apt-pkg/contrib/fileutl.cc:668 +msgid "Problem unlinking the file" msgstr "" -#: cmdline/apt-get.cc:578 -#, c-format -msgid "%lu upgraded, %lu newly installed, " +#: apt-pkg/contrib/fileutl.cc:679 +msgid "Problem syncing the file" msgstr "" -#: cmdline/apt-get.cc:582 -#, c-format -msgid "%lu reinstalled, " -msgstr "%lu ji nû ve sazkirî" +#: apt-pkg/pkgcache.cc:132 +msgid "Empty package cache" +msgstr "" -#: cmdline/apt-get.cc:584 -#, c-format -msgid "%lu downgraded, " +#: apt-pkg/pkgcache.cc:138 +msgid "The package cache file is corrupted" msgstr "" -#: cmdline/apt-get.cc:586 -#, c-format -msgid "%lu to remove and %lu not upgraded.\n" +#: apt-pkg/pkgcache.cc:143 +msgid "The package cache file is an incompatible version" msgstr "" -#: cmdline/apt-get.cc:590 +#: apt-pkg/pkgcache.cc:148 #, c-format -msgid "%lu not fully installed or removed.\n" +msgid "This APT does not support the versioning system '%s'" msgstr "" -#: cmdline/apt-get.cc:664 -msgid "Correcting dependencies..." -msgstr "Bindestî tên serrastkirin..." +#: apt-pkg/pkgcache.cc:153 +msgid "The package cache was built for a different architecture" +msgstr "" -#: cmdline/apt-get.cc:667 -msgid " failed." -msgstr " neserketî." +#: apt-pkg/pkgcache.cc:224 +msgid "Depends" +msgstr "" -#: cmdline/apt-get.cc:670 -msgid "Unable to correct dependencies" +#: apt-pkg/pkgcache.cc:224 +msgid "PreDepends" msgstr "" -#: cmdline/apt-get.cc:673 -msgid "Unable to minimize the upgrade set" +#: apt-pkg/pkgcache.cc:224 +msgid "Suggests" msgstr "" -#: cmdline/apt-get.cc:675 -msgid " Done" -msgstr " Temam" +#: apt-pkg/pkgcache.cc:225 +#, fuzzy +msgid "Recommends" +msgstr "Paketên tên tawsiyê kirin:" -#: cmdline/apt-get.cc:679 -msgid "You might want to run `apt-get -f install' to correct these." +#: apt-pkg/pkgcache.cc:225 +msgid "Conflicts" msgstr "" -#: cmdline/apt-get.cc:682 -msgid "Unmet dependencies. Try using -f." +#: apt-pkg/pkgcache.cc:225 +msgid "Replaces" msgstr "" -#: cmdline/apt-get.cc:704 -msgid "WARNING: The following packages cannot be authenticated!" +#: apt-pkg/pkgcache.cc:226 +msgid "Obsoletes" msgstr "" -#: cmdline/apt-get.cc:708 -msgid "Authentication warning overridden.\n" +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" msgstr "" -#: cmdline/apt-get.cc:715 -msgid "Install these packages without verification [y/N]? " +#: apt-pkg/pkgcache.cc:237 +msgid "important" msgstr "" -#: cmdline/apt-get.cc:717 -msgid "Some packages could not be authenticated" +#: apt-pkg/pkgcache.cc:237 +msgid "required" msgstr "" -#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 -msgid "There are problems and -y was used without --force-yes" +#: apt-pkg/pkgcache.cc:237 +msgid "standard" msgstr "" -#: cmdline/apt-get.cc:770 -msgid "Internal error, InstallPackages was called with broken packages!" +#: apt-pkg/pkgcache.cc:238 +msgid "optional" msgstr "" -#: cmdline/apt-get.cc:779 -msgid "Packages need to be removed but remove is disabled." +#: apt-pkg/pkgcache.cc:238 +msgid "extra" msgstr "" -#: cmdline/apt-get.cc:790 -msgid "Internal error, Ordering didn't finish" +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 +msgid "Building dependency tree" msgstr "" -#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2012 cmdline/apt-get.cc:2045 -msgid "Unable to lock the download directory" -msgstr "Pelrêça daxistinê nayê quflekirin" +#: apt-pkg/depcache.cc:122 +#, fuzzy +msgid "Candidate versions" +msgstr " Berendam: " -#: cmdline/apt-get.cc:831 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +#: apt-pkg/depcache.cc:151 +msgid "Dependency generation" msgstr "" -#: cmdline/apt-get.cc:836 -#, c-format -msgid "Need to get %sB/%sB of archives.\n" +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" msgstr "" -#: cmdline/apt-get.cc:839 -#, c-format -msgid "Need to get %sB of archives.\n" -msgstr "" +#: apt-pkg/depcache.cc:219 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "%s venebû" + +#: apt-pkg/depcache.cc:225 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "%s ji hev nehate veçirandin" + +#: apt-pkg/tagfile.cc:102 +#, fuzzy, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Pakêt nehate dîtin %s" -#: cmdline/apt-get.cc:844 +#: apt-pkg/tagfile.cc:189 +#, fuzzy, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Pakêt nehate dîtin %s" + +#: apt-pkg/sourcelist.cc:90 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" +msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: cmdline/apt-get.cc:847 +#: apt-pkg/sourcelist.cc:92 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" +msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2188 +#: apt-pkg/sourcelist.cc:95 #, c-format -msgid "Couldn't determine free space in %s" +msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: cmdline/apt-get.cc:864 +#: apt-pkg/sourcelist.cc:101 #, c-format -msgid "You don't have enough free space in %s." +msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 -msgid "Trivial Only specified but this is not a trivial operation." +#: apt-pkg/sourcelist.cc:108 +#, c-format +msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: cmdline/apt-get.cc:881 -msgid "Yes, do as I say!" +#: apt-pkg/sourcelist.cc:199 +#, c-format +msgid "Opening %s" msgstr "" -#: cmdline/apt-get.cc:883 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " +msgid "Line %u too long in source list %s." msgstr "" -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 -msgid "Abort." +#: apt-pkg/sourcelist.cc:236 +#, c-format +msgid "Malformed line %u in source list %s (type)" msgstr "" -#: cmdline/apt-get.cc:904 -msgid "Do you want to continue [Y/n]? " +#: apt-pkg/sourcelist.cc:240 +#, c-format +msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2231 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format -msgid "Failed to fetch %s %s\n" +msgid "Malformed line %u in source list %s (vendor id)" msgstr "" -#: cmdline/apt-get.cc:994 -msgid "Some files failed to download" +#: apt-pkg/packagemanager.cc:428 +#, c-format +msgid "" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2240 -msgid "Download complete and in download only mode" +#: apt-pkg/pkgrecords.cc:32 +#, c-format +msgid "Index file type '%s' is not supported" msgstr "" -#: cmdline/apt-get.cc:1001 +#: apt-pkg/algorithms.cc:247 +#, c-format msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" +"The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: cmdline/apt-get.cc:1005 -msgid "--fix-missing and media swapping is not currently supported" +#: apt-pkg/algorithms.cc:1105 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." msgstr "" -#: cmdline/apt-get.cc:1010 -msgid "Unable to correct missing packages." +#: apt-pkg/algorithms.cc:1107 +msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: cmdline/apt-get.cc:1011 -msgid "Aborting install." +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." msgstr "" -#: cmdline/apt-get.cc:1045 +#: apt-pkg/acquire.cc:59 #, c-format -msgid "Note, selecting %s instead of %s\n" +msgid "Lists directory %spartial is missing." msgstr "" -#: cmdline/apt-get.cc:1055 +#: apt-pkg/acquire.cc:63 #, c-format -msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgid "Archive directory %spartial is missing." msgstr "" -#: cmdline/apt-get.cc:1073 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:827 #, c-format -msgid "Package %s is not installed, so not removed\n" +msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: cmdline/apt-get.cc:1084 +#: apt-pkg/acquire.cc:829 #, c-format -msgid "Package %s is a virtual package provided by:\n" +msgid "Retrieving file %li of %li" msgstr "" -#: cmdline/apt-get.cc:1096 -msgid " [Installed]" -msgstr " [Sazkirî]" - -#: cmdline/apt-get.cc:1101 -msgid "You should explicitly select one to install." +#: apt-pkg/acquire-worker.cc:110 +#, c-format +msgid "The method driver %s could not be found." msgstr "" -#: cmdline/apt-get.cc:1106 +#: apt-pkg/acquire-worker.cc:159 #, c-format -msgid "" -"Package %s is not available, but is referred to by another package.\n" -"This may mean that the package is missing, has been obsoleted, or\n" -"is only available from another source\n" +msgid "Method %s did not start correctly" msgstr "" -#: cmdline/apt-get.cc:1125 -msgid "However the following packages replace it:" -msgstr "" +#: apt-pkg/acquire-worker.cc:399 +#, fuzzy, c-format +msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." +msgstr "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne" -#: cmdline/apt-get.cc:1128 +#: apt-pkg/init.cc:125 #, c-format -msgid "Package %s has no installation candidate" +msgid "Packaging system '%s' is not supported" msgstr "" -#: cmdline/apt-get.cc:1148 -#, c-format -msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +#: apt-pkg/init.cc:141 +msgid "Unable to determine a suitable packaging system type" msgstr "" -#: cmdline/apt-get.cc:1156 -#, c-format -msgid "%s is already the newest version.\n" -msgstr "" +#: apt-pkg/clean.cc:57 +#, fuzzy, c-format +msgid "Unable to stat %s." +msgstr "Nivîsandin ji bo %s ne pêkane" -#: cmdline/apt-get.cc:1185 -#, c-format -msgid "Release '%s' for '%s' was not found" +#: apt-pkg/srcrecords.cc:44 +msgid "You must put some 'source' URIs in your sources.list" msgstr "" -#: cmdline/apt-get.cc:1187 -#, c-format -msgid "Version '%s' for '%s' was not found" +#: apt-pkg/cachefile.cc:71 +msgid "The package lists or status file could not be parsed or opened." msgstr "" -#: cmdline/apt-get.cc:1193 -#, c-format -msgid "Selected version %s (%s) for %s\n" +#: apt-pkg/cachefile.cc:75 +msgid "You may want to run apt-get update to correct these problems" msgstr "" -#: cmdline/apt-get.cc:1330 -msgid "The update command takes no arguments" +#: apt-pkg/policy.cc:267 +msgid "Invalid record in the preferences file, no Package header" msgstr "" -#: cmdline/apt-get.cc:1343 -msgid "Unable to lock the list directory" +#: apt-pkg/policy.cc:289 +#, c-format +msgid "Did not understand pin type %s" msgstr "" -#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." +#: apt-pkg/policy.cc:297 +msgid "No priority (or zero) specified for pin" msgstr "" -#: cmdline/apt-get.cc:1433 -msgid "We are not supposed to delete stuff, can't start AutoRemover" +#: apt-pkg/pkgcachegen.cc:72 +msgid "Cache has an incompatible versioning system" msgstr "" -#: cmdline/apt-get.cc:1465 -#, fuzzy -msgid "" -"The following packages were automatically installed and are no longer " -"required:" -msgstr "Ev pakêtên NÛ dê werine sazkirin:" - -#: cmdline/apt-get.cc:1467 -msgid "Use 'apt-get autoremove' to remove them." +#: apt-pkg/pkgcachegen.cc:115 +#, c-format +msgid "Error occurred while processing %s (NewPackage)" msgstr "" -#: cmdline/apt-get.cc:1472 -msgid "" -"Hmm, seems like the AutoRemover destroyed something which really\n" -"shouldn't happen. Please file a bug report against apt." +#: apt-pkg/pkgcachegen.cc:130 +#, c-format +msgid "Error occurred while processing %s (UsePackage1)" msgstr "" -#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1755 -msgid "The following information may help to resolve the situation:" +#: apt-pkg/pkgcachegen.cc:153 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "" -#: cmdline/apt-get.cc:1479 -msgid "Internal Error, AutoRemover broke stuff" +#: apt-pkg/pkgcachegen.cc:178 +#, c-format +msgid "Error occurred while processing %s (UsePackage2)" msgstr "" -#: cmdline/apt-get.cc:1498 -msgid "Internal error, AllUpgrade broke stuff" +#: apt-pkg/pkgcachegen.cc:182 +#, c-format +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" -#: cmdline/apt-get.cc:1545 -#, fuzzy, c-format -msgid "Couldn't find task %s" -msgstr "Danegira %s nehate vekirin: %s" - -#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696 +#: apt-pkg/pkgcachegen.cc:213 #, c-format -msgid "Couldn't find package %s" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "" -#: cmdline/apt-get.cc:1683 +#: apt-pkg/pkgcachegen.cc:217 #, c-format -msgid "Note, selecting %s for regex '%s'\n" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "" -#: cmdline/apt-get.cc:1714 -#, fuzzy, c-format -msgid "%s set to manual installed.\n" -msgstr "lê %s dê were sazkirin" - -#: cmdline/apt-get.cc:1727 -msgid "You might want to run `apt-get -f install' to correct these:" +#: apt-pkg/pkgcachegen.cc:221 +#, c-format +msgid "Error occurred while processing %s (NewVersion2)" msgstr "" -#: cmdline/apt-get.cc:1730 -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." +#: apt-pkg/pkgcachegen.cc:245 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "" -#: cmdline/apt-get.cc:1742 -msgid "" -"Some packages could not be installed. This may mean that you have\n" -"requested an impossible situation or if you are using the unstable\n" -"distribution that some required packages have not yet been created\n" -"or been moved out of Incoming." +#: apt-pkg/pkgcachegen.cc:251 +msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: cmdline/apt-get.cc:1750 -msgid "" -"Since you only requested a single operation it is extremely likely that\n" -"the package is simply not installable and a bug report against\n" -"that package should be filed." +#: apt-pkg/pkgcachegen.cc:254 +msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: cmdline/apt-get.cc:1758 -msgid "Broken packages" -msgstr "Paketên şikestî" +#: apt-pkg/pkgcachegen.cc:257 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" -#: cmdline/apt-get.cc:1787 -msgid "The following extra packages will be installed:" +#: apt-pkg/pkgcachegen.cc:260 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: cmdline/apt-get.cc:1876 -msgid "Suggested packages:" -msgstr "Paketên tên pêşniyaz kirin:" +#: apt-pkg/pkgcachegen.cc:288 +#, c-format +msgid "Error occurred while processing %s (FindPkg)" +msgstr "" -#: cmdline/apt-get.cc:1877 -msgid "Recommended packages:" -msgstr "Paketên tên tawsiyê kirin:" +#: apt-pkg/pkgcachegen.cc:301 +#, c-format +msgid "Error occurred while processing %s (CollectFileProvides)" +msgstr "" -#: cmdline/apt-get.cc:1905 -msgid "Calculating upgrade... " +#: apt-pkg/pkgcachegen.cc:307 +#, c-format +msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: cmdline/apt-get.cc:1913 -msgid "Done" -msgstr "Temam" +#: apt-pkg/pkgcachegen.cc:678 +#, c-format +msgid "Couldn't stat source package list %s" +msgstr "" -#: cmdline/apt-get.cc:1980 cmdline/apt-get.cc:1988 -msgid "Internal error, problem resolver broke stuff" +#: apt-pkg/pkgcachegen.cc:763 +msgid "Collecting File Provides" msgstr "" -#: cmdline/apt-get.cc:2088 -msgid "Must specify at least one package to fetch source for" +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 +msgid "IO Error saving source cache" msgstr "" -#: cmdline/apt-get.cc:2118 cmdline/apt-get.cc:2352 +#: apt-pkg/acquire-item.cc:134 #, c-format -msgid "Unable to find a source package for %s" +msgid "rename failed, %s (%s -> %s)." msgstr "" -#: cmdline/apt-get.cc:2167 -#, c-format -msgid "Skipping already downloaded file '%s'\n" +#: apt-pkg/acquire-item.cc:451 +msgid "MD5Sum mismatch" msgstr "" -#: cmdline/apt-get.cc:2191 -#, c-format -msgid "You don't have enough free space in %s" +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 +msgid "Hash Sum mismatch" +msgstr "" + +#: apt-pkg/acquire-item.cc:1150 +msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: cmdline/apt-get.cc:2196 +#: apt-pkg/acquire-item.cc:1264 #, c-format -msgid "Need to get %sB/%sB of source archives.\n" +msgid "" +"I wasn't able to locate a file for the %s package. This might mean you need " +"to manually fix this package. (due to missing arch)" msgstr "" -#: cmdline/apt-get.cc:2199 +#: apt-pkg/acquire-item.cc:1323 #, c-format -msgid "Need to get %sB of source archives.\n" +msgid "" +"I wasn't able to locate file for the %s package. This might mean you need to " +"manually fix this package." msgstr "" -#: cmdline/apt-get.cc:2205 +#: apt-pkg/acquire-item.cc:1364 #, c-format -msgid "Fetch source %s\n" +msgid "" +"The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: cmdline/apt-get.cc:2236 -msgid "Failed to fetch some archives." +#: apt-pkg/acquire-item.cc:1451 +msgid "Size mismatch" msgstr "" -#: cmdline/apt-get.cc:2264 +#: apt-pkg/vendorlist.cc:66 #, c-format -msgid "Skipping unpack of already unpacked source in %s\n" +msgid "Vendor block %s contains no fingerprint" msgstr "" -#: cmdline/apt-get.cc:2276 +#: apt-pkg/cdrom.cc:529 #, c-format -msgid "Unpack command '%s' failed.\n" +msgid "" +"Using CD-ROM mount point %s\n" +"Mounting CD-ROM\n" msgstr "" -#: cmdline/apt-get.cc:2277 +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 +msgid "Identifying.. " +msgstr "" + +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Check if the 'dpkg-dev' package is installed.\n" +msgid "Stored label: %s\n" +msgstr "" + +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" msgstr "" -#: cmdline/apt-get.cc:2294 +#: apt-pkg/cdrom.cc:590 #, c-format -msgid "Build command '%s' failed.\n" +msgid "Using CD-ROM mount point %s\n" msgstr "" -#: cmdline/apt-get.cc:2313 -msgid "Child process failed" +#: apt-pkg/cdrom.cc:608 +msgid "Unmounting CD-ROM\n" msgstr "" -#: cmdline/apt-get.cc:2329 -msgid "Must specify at least one package to check builddeps for" +#: apt-pkg/cdrom.cc:612 +msgid "Waiting for disc...\n" msgstr "" -#: cmdline/apt-get.cc:2357 -#, c-format -msgid "Unable to get build-dependency information for %s" +#. Mount the new CDROM +#: apt-pkg/cdrom.cc:620 +msgid "Mounting CD-ROM...\n" msgstr "" -#: cmdline/apt-get.cc:2377 -#, c-format -msgid "%s has no build depends.\n" +#: apt-pkg/cdrom.cc:638 +msgid "Scanning disc for index files..\n" msgstr "" -#: cmdline/apt-get.cc:2429 +#: apt-pkg/cdrom.cc:678 #, c-format msgid "" -"%s dependency for %s cannot be satisfied because the package %s cannot be " -"found" +"Found %u package indexes, %u source indexes, %u translation indexes and %u " +"signatures\n" msgstr "" -#: cmdline/apt-get.cc:2482 +#: apt-pkg/cdrom.cc:715 #, c-format -msgid "" -"%s dependency for %s cannot be satisfied because no available versions of " -"package %s can satisfy version requirements" +msgid "Found label '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2518 -#, c-format -msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" +#: apt-pkg/cdrom.cc:744 +msgid "That is not a valid name, try again.\n" msgstr "" -#: cmdline/apt-get.cc:2543 +#: apt-pkg/cdrom.cc:760 #, c-format -msgid "Failed to satisfy %s dependency for %s: %s" +msgid "" +"This disc is called: \n" +"'%s'\n" msgstr "" -#: cmdline/apt-get.cc:2557 -#, c-format -msgid "Build-dependencies for %s could not be satisfied." +#: apt-pkg/cdrom.cc:764 +msgid "Copying package lists..." msgstr "" -#: cmdline/apt-get.cc:2561 -msgid "Failed to process build dependencies" +#: apt-pkg/cdrom.cc:790 +msgid "Writing new source list\n" msgstr "" -#: cmdline/apt-get.cc:2593 -msgid "Supported modules:" +#: apt-pkg/cdrom.cc:799 +msgid "Source list entries for this disc are:\n" msgstr "" -#: cmdline/apt-get.cc:2634 -msgid "" -"Usage: apt-get [options] command\n" -" apt-get [options] install|remove pkg1 [pkg2 ...]\n" -" apt-get [options] source pkg1 [pkg2 ...]\n" -"\n" -"apt-get is a simple command line interface for downloading and\n" -"installing packages. The most frequently used commands are update\n" -"and install.\n" -"\n" -"Commands:\n" -" update - Retrieve new lists of packages\n" -" upgrade - Perform an upgrade\n" -" install - Install new packages (pkg is libc6 not libc6.deb)\n" -" remove - Remove packages\n" -" autoremove - Remove all automatic unused packages\n" -" purge - Remove and purge packages\n" -" source - Download source archives\n" -" build-dep - Configure build-dependencies for source packages\n" -" dist-upgrade - Distribution upgrade, see apt-get(8)\n" -" dselect-upgrade - Follow dselect selections\n" -" clean - Erase downloaded archive files\n" -" autoclean - Erase old downloaded archive files\n" -" check - Verify that there are no broken dependencies\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -qq No output except for errors\n" -" -d Download only - do NOT install or unpack archives\n" -" -s No-act. Perform ordering simulation\n" -" -y Assume Yes to all queries and do not prompt\n" -" -f Attempt to continue if the integrity check fails\n" -" -m Attempt to continue if archives are unlocatable\n" -" -u Show a list of upgraded packages as well\n" -" -b Build the source package after fetching it\n" -" -V Show verbose version numbers\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n" -"pages for more information and options.\n" -" This APT has Super Cow Powers.\n" +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 +#, c-format +msgid "Wrote %i records.\n" msgstr "" -#: cmdline/acqprogress.cc:55 -msgid "Hit " +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 +#, c-format +msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: cmdline/acqprogress.cc:79 -msgid "Get:" +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: cmdline/acqprogress.cc:110 -msgid "Ign " +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831 +#, c-format +msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: cmdline/acqprogress.cc:114 -msgid "Err " +#: apt-pkg/deb/dpkgpm.cc:454 +#, c-format +msgid "Directory '%s' missing" msgstr "" -#: cmdline/acqprogress.cc:135 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format -msgid "Fetched %sB in %s (%sB/s)\n" +msgid "Preparing %s" msgstr "" -#: cmdline/acqprogress.cc:225 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format -msgid " [Working]" -msgstr " [Dixebite]" +msgid "Unpacking %s" +msgstr "" -#: cmdline/acqprogress.cc:271 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" +msgid "Preparing to configure %s" msgstr "" -#: cmdline/apt-sortpkgs.cc:86 -msgid "Unknown package record!" +#: apt-pkg/deb/dpkgpm.cc:544 +#, c-format +msgid "Configuring %s" msgstr "" -#: cmdline/apt-sortpkgs.cc:150 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 +#, fuzzy, c-format +msgid "Processing triggers for %s" +msgstr "Di şixulandina pêrista %s de çewtî" + +#: apt-pkg/deb/dpkgpm.cc:549 +#, fuzzy, c-format +msgid "Installed %s" +msgstr " Sazkirî: " + +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 +#, c-format +msgid "Preparing for removal of %s" msgstr "" -#: dselect/install:32 -msgid "Bad default setting!" +#: apt-pkg/deb/dpkgpm.cc:559 +#, c-format +msgid "Removing %s" msgstr "" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 -msgid "Press enter to continue." +#: apt-pkg/deb/dpkgpm.cc:560 +#, c-format +msgid "Removed %s" msgstr "" -#: dselect/install:100 -msgid "Some errors occurred while unpacking. I'm going to configure the" +#: apt-pkg/deb/dpkgpm.cc:565 +#, c-format +msgid "Preparing to completely remove %s" msgstr "" -#: dselect/install:101 -msgid "packages that were installed. This may result in duplicate errors" +#: apt-pkg/deb/dpkgpm.cc:566 +#, c-format +msgid "Completely removed %s" msgstr "" -#: dselect/install:102 -msgid "or errors caused by missing dependencies. This is OK, only the errors" +#: apt-pkg/deb/dpkgpm.cc:716 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: dselect/install:103 -msgid "" -"above this message are important. Please fix them and run [I]nstall again" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " msgstr "" -#: dselect/update:30 -msgid "Merging available information" +#: methods/rred.cc:219 +#, fuzzy +msgid "Could not patch file" +msgstr "Danegira %s nehate vekirin: %s" + +#: methods/rsh.cc:330 +msgid "Connection closed prematurely" msgstr "" #, fuzzy diff --git a/po/mr.po b/po/mr.po index 947fd3d73..9f323038a 100644 --- a/po/mr.po +++ b/po/mr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2006-08-09 16:17+0200\n" "Last-Translator: Priti Patil \n" "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India " @@ -158,7 +158,7 @@ msgstr "%4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s करिता %s %s वर संग्रहित\n" @@ -655,7 +655,7 @@ msgstr "%s ला पुनर्नामांकन %s करण्यास msgid "Y" msgstr "होय" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "रिजेक्स कंपायलेशन त्रुटी -%s " @@ -816,12 +816,12 @@ msgstr "पॅकेजेस कायमची काढायची आहे msgid "Internal error, Ordering didn't finish" msgstr "अंतर्गत त्रुटी,क्रम अजून संपला नाही" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "डाऊनलोड डिरेक्टरी कुलूपबंद करण्यास असमर्थ" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "उगमांच्या याद्या वाचता येणार नाहीत." @@ -849,7 +849,7 @@ msgstr "उघडल्यानंतर %sB ची अधिक डिस् msgid "After this operation, %sB disk space will be freed.\n" msgstr "उघडल्यानंतर %sB डिस्क जागा मोकळी होईल.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s मध्ये रिकामी जागा सांगू शकत नाही" @@ -886,7 +886,7 @@ msgstr "व्यत्यय/बंद करा." msgid "Do you want to continue [Y/n]? " msgstr "तुम्हाला पुढे जायचे आहे [Y/n]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, fuzzy, c-format msgid "Failed to fetch %s %s\n" msgstr "%s घेण्यासाठी नाकाम\n" @@ -895,7 +895,7 @@ msgstr "%s घेण्यासाठी नाकाम\n" msgid "Some files failed to download" msgstr "काही संचिका डाऊनलोड करण्यास असमर्थ" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "डाऊनलोड संपूर्ण आणि डाऊनलोड मध्ये फक्त पद्धती" @@ -1001,75 +1001,67 @@ msgstr "सुधारित आवृत्तीचा विधान आर msgid "Unable to lock the list directory" msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"काही अनुक्रमणिका संचयिका डाऊनलोड करण्यास असमर्थ,त्या दुर्लक्षित झाल्या, किंवा " -"त्याऐवजी जुन्या वापरल्या गेल्या." - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "खालील नविन पॅकेजेस संस्थापित होतील:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "खालील माहिती परिस्थिती निवळण्यासाठी मदत ठरू शकेल:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "अंतर्गत त्रुटी, अडचण निवारकाने स्टफला तोडले" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "अंतर्गत त्रुटी,ऑलअपग्रेडने स्टफला तोडले" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "%s पॅकेज सापडू शकले नाही" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "%s पॅकेज सापडू शकले नाही" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "सूचना, '%s' रिजेक्स साठी %s ची निवड करत आहे\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "पण %s संस्थापित करायचे आहे" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "तुम्हाला कदाचित `apt-get -f install'(एपीटी-गेट -एफ संस्थापन') प्रोग्राम चालू करावा " "लागेल'यात बदल करण्यासाठी:" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1077,7 +1069,7 @@ msgstr "" "अनमेट डिपेंडन्सीज.एपीटी-गेट -एफ संस्थापन (`apt-get -f install') पॅकेजशिवाय प्रयत्न करा " "(किंवा पर्याय सांगा)." -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1089,7 +1081,7 @@ msgstr "" "विभागणी असणारी पण हवी असणारी, तयार केली नसलेली पॅकेजेस वापरत असाल \n" "किंवा ती येणाऱ्यांपैकी बाहेर हलविली असतील." -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1099,122 +1091,137 @@ msgstr "" "ते पॅकेज संस्थापित होऊ शकत नाही आणि त्याच्या विरूद्ध \n" "दोष आढाव्याची नोंद ठेवली पाहिजे." -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "तुटलेली पॅकेजेस" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "खालील अतिरिक्त पॅकेजेस संस्थापित होतील:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "सुचवलेली पॅकेजेस:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "शिफारस केलेली पॅकेजेस:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "पुढिल आवृत्तीची गणती करीत आहे..." -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "असमर्थ" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "झाले" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "अंतर्गत त्रुटी, अडचण निवारकाने स्टफला तोडले" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "%s उगम पॅकेज शोधणे शक्य नाही/शोधण्यास असमर्थ आहे" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द्या\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "%s मध्ये पुरेशी जागा नाही" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "उगम अर्काईव्हज चा %sB/%sB घेण्याची गरज आहे.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "उगम अर्काईव्हजचा %sB घेण्याची गरज आहे.\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "%s उगम घ्या\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "काही अर्काईव्हज आणण्यास असमर्थ." -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s मध्ये आधीच उघडलेल्या उगमातील उघडलेल्याला सोडून द्या किंवा वगळा\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s' आज्ञा सुट्या करण्यास असमर्थ.\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "बांधणी करणाऱ्या आज्ञा '%s' अयशस्वी.\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "चाईल्ड प्रक्रिया अयशस्वी" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "बिल्डेपस् कशासाठी ते पडताळण्यासाठी किमान एक पॅकेज सांगणे गरजेचे आहे" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s साठी बांधणी डिपेंडन्सी माहिती मिळवण्यास असमर्थ" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s ला बांधणी डिपेंडन्स नाहीत.\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1223,30 +1230,30 @@ msgstr "" "आवृतीची मागणी पूर्ण करण्यासाठी %s पॅकेजची आवृत्ती उपलब्ध नाही,त्यामुळे %s साठी %s " "डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, fuzzy, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "%s साठी %s डिपेंडन्सी पूर्ण होण्यास असमर्थ: संस्थापित पॅकेज पण नवीन आहे" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s साठी %s डिपेंडन्सी पूर्ण होण्यास असमर्थ: %s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s साठी बांधणी-डिपेंडन्सीज पूर्ण होऊ शकत नाही." -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ " -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1557,7 +1564,7 @@ msgstr "File %s/%s, %s पॅकेज मधल्या एका वर प #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "%s वाचण्यास असमर्थ" @@ -1788,7 +1795,7 @@ msgstr "वेळेअभावी संबंध जोडता येत msgid "Server closed the connection" msgstr "सर्व्हरने संबंध जोडणी बंद केली" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "त्रुटी वाचा" @@ -1800,7 +1807,7 @@ msgstr "प्रतिसाधाने बफर भरुन गेले." msgid "Protocol corruption" msgstr "प्रोटोकॉल खराब झाले" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "लिहिण्यात त्रुटी" @@ -1854,7 +1861,7 @@ msgstr "डेटा सॉकेट जोडणी वेळेअभावी msgid "Unable to accept connection" msgstr "जोडणी स्विकारण्यास असमर्थ" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "फाईल हॅश करण्यात त्रुटी" @@ -1881,39 +1888,39 @@ msgstr "प्रश्न" msgid "Unable to invoke " msgstr "जारी करण्यास करण्यास असमर्थ" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "%s (%s) ला जोडत आहे" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[आयपी:%s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "%s (f=%u t=%u p=%u) साठी सॉकेट तयार करू शकत नाही" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "%s:%s (%s). साठी जोडणी इनिशिएट/पुढाकारीत करू शकत नाही" -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "%s:%s (%s) ला जोडू शकत नाही,जोडणी वेळेअभावी तुटली" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "%s:%s (%s) ला जोडू शकत नाही" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "%s ला जोडत आहे" @@ -1987,76 +1994,76 @@ msgstr "%s साठी पाईप उघडता येत नाही" msgid "Read error from %s process" msgstr "%s क्रियेपासून चूक वाचा" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "शीर्षकासाठी थांबले आहे...." -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "%u अक्षरांवर एक शीर्षक ओळ मिळाली" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "वाईट शीर्षक ओळ" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP सर्व्हरने अवैध प्रत्त्युत्तर शीर्षक पाठविले" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP सर्व्हरने अवैध मजकूर-लांबी शीर्षक पाठविले " -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP सर्व्हरने अवैध मजकूर-विस्तार शीर्षक पाठविले" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "HTTP सर्व्हरने विस्तार तांत्रिक मदत जोडली" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "अपरिचित दिनांक प्रकार/स्वरूप " -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "चुकले/असमर्थ निवड करा" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "जोडणी वेळेअभावी तुटली" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "निर्गत फाईल मध्ये लिहिताना त्रुटी/चूक" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "सर्व्हर मधून वाचण्यात चूक. लांब शेवट आणि बंद झालेली जोडणी" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "सर्व्हर मधून वाचण्यात चूक" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "चुकीचा शीर्षक डाटा" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "जोडणी अयशस्वी" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "अंतर्गत त्रुटी" @@ -2191,6 +2198,7 @@ msgid "Unable to stat the mount point %s" msgstr "%s माऊंट पॉईंट स्टॅट करण्यास असमर्थ" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "%s मध्ये बदलण्यास असमर्थ" @@ -2199,70 +2207,70 @@ msgstr "%s मध्ये बदलण्यास असमर्थ" msgid "Failed to stat the cdrom" msgstr "सीडी-रॉम स्टॅट करण्यास असमर्थ" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "फक्त वाचण्यासाठी कुलूप संचिका %s साठी कुलूपबंदचा वापर करीत नाही" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "%s कुलूप फाईल उघडता येत नाही" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "%s nfs(नेटवर्क फाईल सिस्टीम) माऊंटेड कुलुप फाईल ला कुलुप /बंद करता येत नाही" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "%s कुलुप मिळवता येत नाही" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s साठी थांबलो पण ते तेथे नव्हते" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "%s उपक्रियेने (%u) त्रुटी कोड दिलेला आहे" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "%s उपक्रिया अचानकपणे बाहेर पडली" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "%s फाईल उघडता येत नाही" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "वाचा, %lu अजूनही वाचण्यासाठी आहे पण आता काही उरली नाही" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "लिहा, %lu अजूनही लिहिण्यासाठी आहे पण लिहिता येत नाही" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "फाईल बंद करण्यात अडचण" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "फाईल अनलिंकिंग करण्यात अडचण" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "संचिकेची syncing समस्या" @@ -2426,7 +2434,7 @@ msgstr "%s स्त्रोत सुचीमध्ये %u रेषेव msgid "Malformed line %u in source list %s (vendor id)" msgstr "%s (विक्रेता आयडी)स्त्रोत सुचीमध्ये %u वाईट/व्यंग रेषा " -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2461,6 +2469,14 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "अडचणी दूर करण्यास असमर्थ, तुम्ही तुटलेले पॅकेज घेतलेले आहे." +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"काही अनुक्रमणिका संचयिका डाऊनलोड करण्यास असमर्थ,त्या दुर्लक्षित झाल्या, किंवा " +"त्याऐवजी जुन्या वापरल्या गेल्या." + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2493,17 +2509,17 @@ msgstr "%s कार्यपध्दतीचा ड्राइव्हर msgid "Method %s did not start correctly" msgstr "%s कार्यपध्दती योग्य रीतीने सुरु झालेली नाही" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "कृपया '%s' लेबल असलेली डिस्क '%s' या ड्राइव्हमध्ये ठेवा आणि एन्टर कळ दाबा." -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "'%s' पॅकेजींग प्रणाली सहाय्यकारी नाही" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "योग्य असा पॅकेजिंग प्रणाली प्रकार निश्चित करण्यास असमर्थ " @@ -2516,11 +2532,11 @@ msgstr "%s स्टॅट करण्यात असमर्थ. " msgid "You must put some 'source' URIs in your sources.list" msgstr "तुम्ही तुमच्या उगमस्थान यादीत URI घाला" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "पॅकेजच्या याद्या किंवा संचिकेची स्थिती स्पष्ट होऊ शकत नाही किंवा ती उघडू शकत नाही." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "तुम्ही ह्या समस्यांचे निवारण करण्यासाठी apt-get update प्रोग्राम चालू करु शकता" @@ -2637,26 +2653,26 @@ msgstr "तरतूद/पुरवलेल्या संचिका सं msgid "IO Error saving source cache" msgstr "IO त्रुटी उगम निवडक संचयस्थानात संग्रहित होत आहे" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "पुनर्नामांकन अयशस्वी, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "एमडी५ बेरीज/MD5Sum जुळत नाही" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 #, fuzzy msgid "Hash Sum mismatch" msgstr "एमडी५ बेरीज/MD5Sum जुळत नाही" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 #, fuzzy msgid "There is no public key available for the following key IDs:\n" msgstr "पुढील कळ ओळखचिन्हासाठी सामायिक कळ उपलब्ध नाही:\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2665,7 +2681,7 @@ msgstr "" "मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते " "स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) " -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2674,7 +2690,7 @@ msgstr "" "मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हालाहे पॅकेज स्वहस्ते " "स्थिर/निश्चित करण्याची गरज आहे." -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2682,7 +2698,7 @@ msgstr "" "पॅकेज यादीची/सुचीची संचिका दूषित/खराब झालेली आहे. संचिका नाव नाही: पॅकेजकरीता क्षेत्र/" "ठिकाण %s." -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "आकार जुळतनाही" @@ -2794,71 +2810,78 @@ msgstr "%i विजोड संचिकांबरोबर %i माहि msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "%i गहाळ संचिकाबरोबर आणि %i विजोड संचिकाबरोबर %i माहिती संच लिहिले\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "संचयिका यादीत %s पार्शल हरवले आहे." -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "%s तयार करित आहे" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "%s सुटे/मोकळे करीत आहे " -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "%s संरचने साठी तयार करत आहे" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "%s संरचित होत आहे" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "त्रुटी प्रक्रिया मार्गदर्शिका%s " -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "%s संस्थापित झाले" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "%s ला काढून टाकण्यासाठी तयारी करत आहे" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "%s काढून टाकत आहे" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "%s काढून टाकले" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "%s संपूर्ण काढून टाकण्याची तयारी करत आहे" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "%s संपूर्ण काढून टाकले" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 #, fuzzy msgid "Could not patch file" diff --git a/po/nb.po b/po/nb.po index 8eca5fd7f..af80359f8 100644 --- a/po/nb.po +++ b/po/nb.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2006-10-16 00:35+0100\n" "Last-Translator: Hans Fredrik Nordhaug \n" "Language-Team: Norwegian Bokmal \n" @@ -168,7 +168,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s %s kompilert p %s %s\n" @@ -666,7 +666,7 @@ msgstr "Klarte ikke msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "Kompileringsfeil i regulrt uttrykk - %s" @@ -827,12 +827,12 @@ msgstr "Pakker trenges msgid "Internal error, Ordering didn't finish" msgstr "Intern feil, sortering fullfrte ikke" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "Klarer ikke lse nedlastingsmappa" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Kan ikke lese kildlista." @@ -862,7 +862,7 @@ msgstr "Etter utpakking vil %sB ekstra diskplass bli brukt.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Etter utpakking vil %sB diskplass bli ledig.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "Klarte ikke bestemme ledig plass i %s" @@ -900,7 +900,7 @@ msgstr "Avbryter." msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsette [Y/n]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikke skaffe %s %s\n" @@ -909,7 +909,7 @@ msgstr "Klarte ikke msgid "Some files failed to download" msgstr "Noen av filene kunne ikke lastes ned" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "Nedlasting fullfrt med innstillinga bare nedlasting" @@ -1015,73 +1015,65 @@ msgstr "Oppdaterings-kommandoen tar ingen argumenter" msgid "Unable to lock the list directory" msgstr "Kan ikke lse listemappa" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"Klarte ikke laste ned alle oversiktfilene. De ble ignorerte, eller gamle " -"ble brukt isteden. " - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Flgende NYE pakker vil bli installert:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "Flgende informasjon kan vre til hjelp med lse problemet:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Intern feil, problemlser dela noe" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil - AllUpgrade dela noe" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Klarte ikke finne pakken %s" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "Klarte ikke finne pakken %s" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Merk, velger %s istedenfor det regulre uttrykket %s\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "men %s skal installeres" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du vil kanskje utfre apt-get -f install for rette p disse:" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1089,7 +1081,7 @@ msgstr "" "Uinnfridde avhengighetsforhold. Prv apt-get -f install uten pakker (eller " "angi en lsning)." -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1101,7 +1093,7 @@ msgstr "" "at visse kjernepakker enn ikke er laget eller flyttet ut av Incoming for\n" "distribusjonen." -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1111,122 +1103,137 @@ msgstr "" "at pakken helt enkelt ikke kan installeres, og du br fylle ut en " "feilmelding." -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "delagte pakker" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "Flgende ekstra pakker vil bli installert." -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "Foresltte pakker:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "Anbefalte pakker" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "Beregner oppgradering... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Mislyktes" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "Utfrt" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "Intern feil, problemlser dela noe" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "Du m angi minst en pakke du vil ha kildekoden til" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "Klarer ikke finne en kildekodepakke for %s" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hopper over allerede nedlastet fil %s\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plass i %s" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Trenger skaffe %sB av %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Trenger skaffe %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "Skaffer kildekode %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "Klarte ikke skaffe alle arkivene." -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omgr utpakking av allerede utpakket kilde i %s\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen %s mislyktes.\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Sjekk om pakken dpkg-dev er installert.\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggekommandoen %s mislyktes.\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "Barneprosessen mislyktes" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "Du m angi minst en pakke du vil sjekke builddeps for" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarer ikke skaffe informasjon om bygge-avhengighetene for %s" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen avhengigheter.\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1235,32 +1242,32 @@ msgstr "" "Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige " "versjoner av pakken %s som oppfyller versjonskravene" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Klarte ikke tilfredsstille %s avhengighet for %s: den installerte pakken %" "s er for ny" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikke tilfredsstille %s avhengighet for %s: %s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Klarte ikke tilfredstille bygg-avhengighetene for %s." -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "Klarte ikke behandle forutsetningene for bygging" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "Stttede moduler:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1572,7 +1579,7 @@ msgstr "Fila %s/%s skriver over den tilsvarende fila i pakken %s" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "Klarer ikke lese %s" @@ -1808,7 +1815,7 @@ msgstr "Tidsavbrudd p msgid "Server closed the connection" msgstr "Tjeneren lukket forbindelsen" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "Lesefeil" @@ -1820,7 +1827,7 @@ msgstr "Et svar oversv msgid "Protocol corruption" msgstr "Protokolldeleggelse" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "Skrivefeil" @@ -1874,7 +1881,7 @@ msgstr "Tidsavbrudd p msgid "Unable to accept connection" msgstr "Klarte ikke godta tilkoblingen" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved oppretting av nkkel for fil" @@ -1901,39 +1908,39 @@ msgstr "Sp msgid "Unable to invoke " msgstr "Klarte ikke starte" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Kobler til %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Klarte ikke opprette en sokkel for %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Klarte ikke starte forbindelsen til %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Klarte ikke koble til %s:%s (%s), tidsavbrudd p forbindelsen" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Klarte ikke koble til %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Kobler til %s" @@ -2008,76 +2015,76 @@ msgstr "Klarte ikke msgid "Read error from %s process" msgstr "Lesefeil fra %s-prosessen" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Venter p hoder" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Fikk en enkel hodelinje over %u tegn" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "delagt hodelinje" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP-tjeneren sendte et ugyldig svarhode" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP-tjeneren sendte et ugyldig Content-Length-hode" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP-tjeneren sendte et ugyldig Content-Range-hode" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Denne HTTP-tjeneren har delagt sttte for omrde" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Ukjent datoformat" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Utvalget mislykkes" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Tidsavbrudd p forbindelsen" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Feil ved lesing fra tjeneren" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "delagte hodedata" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "Forbindelsen mislykkes" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "Intern feil" @@ -2212,6 +2219,7 @@ msgid "Unable to stat the mount point %s" msgstr "Klarer ikke fastsette monteringspunktet %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "Klarer ikke endre %s" @@ -2220,70 +2228,70 @@ msgstr "Klarer ikke msgid "Failed to stat the cdrom" msgstr "Klarer ikke f statusen p CD-spilleren" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Bruker ikke lsing for den skrivebeskyttede lsefila %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "Kunne ikke pne lsefila %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Bruker ikke lsing p den nfs-monterte lsefila %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "Fr ikke lst %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ventet p %s, men den ble ikke funnet" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprosessen %s mottok et minnefeilsignal." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprosessen %s ga en feilkode (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprosessen %s avsluttet uventet" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "Kunne ikke pne fila %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "lese, har fremdeles %lu igjen lese, men ingen igjen" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "skrive, har fremdeles %lu igjen skrive, men klarte ikke " -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "Problem ved lsing av fila" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "Problem ved oppheving av lenke til fila" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "Problem ved oppdatering av fila" @@ -2447,7 +2455,7 @@ msgstr "Typen msgid "Malformed line %u in source list %s (vendor id)" msgstr "Feil p %u i kildelista %s (selgers id)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2482,6 +2490,14 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Klarer ikke rette problemene, noen delagte pakker er holdt tilbake." +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Klarte ikke laste ned alle oversiktfilene. De ble ignorerte, eller gamle " +"ble brukt isteden. " + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2514,17 +2530,17 @@ msgstr "Finner ikke metode-driveren %s." msgid "Method %s did not start correctly" msgstr "Metoden %s startet ikke korrekt" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Sett inn disken merket %s i lagringsenheten %s og trykk Enter." -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet %s stttes ikke" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Klarer ikke bestemme en passende pakkesystemtype" @@ -2538,11 +2554,11 @@ msgid "You must put some 'source' URIs in your sources.list" msgstr "" "Beklager, du m legge inn noen kilder (nettadresser) i din sources.list." -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "Pakkelista eller tilstandsfila kunne ikke fortolkes eller pnes." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Det kan hende du vil kjre apt-get update for rette p disse problemene" @@ -2654,26 +2670,26 @@ msgstr "Samler inn filtilbud" msgid "IO Error saving source cache" msgstr "IO-feil ved lagring av kildekode-lager" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "klarte ikke endre navnet, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "Feil MD5sum" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 #, fuzzy msgid "Hash Sum mismatch" msgstr "Feil MD5sum" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Det er ingen offentlig nkkel tilgjengelig for de flgende nkkel-ID-ene:\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2682,7 +2698,7 @@ msgstr "" "Klarte ikke finne en fil for pakken %s. Det kan bety at du m ordne pakken " "selv (fordi arkitekturen mangler)." -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2691,13 +2707,13 @@ msgstr "" "Klarte ikke finne en fil for pakken %s. Det kan bety at du m ordne denne " "pakken selv." -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Oversiktsfilene er delagte. Feltet Filename: mangler for pakken %s." -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "Feil strrelse" @@ -2808,71 +2824,78 @@ msgstr "Skrev %i poster med %i feile filer.\n" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i manglende filer og %i feile filer.\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Listemappa %spartial mangler." -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "Forbereder %s" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "Pakker ut %s" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "Forbereder konfigurering %s" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "Konfigurer %s" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Feil ved lesing av katalogen %s" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "Installerte %s" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "Forbereder fjerning av %s" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "Fjerner %s" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "Fjernet %s" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "Forbereder fullstendig slette %s" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "Fjernet %s fullstendig" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "Kunne ikke pne fila %s" diff --git a/po/ne.po b/po/ne.po index 1b864cf74..7f14aa8ce 100644 --- a/po/ne.po +++ b/po/ne.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2006-06-12 14:35+0545\n" "Last-Translator: Shiva Pokharel \n" "Language-Team: Nepali \n" @@ -159,7 +159,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s को लागि %s %s, %s %s मा कम्पाएल गरिएको छ\n" @@ -656,7 +656,7 @@ msgstr " %s मा %s पुन:नामकरण असफल भयो" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s" @@ -817,12 +817,12 @@ msgstr "प्याकेजहरू हट्न चाहदैछन् त msgid "Internal error, Ordering didn't finish" msgstr "आन्तरिक त्रुटि, आदेश समाप्त भएको छैन" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "डाउनलोड डाइरेक्ट्री ताल्चा मार्न असक्षम" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "स्रोतहरुको सूचि पढ्न सकिएन ।" @@ -850,7 +850,7 @@ msgstr "अनप्याक गरिसके पछि थप डिस् msgid "After this operation, %sB disk space will be freed.\n" msgstr "%sB अनप्याक गरिसके पछि डिस्क खाली ठाउँ खाली हुनेछ ।\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन" @@ -887,7 +887,7 @@ msgstr "परित्याग गर्नुहोस् ।" msgid "Do you want to continue [Y/n]? " msgstr "के तपाईँ निरन्तरता दिन चाहनुहुन्छ [Y/n]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s तान्न असफल भयो\n" @@ -896,7 +896,7 @@ msgstr "%s %s तान्न असफल भयो\n" msgid "Some files failed to download" msgstr "केही फाइलहरू डाउनलोड गर्न असफल भयो" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "डाउनलोड समाप्त भयो र डाउनलोडमा मोड मात्रै छ" @@ -1001,73 +1001,65 @@ msgstr "अद्यावधिक आदेशले कुनै तर्क msgid "Unable to lock the list directory" msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"केही अनुक्रमणिका फाइलहरू डाउनलोड गर्न असफल भयो, तिनीहरू उपेक्षित भए, वा सट्टामा पुरानो " -"एउटा प्रयोग गरियो ।" - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "निम्न सूचनाले अवस्थालाई हल गर्न मद्दत गर्नेछ: " -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो " -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "आन्तरिक त्रुटि,सबै स्तरवृद्धिले उत्तम गुण नष्ट गर्दछ" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "प्याकेज फेला पार्न सकिएन %s" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "प्याकेज फेला पार्न सकिएन %s" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "द्रष्टब्य, रिजेक्स '%s' को लागि %s चयन गरिदैछ\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "तर %s स्थापना हुनुपर्यो" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "तपाईँ यसलाई सुधार गर्न `apt-get -f install' चलाउन चाहनुहुन्छ:" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1075,7 +1067,7 @@ msgstr "" "नभेटिएका निर्भरताहरू । प्याकेजहरू बिना 'apt-get -f install' प्रयास गर्नुहोस् ( वा " "समाधान निर्दिष्ट गर्नुहोस्) ।" -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1088,7 +1080,7 @@ msgstr "" " वितरण अहिले सम्म सिर्जना\n" " भएको छैन वा आवगमन विनानै सर्यो ।" -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1098,122 +1090,137 @@ msgstr "" " यो प्याकेज साधरण तरिकाले नितान्त स्थापनायोग्य देखिदैन र त्यो प्याकेज विरुद्धको\n" " बग प्रतिवेदन भरिनेछ ।" -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "भाँचिएका प्याकेजहरू" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "निम्न अतिरिक्त प्याकेजहरू स्थापना हुनेछन्:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "सुझाव दिएका प्याकेजहरू:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "सिफारिस गरिएका प्याकेजहरू:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "स्तर वृद्धि गणना गरिदैछ..." -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "असफल भयो" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "काम भयो" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो " -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "%s को लागि स्रोत प्याकेज फेला पार्न असफल भयो" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "पहिल्यै डाउनलोड भएका फाइलहरु फड्काइदैछ '%s'\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "स्रोत संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक छ ।\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "स्रोत संग्रहहरुको %sB प्राप्त गर्न आवश्यक छ ।\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "स्रोत फड्काउनुहोस् %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "केही संग्रह फड्काउन असफल भयो ।" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr " %s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "अनप्याक आदेश '%s' असफल भयो ।\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "निर्माण आदेश '%s' असफल भयो ।\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "शाखा प्रक्रिया असफल भयो" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "को लागि builddeps जाँच्न कम्तिमा एउटा प्याकेज निर्दष्ट गर्नुपर्छ" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s को लागि निर्माण-निर्भरता सूचना प्राप्त गर्न असक्षम भयो" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s कुनै निर्माणमा आधारित हुदैन ।\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1222,30 +1229,30 @@ msgstr "" "%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण " "आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन " -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "%s को लागि %s निर्भरता सन्तुष्ट पार्न असफल भयो: स्थापित प्याकेज %s अति नयाँ छ" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । " -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "समर्थित मोड्युलहरू:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1556,7 +1563,7 @@ msgstr "फाइल %s/%s ले प्याकेज %s मा एउटा #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "%s पढ्न असफल भयो" @@ -1787,7 +1794,7 @@ msgstr "जडान समय सकियो" msgid "Server closed the connection" msgstr "सर्भरले जडान बन्द गर्यो" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "त्रुटि पढ्नुहोस्" @@ -1799,7 +1806,7 @@ msgstr "एउटा प्रतिक्रियाले बफर अधि msgid "Protocol corruption" msgstr "प्रोटोकल दूषित" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "त्रुटि लेख्नुहोस्" @@ -1853,7 +1860,7 @@ msgstr "डेटा सकेटको जडान समय सकियो" msgid "Unable to accept connection" msgstr "जडान स्वीकार गर्न असक्षम भयो" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "समस्या द्रुतान्वेषण फाइल" @@ -1880,39 +1887,39 @@ msgstr "क्वेरी" msgid "Unable to invoke " msgstr "आह्वान गर्न असक्षम भयो" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "%s (%s) मा जडान गरिदैछ" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "%s (f=%u t=%u p=%u) को लागि सकेट सिर्जना गर्न सकिएन" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr " %s:%s (%s) मा जडान सुरुवात गर्न सकेन" -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "%s:%s (%s) मा जडान गर्न सकिएन, जडान समय सकियो" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr " %s:%s (%s) मा जडान गर्न सकिएन ।" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "%s मा जडान गरिदैछ" @@ -1984,76 +1991,76 @@ msgstr "%s को लागि पाइप खोल्न सकिएन" msgid "Read error from %s process" msgstr "%s प्रक्रियाबाट त्रुटि पढ्नुहोस् " -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "हेडरहरुको लागि पर्खिदैछ" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr " %u chars माथि एकल हेडर लाइन प्राप्त गर्नुहोस्" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "खराब हेडर लाइन" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP सर्भरले अवैध जवाफ हेडर पठायो" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP सर्भरले अवैध सामग्री-लम्बाई हेडर पठायो" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP सर्भरले अवैध सामग्री-दायरा हेडर पठायो" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "HTTP सर्भर संग भाँचिएको दायरा समर्थन छ" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "अज्ञात मिति ढाँचा" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "असफल चयन गर्नुहोस्" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "जडान समय सकियो" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "निर्गात फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "सर्भरबाट त्रुटि पढिदैछ । दूर गन्तब्य बन्द जडान" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "सर्भरबाट त्रुटि पढिदैछ" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "खराब हेडर डेटा" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "जडान असफल भयो" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "आन्तरिक त्रुटि" @@ -2188,6 +2195,7 @@ msgid "Unable to stat the mount point %s" msgstr "माउन्ट बिन्दु %s स्थिर गर्न असक्षम" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "%s मा परिवर्तन गर्न असक्षम" @@ -2196,70 +2204,70 @@ msgstr "%s मा परिवर्तन गर्न असक्षम" msgid "Failed to stat the cdrom" msgstr "सिडी रोम स्थिर गर्न असफल भयो" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "ताल्चा मारिएको फाइल मात्र पढ्नको लागि ताल्चा मार्न प्रयोग गरिएको छैन %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "ताल्चा मारिएको फाइल खोल्न सकिएन %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "nfs माउन्ट गरिएको लक फाइलको लागि लक प्रयोग गरिएको छैन %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "ताल्चा प्राप्त गर्न सकिएन %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "सहायक प्रक्रिया %s ले एउटा त्रुटि कोड फर्कायो (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "सहायक प्रक्रिया %s अनपेक्षित बन्द भयो" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "फाइल %s खोल्न सकिएन" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "पड्नुहोस्, अहिले सम्म %lu पढ्न छ तर कुनै बाँकी छैन" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "लेख्नुहोस्, अहिले सम्म %lu लेख्न छ तर सकिदैन " -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "फाइल बन्द गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "फाइल अनलिङ्क गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "फाइल गुप्तिकरण गर्दा समस्या" @@ -2423,7 +2431,7 @@ msgstr "स्रोत सूची %s भित्र %u लाइनमा msgid "Malformed line %u in source list %s (vendor id)" msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (बिक्रता आइडी)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2457,6 +2465,14 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "समस्याहरू सुधार्न असक्षम भयो, तपाईँले प्याकेजहरु भाँच्नुभयो ।" +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"केही अनुक्रमणिका फाइलहरू डाउनलोड गर्न असफल भयो, तिनीहरू उपेक्षित भए, वा सट्टामा पुरानो " +"एउटा प्रयोग गरियो ।" + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2489,17 +2505,17 @@ msgstr "विधि ड्राइभर %s फेला पार्न स msgid "Method %s did not start correctly" msgstr "विधि %s सही रुपले सुरू हुन सकेन" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "कृपया डिस्क लेबुल: '%s' ड्राइभ '%s'मा घुसउनुहोस् र इन्टर थिच्नुहोस् । " -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "प्याकिङ्ग प्रणाली '%s' समर्थित छैन" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "उपयुक्त प्याकिङ्ग प्रणाली प्रकार निर्धारन गर्न असक्षम भयो" @@ -2512,11 +2528,11 @@ msgstr "%s स्थिर गर्न असक्षम भयो ।" msgid "You must put some 'source' URIs in your sources.list" msgstr "तपाईँको स्रोत सूचिमा केही 'source' URIs राख्नुहोस्" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "प्याकेज सूचीहरू वा वस्तुस्थिति फाइल पद वर्णन गर्न वा खोल्न सकिएन ।" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "यो समस्याहरू सुधार्न तपाईँ apt-get अद्यावधिक चलाउन चाहनुहुन्छ" @@ -2627,25 +2643,25 @@ msgstr "फाइल उपलब्धताहरू संकलन गरि msgid "IO Error saving source cache" msgstr "स्रोत क्यास बचत गर्दा IO त्रुटि" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "पुन:नामकरण असफल गरियो, %s (%s -> %s) ।" -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "MD5Sum मेल भएन" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum मेल भएन" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "निम्न कुञ्जी IDs को लागि कुनै सार्वजनिक कुञ्जी उपलब्ध छैन:\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2654,7 +2670,7 @@ msgstr "" "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज " "निश्चित गर्नुहोस् । (arch हराएरहेको कारणले) " -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2663,13 +2679,13 @@ msgstr "" "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज " "निश्चित गर्नुहोस् ।" -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "प्याकेज अनुक्रमणिका फाइलहरू दूषित भए । प्याकेज %s को लागि कुनै फाइलनाम: फाँट छैन ।" -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "साइज मेल खाएन" @@ -2780,71 +2796,78 @@ msgstr "मेल नखाएका फाइल %i हरू संगै %i msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "हराइरहेको फाइल %i हरू र मेल नखाएका फाइल %i हरू संगै %i रेकर्डहरू लेख्नुहोस् ।\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।" -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr " %s तयार गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr " %s अनप्याक गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr " %s कनफिगर गर्न तयार गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr " %s कनफिगर गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "डाइरेक्ट्री %s प्रक्रिया गर्दा त्रुटि" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr " %s स्थापना भयो" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr " %s हटाउन तयार गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr " %s हटाइदैछ" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr " %s हट्यो" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr " %s पूर्ण रुपले हटाउन तयार गरिदैछ" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr " %s पूर्ण रुपले हट्यो" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 #, fuzzy msgid "Could not patch file" diff --git a/po/nl.po b/po/nl.po index ca337d926..a93cdbbf7 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2006-10-17 22:35+0100\n" "Last-Translator: Bart Cornelis \n" "Language-Team: debian-l10n-dutch \n" @@ -158,7 +158,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s voor %s %s gecompileerd op %s %s\n" @@ -662,7 +662,7 @@ msgstr "Hernoemen van %s naar %s is mislukt" msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-compilatiefout - %s" @@ -824,12 +824,12 @@ msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld." msgid "Internal error, Ordering didn't finish" msgstr "Interne fout, rangschikken is niet voltooid" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "Kon de ophaalmap niet vergrendelen" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "De lijst van bronnen kon niet gelezen worden." @@ -859,7 +859,7 @@ msgstr "Na het uitpakken zal er %sB extra schijfruimte gebruikt worden.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Na het uitpakken zal er %sB schijfruimte vrijkomen.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen" @@ -896,7 +896,7 @@ msgstr "Afbreken." msgid "Do you want to continue [Y/n]? " msgstr "Wilt u doorgaan [J/n]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ophalen van %s %s is mislukt\n" @@ -905,7 +905,7 @@ msgstr "Ophalen van %s %s is mislukt\n" msgid "Some files failed to download" msgstr "Ophalen van sommige bestanden is mislukt" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "Ophalen klaar en alleen-ophalen-modus staat aan" @@ -1013,75 +1013,67 @@ msgstr "De 'update'-opdracht aanvaard geen argumenten" msgid "Unable to lock the list directory" msgstr "Kon de lijst-map niet vergrendelen" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"Ophalen van sommige indexbestanden is mislukt, deze zijn of genegeerd, of er " -"zijn oudere versies van gebruikt." - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "De volgende NIEUWE pakketten zullen genstalleerd worden:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "De volgende informatie helpt u mogelijk verder:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Kon pakket %s niet vinden" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "Kon pakket %s niet vinden" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Let op, %s wordt geselecteerd omwille van de regex '%s'\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "maar %s zal genstalleerd worden" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "U wilt waarschijnlijk 'apt-get -f install' uitvoeren om volgende op te " "lossen:" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1089,7 +1081,7 @@ msgstr "" "Er zijn niet-voldane vereisten. U kunt best 'apt-get -f install' uitvoeren " "zonder pakketten op te geven, (of u kunt zelf een oplossing specificeren)." -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1100,7 +1092,7 @@ msgstr "" "een onmogelijke situatie gevraagd hebt of dat u de 'unstable'-distributie \n" "gebruikt en sommige benodigde pakketten nog vastzitten in 'incoming'." -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1110,119 +1102,134 @@ msgstr "" "waarschijnlijk dat het pakket gewoon niet installeerbaar is. U kunt dan\n" "best een foutrapport indienen voor dit pakket." -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "Niet-werkende pakketten:" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "De volgende extra pakketten zullen genstalleerd worden:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "Voorgestelde pakketten:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "Aanbevolen pakketten:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "Opwaardering wordt doorgerekend... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Mislukt" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "Klaar" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "" "U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet " "worden" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "Kan geen bronpakket vinden voor %s" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "U heeft niet voldoende vrije schijfruimte op %s" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Moet %sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "Ophalen bron %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "Ophalen van sommige archieven is mislukt." -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uitpakopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket genstalleerd is.\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "Bouwopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "Dochterproces is mislukt" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "" "U dient tenminste n pakket op te geven om de bouwvereisten van te " "controleren" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kan de informatie over de bouwvereisten voor %s niet ophalen" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s heeft geen bouwvereisten.\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1231,7 +1238,7 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1240,32 +1247,32 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat er geen " "beschikbare versies zijn van pakket %s die aan de versievereisten voldoen" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Voldoen van Vereiste %s van pakket %s is mislukt: genstalleerde versie %s " "is te nieuw" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Voldoen van de vereiste %s van pakket %s is mislukt: %s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bouwvereisten voor %s konden niet voldaan worden." -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "Verwerken van de bouwvereisten is mislukt" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "Ondersteunde modules:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1586,7 +1593,7 @@ msgstr "Het bestand %s/%s overschrijft het bestand van pakket %s" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "Kan %s niet lezen" @@ -1822,7 +1829,7 @@ msgstr "Verbinding is verlopen" msgid "Server closed the connection" msgstr "Verbinding is verbroken door de server" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "Leesfout" @@ -1834,7 +1841,7 @@ msgstr "Een reactie deed de buffer overlopen" msgid "Protocol corruption" msgstr "Protocolcorruptie" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "Schrijffout" @@ -1888,7 +1895,7 @@ msgstr "Datasocket verbinding is verlopen" msgid "Unable to accept connection" msgstr "Kan de verbinding niet aanvaarden" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Probleem bij het hashen van het bestand" @@ -1915,39 +1922,39 @@ msgstr "Zoekopdracht" msgid "Unable to invoke " msgstr "Aanroepen mislukt van " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Er wordt verbinding gemaakt met %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Kon de socket voor %s (f=%u t=%u p=%u) niet aanmaken" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Kan de verbinding met %s:%s (%s) niet aangaan." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Kon niet verbinden met %s:%s (%s), de verbinding verliep" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Kon niet verbinden met %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Er wordt verbinding gemaakt met %s" @@ -2027,79 +2034,79 @@ msgstr "Kon geen pijp openen voor %s" msgid "Read error from %s process" msgstr "Leesfout door proces %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Wachtend op de kopteksten" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Enkele koptekstregel ontvangen met meer dan %u karakters" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Foute koptekstregel" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Er is door de HTTP server een ongeldige 'reply'-koptekst verstuurd" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" "Er is door de HTTP server een ongeldige 'Content-Length'-koptekst verstuurd" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" "Er is door de HTTP server een ongeldige 'Content-Range'-koptekst verstuurd" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Onbekend datumformaat" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Selectie is mislukt" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Verbinding verliep" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Fout bij het schrijven naar het uitvoerbestand" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Fout bij het schrijven naar bestand" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Fout bij het schrijven naar het bestand" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fout bij het lezen van de server, andere kant heeft de verbinding gesloten" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Fout bij het lezen van de server" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Foute koptekstdata" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "Verbinding mislukt" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "Interne fout" @@ -2238,6 +2245,7 @@ msgid "Unable to stat the mount point %s" msgstr "Kan de status van het aanhechtpunt %s niet opvragen" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "Kan %s niet veranderen" @@ -2246,73 +2254,73 @@ msgstr "Kan %s niet veranderen" msgid "Failed to stat the cdrom" msgstr "Het opvragen van de CD-status is mislukt" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Er wordt geen vergrendeling gebruikt voor het alleen-lezen-" "vergrendelingsbestand %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "Kon het vergrendelingsbestand '%s' niet openen" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Het via nfs aangekoppelde vergrendelingsbestand %s wordt niet vergrendeld" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "Kon vergrendeling %s niet verkrijgen" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Er is gewacht op %s, maar die kwam niet" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Subproces %s ontving een segmentatiefout." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Subproces %s gaf de foutcode %u terug" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Subproces %s sloot onverwacht af" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "Kon het bestand %s niet openen" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "lees, de laatste te lezen %lu zijn niet beschikbaar" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "schrijf, de laatste %lu konden niet weggeschreven worden" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "Probleem bij het afsluiten van het bestand" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "Probleem bij het ontlinken van het bestand" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "Probleem bij het synchroniseren van het bestand" @@ -2476,7 +2484,7 @@ msgstr "Type '%s' op regel %u in bronlijst %s is onbekend" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Misvormde regel %u in bronlijst %s (verkopers-ID)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2513,6 +2521,14 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast." +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Ophalen van sommige indexbestanden is mislukt, deze zijn of genegeerd, of er " +"zijn oudere versies van gebruikt." + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2545,19 +2561,19 @@ msgstr "Het methodestuurprogramma %s kon niet gevonden worden." msgid "Method %s did not start correctly" msgstr "Methode %s startte niet op de juiste manier" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Gelieve de schijf met label '%s' in het station '%s' te plaatsen en op " "'enter' te drukken." -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Kan geen geschikt pakketsysteemtype bepalen" @@ -2571,13 +2587,13 @@ msgid "You must put some 'source' URIs in your sources.list" msgstr "" "Uw bronnenlijst (/etc/apt/sources.list) dient minstens 1 bron-URI te bevatten" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" "De pakketlijsten of het statusbestand konden of niet ontleed, of niet " "geopend worden." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "" "U kunt misschien 'apt-get update' uitvoeren om deze problemen te verhelpen" @@ -2691,26 +2707,26 @@ msgstr "Voorziene bestanden worden verzameld" msgid "IO Error saving source cache" msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakketcache" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "hernoeming is mislukt, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "MD5Sum komt niet overeen" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum komt niet overeen" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-IDs:\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2719,7 +2735,7 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren (wegens missende architectuur)" -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2728,7 +2744,7 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren." -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2736,7 +2752,7 @@ msgstr "" "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor " "pakket %s." -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "Grootte komt niet overeen" @@ -2849,71 +2865,78 @@ msgstr "" "%i records weggeschreven met %i missende bestanden en %i niet overeenkomende " "bestanden\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Lijstmap %spartial is afwezig." -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "%s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "%s wordt uitgepakt" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "Configuratie van %s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "%s wordt geconfigureerd" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Fout bij het verwerken van map %s" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "%s is genstalleerd" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "Verwijdering van %s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "%s wordt verwijderd" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "%s is verwijderd" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "Volledige verwijdering van %s wordt voorbereid" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "%s is volledig verwijderd" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 #, fuzzy msgid "Could not patch file" diff --git a/po/nn.po b/po/nn.po index a01e9517f..6823f538b 100644 --- a/po/nn.po +++ b/po/nn.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_nn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" @@ -161,7 +161,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s %s kompilert p %s %s\n" @@ -658,7 +658,7 @@ msgstr "Klarte ikkje endra namnet p msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-kompileringsfeil - %s" @@ -821,12 +821,12 @@ msgstr "Nokre pakkar m msgid "Internal error, Ordering didn't finish" msgstr "Intern feil ved tilleggjing av avleiing" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "Klarte ikkje lsa nedlastingskatalogen" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Kjeldelista kan ikkje lesast." @@ -854,7 +854,7 @@ msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Du har ikkje nok ledig plass i %s" @@ -892,7 +892,7 @@ msgstr "Avbryt." msgid "Do you want to continue [Y/n]? " msgstr "Vil du halda fram [J/n]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikkje henta %s %s\n" @@ -901,7 +901,7 @@ msgstr "Klarte ikkje henta %s %s\n" msgid "Some files failed to download" msgstr "Klarte ikkje henta nokre av filene" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "Nedlastinga er ferdig i nedlastingsmodus" @@ -1008,73 +1008,65 @@ msgstr "Oppdateringskommandoen tek ingen argument" msgid "Unable to lock the list directory" msgstr "Klarte ikkje lsa listekatalogen" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"Klarte ikkje lasta ned nokre av indeksfilene. Dei er ignorerte, eller gamle " -"filer er brukte i staden." - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Dei flgjande NYE pakkane vil verta installerte:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "Flgjande informasjon kan hjelpa med lysa situasjonen:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Fann ikkje pakken %s" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "Fann ikkje pakken %s" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Merk, vel %s i staden for regex %s\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "men %s skal installerast" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du vil kanskje prva retta p desse ved kyra apt-get -f install." -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1082,7 +1074,7 @@ msgstr "" "Nokre krav er ikkje oppfylte. Du kan prva apt-get -f install (eller velja " "ei lysing)." -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1094,7 +1086,7 @@ msgstr "" "distribusjonen, kan det g henda at nokre av pakkane som trengst ikkje\n" "er laga enno eller at dei framleis ligg i Incoming." -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1104,123 +1096,138 @@ msgstr "" "pakken rett og slett ikkje lt seg installera. I sfall br du senda\n" "feilmelding." -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "ydelagde pakkar" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "Dei flgjande tilleggspakkane vil verta installerte:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "Fresltte pakkar:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "Tilrdde pakkar" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "Reknar ut oppgradering ... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Mislukkast" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "Ferdig" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "Du m velja minst in pakke som kjeldekoden skal hentast for" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "Finn ingen kjeldepakke for %s" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikkje nok ledig plass i %s" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "M henta %sB/%sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "M henta %sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "Hent kjeldekode %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "Klarte ikkje henta nokre av arkiva." -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggjekommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "Barneprosessen mislukkast" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "Du m velja minst ein pakke som byggjekrava skal sjekkast for" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarte ikkje henta byggjekrav for %s" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen byggjekrav.\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1229,31 +1236,31 @@ msgstr "" "Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon " "tilgjengelege versjonar av pakken %s som oppfyller versjonskrava" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikkje oppfylla kravet %s for %s: %s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggjekrav for %s kunne ikkje tilfredstillast." -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "Klarte ikkje behandla byggjekrava" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "Sttta modular:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1563,7 +1570,7 @@ msgstr "Fila %s/%s skriv over den tilsvarande fila i pakken %s" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "Klarte ikkje lesa %s" @@ -1799,7 +1806,7 @@ msgstr "Tidsavbrot p msgid "Server closed the connection" msgstr "Tenaren lukka sambandet" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "Lesefeil" @@ -1811,7 +1818,7 @@ msgstr "Eit svar flaumde over bufferen." msgid "Protocol corruption" msgstr "Protokollydeleggjing" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "Skrivefeil" @@ -1865,7 +1872,7 @@ msgstr "Tidsavbrot p msgid "Unable to accept connection" msgstr "Klarte ikkje godta tilkoplinga" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved oppretting av nkkel for fil" @@ -1892,39 +1899,39 @@ msgstr "Sp msgid "Unable to invoke " msgstr "Klarte ikkje starta " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Koplar til %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Klarte ikkje oppretta sokkel for %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Klarte ikkje initiera sambandet til %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Klarte ikkje kopla til %s:%s (%s), tidsavbrot p sambandet" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Klarte ikkje kopla til %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Koplar til %s" @@ -1997,76 +2004,76 @@ msgstr "Klarte ikkje opna r msgid "Read error from %s process" msgstr "Lesefeil fr %s-prosessen" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Ventar p hovud" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Fekk ei enkel hovudlinje over %u teikn" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "ydelagd hovudlinje" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP-tenaren sende eit ugyldig svarhovud" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP-tenaren sende eit ugyldig Content-Length-hovud" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP-tenaren sende eit ugyldig Content-Range-hovud" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Denne HTTP-tenaren har ydelagd sttte for omrde" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Ukjend datoformat" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Utvalet mislukkast" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Tidsavbrot p sambandet" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fr tenaren. Sambandet vart lukka i andre enden" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Feil ved lesing fr tenaren" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "ydelagde hovuddata" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "Sambandet mislukkast" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "Intern feil" @@ -2201,6 +2208,7 @@ msgid "Unable to stat the mount point %s" msgstr "Klarte ikkje f status til monteringspunktet %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "Klarte ikkje byta til %s" @@ -2209,70 +2217,70 @@ msgstr "Klarte ikkje byta til %s" msgid "Failed to stat the cdrom" msgstr "Klarte ikkje f status til CD-ROM" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Brukar ikkje lsing for den skrivebeskytta lsefila %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "Klarte ikkje opna lsefila %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Brukar ikkje lsing for den nfs-monterte lsefila %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "Klarte ikkje lsa %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Venta p %s, men den fanst ikkje" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprosessen %s mottok ein segmenteringsfeil." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprosessen %s returnerte ein feilkode (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprosessen %s avslutta uventa" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "Klarte ikkje opna fila %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "lese, har framleis %lu att lesa, men ingen att" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "skrive, har framleis %lu att skrive, men klarte ikkje" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "Problem ved lsing av fila" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "Problem ved oppheving av lenkje til fila" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "Problem ved synkronisering av fila" @@ -2436,7 +2444,7 @@ msgstr "Typen msgid "Malformed line %u in source list %s (vendor id)" msgstr "Misforma linje %u i kjeldelista %s (utgjevar-ID)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2472,6 +2480,14 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "Klarte ikkje retta opp problema. Nokre ydelagde pakkar er haldne tilbake." +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Klarte ikkje lasta ned nokre av indeksfilene. Dei er ignorerte, eller gamle " +"filer er brukte i staden." + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2504,7 +2520,7 @@ msgstr "Finn ikkje metodedrivaren %s." msgid "Method %s did not start correctly" msgstr "Metoden %s starta ikkje rett" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, fuzzy, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -2512,12 +2528,12 @@ msgstr "" " %s\n" "i stasjonen %s og trykk Enter.\n" -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakkesystemet %s er ikkje sttta" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype" @@ -2530,11 +2546,11 @@ msgstr "Klarte ikkje f msgid "You must put some 'source' URIs in your sources.list" msgstr "Du m leggja nokre kjelde-URI-ar i fila sources.list." -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "Klarte ikkje tolka eller opna pakkelista eller tilstandsfila." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Du vil kanskje prva retta p desse problema ved kyra apt-get update." @@ -2646,25 +2662,25 @@ msgstr "Samlar inn filtilbod" msgid "IO Error saving source cache" msgstr "IU-feil ved lagring av kjeldelager" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "endring av namn mislukkast, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "Feil MD5-sum" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 #, fuzzy msgid "Hash Sum mismatch" msgstr "Feil MD5-sum" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2673,7 +2689,7 @@ msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv " "(fordi arkitekturen manglar)." -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2681,14 +2697,14 @@ msgid "" msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv." -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Pakkeindeksfilene er ydelagde. Feltet Filename: manglar for pakken %s." -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "Feil storleik" @@ -2799,71 +2815,78 @@ msgstr "Skreiv %i postar med %i filer som ikkje passa\n" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skreiv %i postar med %i manglande filer og %i filer som ikkje passa\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Listekatalogen %spartial manglar." -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, fuzzy, c-format msgid "Preparing %s" msgstr "Opnar %s" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Opnar %s" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Opnar oppsettsfila %s" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, fuzzy, c-format msgid "Configuring %s" msgstr "Koplar til %s" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Feil ved lesing av katalogen %s" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, fuzzy, c-format msgid "Installed %s" msgstr " Installert: " -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, fuzzy, c-format msgid "Removing %s" msgstr "Opnar %s" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, fuzzy, c-format msgid "Removed %s" msgstr "Tilrdingar" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Opnar oppsettsfila %s" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Klarte ikkje fjerna %s" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 #, fuzzy msgid "Could not patch file" diff --git a/po/pl.po b/po/pl.po index e1ab8fd94..f7141ddf7 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2006-01-23 15:32+0100\n" "Last-Translator: Bartosz Fenski \n" "Language-Team: Polish \n" @@ -157,7 +157,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s dla %s %s skompilowany %s %s\n" @@ -654,7 +654,7 @@ msgstr "Nie uda msgid "Y" msgstr "T" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "Bd kompilacji wyraenia regularnego - %s" @@ -815,12 +815,12 @@ msgstr "Pakiety powinny zosta msgid "Internal error, Ordering didn't finish" msgstr "Bd wewntrzny, sortowanie niezakoczone" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "Nie udao si zablokowa katalogu pobierania" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Nie udao si odczyta list rde." @@ -848,7 +848,7 @@ msgstr "Po rozpakowaniu zostanie dodatkowo u msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po rozpakowaniu zostanie zwolnione %sB miejsca na dysku.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nie udao si ustali iloci wolnego miejsca w %s" @@ -885,7 +885,7 @@ msgstr "Przerwane." msgid "Do you want to continue [Y/n]? " msgstr "Czy chcesz kontynuowa [T/n]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nie udao si pobra %s %s\n" @@ -894,7 +894,7 @@ msgstr "Nie uda msgid "Some files failed to download" msgstr "Nie udao si pobra niektrych plikw" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "Ukoczono pobieranie w trybie samego pobierania" @@ -1001,73 +1001,65 @@ msgstr "Polecenie update nie wymaga msgid "Unable to lock the list directory" msgstr "Nie udao si zablokowa katalogu list" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"Nie udao si pobra niektrych plikw indeksu, zostay one zignorowane lub " -"zostaa uyta ich starsza wersja." - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Zostan zainstalowane nastpujce NOWE pakiety:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "Nastpujce informacje mog pomc rozpozna sytuacj:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Bd wewntrzny, rozwizywanie problemw wszystko popsuo" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "Bd wewntrzny, AllUpgrade wszystko popsuo" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Nie udao si odnale pakietu %s" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "Nie udao si odnale pakietu %s" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Uwaga, wybieranie %s za wyraenie '%s'\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ale %s ma zosta zainstalowany" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Naley uruchomi `apt-get -f install', aby je naprawi:" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1075,7 +1067,7 @@ msgstr "" "Niespenione zalenoci. Sprbuj 'apt-get -f install' bez pakietw (lub " "podaj rozwizanie)." -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1087,7 +1079,7 @@ msgstr "" "w ktrej niektre pakiety nie zostay jeszcze utworzone lub przeniesione\n" "z katalogu Incoming (\"Przychodzce\")." -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1097,120 +1089,135 @@ msgstr "" "danego pakietu po prostu nie da si zainstalowa i naley zgosi w nim\n" "bd." -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "Pakiety s bdne" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "Zostan zainstalowane nastpujce dodatkowe pakiety:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "Sugerowane pakiety:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "Polecane pakiety:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "Obliczanie aktualizacji..." -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Nie udao si" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "Gotowe" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "Bd wewntrzny, rozwizywanie problemw wszystko popsuo" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "" "Naley poda przynajmniej jeden pakiet, dla ktrego maj zosta pobrane " "rda" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "Nie udao si odnale rda dla pakietu %s" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Pomijanie ju pobranego pliku '%s'\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "W %s nie ma wystarczajcej iloci wolnego miejsca" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Konieczne pobranie %sB/%sB archiww rde.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Konieczne pobranie %sB archiww rde.\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "Pobierz rdo %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "Nie udao si pobra niektrych archiww." -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pomijanie rozpakowania ju rozpakowanego rda w %s\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Polecenie rozpakowania '%s' zawiodo.\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Sprawd czy pakiet 'dpkg-dev' jest zainstalowany.\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "Polecenie budowania '%s' zawiodo.\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "Proces potomny zawid" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "" "Naley poda przynajmniej jeden pakiet, dla ktrego maj zosta pakiety " "wymagane do budowania" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Nie udao si pobra informacji o zalenociach na czas budowania dla %s" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s nie ma zalenoci czasu budowania.\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1219,7 +1226,7 @@ msgstr "" "Zaleno %s od %s nie moe zosta speniona, poniewa nie znaleziono " "pakietu %s" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1228,32 +1235,32 @@ msgstr "" "Zaleno %s od %s nie moe zosta speniona, poniewa adna z dostpnych " "wersji pakietu %s nie ma odpowiedniej wersji" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nie udao si speni zalenoci %s od %s: Zainstalowany pakiet %s jest zbyt " "nowy" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Nie udao si speni zalenoci %s od %s: %s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Nie udao si speni zalenoci na czas budowania od %s." -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "Nie udao si przetworzy zalenoci na czas budowania" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "Obsugiwane moduy:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1567,7 +1574,7 @@ msgstr "Plik %s/%s nadpisuje plik w pakiecie %s" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "Nie mona czyta %s" @@ -1800,7 +1807,7 @@ msgstr "Przekroczenie czasu po msgid "Server closed the connection" msgstr "Serwer zamkn poczenie" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "Bd odczytu" @@ -1812,7 +1819,7 @@ msgstr "Odpowied msgid "Protocol corruption" msgstr "Naruszenie zasad protokou" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "Bd zapisu" @@ -1866,7 +1873,7 @@ msgstr "Przekroczony czas po msgid "Unable to accept connection" msgstr "Nie udao si przyj poczenia" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Nie udao si obliczy skrtu pliku" @@ -1893,39 +1900,39 @@ msgstr "Info" msgid "Unable to invoke " msgstr "Nie mona wywoa " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Podczanie do %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Nie udao si utworzy gniazda dla %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Nie udao si zainicjalizowa poczenia z %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Nie udao si poczy z %s:%s (%s), przekroczenie czasu poczenia" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Nie udao si poczy z %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "czenie z %s" @@ -2001,76 +2008,76 @@ msgstr "Nie uda msgid "Read error from %s process" msgstr "Bd odczytu z procesu %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Oczekiwanie na nagwki" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Otrzymano pojedyncz lini nagwka o dugoci ponad %u znakw" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Nieprawidowa linia nagwka" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Serwer HTTP przysa nieprawidowy nagwek odpowiedzi" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Serwer HTTP przysa nieprawidowy nagwek Content-Length" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Serwer HTTP przysa nieprawidowy nagwek Content-Range" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Ten serwer HTTP nieprawidowo obsuguje zakresy (ranges)" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Nieznany format daty" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Operacja select nie powioda si" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Przekroczenie czasu poczenia" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Bd przy pisaniu do pliku wyjciowego" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Bd przy pisaniu do pliku" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Bd przy pisaniu do pliku" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Bd czytania z serwera: Zdalna strona zamkna poczenie" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Bd czytania z serwera" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Bdne dane nagwka" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "Poczenie nie udao si" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "Bd wewntrzny" @@ -2206,6 +2213,7 @@ msgid "Unable to stat the mount point %s" msgstr "Nie udao si wykona operacji stat na punkcie montowania %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "Nie udao si przej do %s" @@ -2214,70 +2222,70 @@ msgstr "Nie uda msgid "Failed to stat the cdrom" msgstr "Nie udao si wykona operacji stat na CDROM-ie" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Dla pliku blokady %s tylko do odczytu nie zostanie uyta blokada" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "Nie udao si otworzy pliku blokady %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Dla pliku blokady %s montowanego przez NFS nie zostanie uyta blokada" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "Nie udao si uzyska blokady %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Oczekiwano na proces %s, ale nie byo go" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Podproces %s spowodowa naruszenie segmentacji." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s zwrci kod bdu (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s zakoczy si niespodziewanie" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "Nie udao si otworzy pliku %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "naleao przeczyta jeszcze %lu, ale nic nie zostao" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "naleao zapisa jeszcze %lu, ale nie udao si to" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "Problem przy zamykaniu pliku" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "Problem przy usuwaniu pliku" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "Problem przy zapisywaniu pliku na dysk" @@ -2441,7 +2449,7 @@ msgstr "Typ '%s' jest nieznany w linii %u listy msgid "Malformed line %u in source list %s (vendor id)" msgstr "Nieprawidowa linia %u w licie rde %s (identyfikator producenta)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2477,6 +2485,14 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Nie udao si naprawi problemw, zatrzymano uszkodzone pakiety." +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Nie udao si pobra niektrych plikw indeksu, zostay one zignorowane lub " +"zostaa uyta ich starsza wersja." + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2509,17 +2525,17 @@ msgstr "Nie uda msgid "Method %s did not start correctly" msgstr "Metoda %s nie uruchomia si poprawnie." -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "W do napdu '%s' dysk o nazwie: '%s' i nacinij enter." -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "System pakietw '%s' nie jest obsugiwany" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Nie udao si okreli odpowiedniego typu systemu pakietw" @@ -2532,11 +2548,11 @@ msgstr "Nie uda msgid "You must put some 'source' URIs in your sources.list" msgstr "Naley dopisa jakie URI 'source' do pliku sources.list" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "Nie udao si otworzy lub zanalizowa zawartoci list pakietw." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "Naley uruchomi apt-get update aby naprawi te problemy." @@ -2649,26 +2665,26 @@ msgstr "Zbieranie zapewnie msgid "IO Error saving source cache" msgstr "Bd wejcia/wyjcia przy zapisywaniu podrcznego magazynu rde" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "nie udao si zmieni nazwy, %s (%s -> %s)" -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "Bdna suma MD5" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 #, fuzzy msgid "Hash Sum mismatch" msgstr "Bdna suma MD5" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 #, fuzzy msgid "There is no public key available for the following key IDs:\n" msgstr "Dla nastpujcego identyfikatora klucza brakuje klucza publicznego:\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2677,7 +2693,7 @@ msgstr "" "Nie udao si odnale pliku dla pakietu %s. Moe to oznacza, e trzeba " "bdzie rcznie naprawi ten pakiet (z powodu brakujcej architektury)." -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2686,14 +2702,14 @@ msgstr "" "Nie udao si odnale pliku dla pakietu %s. Moe to oznacza, e trzeba " "bdzie rcznie naprawi ten pakiet." -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Pliki indeksu pakietw s uszkodzone. Brak pola Filename: dla pakietu %s." -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "Bdny rozmiar" @@ -2806,71 +2822,78 @@ msgstr "Zapisano %i rekord msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Zapisano %i rekordw z %i brakujcymi plikami i %i niepasujcymi\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Brakuje katalogu list %spartial." -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "Przygotowanie %s" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "Rozpakowywanie %s" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "Przygotowanie do konfiguracji %s" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "Konfigurowanie %s" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Bd przetwarzania katalogu %s" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr " Zainstalowany %s" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "Przygotowanie do usunicia %s" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "Usuwanie %s" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "Usunito %s" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Przygotowanie do konfiguracji %s" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Nie udao si usun %s" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "Nie udao si naoy atki na plik" diff --git a/po/pt.po b/po/pt.po index 46b004e99..ef84c6769 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2007-05-09 22:14+0100\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" @@ -159,7 +159,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado em %s %s\n" @@ -657,7 +657,7 @@ msgstr "Falha ao renomear %s para %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" @@ -818,12 +818,12 @@ msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado." msgid "Internal error, Ordering didn't finish" msgstr "Erro Interno, Ordering não terminou" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "Impossível criar lock no directório de download" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "A lista de fontes não pôde ser lida." @@ -853,7 +853,7 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Depois de descompactar, %sB de espaço em disco serão libertados.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossível de determinar espaço livre em %s" @@ -890,7 +890,7 @@ msgstr "Abortado." msgid "Do you want to continue [Y/n]? " msgstr "Você deseja continuar [Y/n]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falha ao obter %s %s\n" @@ -899,7 +899,7 @@ msgstr "Falha ao obter %s %s\n" msgid "Some files failed to download" msgstr "Falhou o download de alguns ficheiros" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "Download completo e em modo de apenas download" @@ -1006,73 +1006,65 @@ msgstr "O comando update não leva argumentos" msgid "Unable to lock the list directory" msgstr "Impossível criar lock no directório de listas" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"Falhou o download de alguns ficheiros de índice, foram ignorados ou os " -"antigos foram usados em seu lugar." - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Os seguintes NOVOS pacotes serão instalados:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "A seguinte informação pode ajudar a resolver a situação:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Erro Interno, o solucionador de problemas estragou coisas" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro Interno, AllUpgrade estragou algo" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Impossível encontrar o pacote %s" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "Impossível encontrar o pacote %s" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, seleccionando %s para a expressão regular '%s'\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "mas %s está para ser instalado" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Você deve querer executar `apt-get -f install' para corrigir isto:" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1080,7 +1072,7 @@ msgstr "" "Dependências não satisfeitas. Tente `apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1092,7 +1084,7 @@ msgstr "" "distribuição instável, que alguns pacotes requisitados ainda não foram \n" "criados ou foram tirados do Incoming." -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1103,119 +1095,134 @@ msgstr "" "de\n" "bug sobre esse pacote." -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "Pacotes estragados" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "Os seguintes pacotes extra serão instalados:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "Pacotes sugeridos :" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "Pacotes recomendados :" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "Calculando Actualização... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Falhou" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "Pronto" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "Erro Interno, o solucionador de problemas estragou coisas" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "" "Deve-se especificar pelo menos um pacote para que se obtenha o código fonte" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossível encontrar um pacote de código fonte para %s" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saltando ficheiro do qual já havia sido feito download '%s'\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Preciso obter %sB/%sB de arquivos de código fonte.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Precisa obter %sB de arquivos de código fonte.\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "Obter Código Fonte %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "Falha ao obter alguns arquivos." -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Saltando a descompactação de pacote código fonte já descompactado em %s\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "O comando de descompactação '%s' falhou.\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "O comando de compilação '%s' falhou.\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "O processo filho falhou" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve especificar pelo menos um pacote para verificar as dependências de " "compilação" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossível obter informações de dependências de compilação para %s" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de compilação.\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1224,7 +1231,7 @@ msgstr "" "a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não " "pôde ser encontrado" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1233,32 +1240,32 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque nenhuma versão " "disponível do pacote %s pode satisfazer os requisitos de versão" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falha ao satisfazer a dependência %s para %s: Pacote instalado %s é muito " "novo" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falha ao satisfazer a dependência %s para %s: %s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Não foi possível satisfazer as dependências de compilação para %s." -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "Falha ao processar as dependências de compilação" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "Módulos Suportados:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1573,7 +1580,7 @@ msgstr "Ficheiro %s/%s sobrescreve o que está no pacote %s" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "Impossível ler %s" @@ -1805,7 +1812,7 @@ msgstr "Tempo limite de ligação atingido" msgid "Server closed the connection" msgstr "Servidor fechou a ligação" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "Erro de leitura" @@ -1817,7 +1824,7 @@ msgstr "Uma resposta sobrecarregou o buffer" msgid "Protocol corruption" msgstr "Corrupção de protocolo" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "Erro de escrita" @@ -1871,7 +1878,7 @@ msgstr "Ligação de socket de dados expirou" msgid "Unable to accept connection" msgstr "Impossível aceitar ligação" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema fazendo o hash do ficheiro" @@ -1898,39 +1905,39 @@ msgstr "Pesquisa" msgid "Unable to invoke " msgstr "Impossível invocar " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Ligando a %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Não foi possível criar um socket para %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Não posso iniciar a ligação para %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Não foi possível ligar a %s:%s (%s), a conexão expirou" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Não foi possível ligar em %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Ligando a %s" @@ -2009,76 +2016,76 @@ msgstr "Não foi possível abrir pipe para %s" msgid "Read error from %s process" msgstr "Erro de leitura do processo %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Aguardando por cabeçalhos" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Linha de cabeçalho errada" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "O servidor http enviou um cabeçalho de resposta inválido" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "O servidor http enviou um cabeçalho Conten-Length inválido" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "O servidor http enviou um cabeçalho Conten-Range inválido" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Este servidor http possui suporte a range errado" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Select falhou." -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "A ligação expirou" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Erro gravando para ficheiro de saída" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Erro gravando para ficheiro" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Erro gravando para o ficheiro" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor. O Remoto fechou a ligação" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Erro lendo do servidor" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Dados de cabeçalho errados" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "Falhou a ligação" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "Erro interno" @@ -2215,6 +2222,7 @@ msgid "Unable to stat the mount point %s" msgstr "Impossível executar stat ao ponto de montagem %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "Impossível mudar para %s" @@ -2223,70 +2231,70 @@ msgstr "Impossível mudar para %s" msgid "Failed to stat the cdrom" msgstr "Impossível executar stat ao cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Não utilizando locking para ficheiro lock apenas de leitura %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "Não foi possível abrir ficheiro de lock %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Não usando locking para ficheiro de lock montado via nfs %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "Não foi possível obter lock %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperou, por %s mas não estava lá" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Sub-processo %s recebeu uma falha de segmentação." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Sub-processo %s retornou um código de erro (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Sub-processo %s finalizou inesperadamente" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "Não foi possível abrir ficheiro o %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "leitura, ainda restam %lu para serem lidos mas não resta nenhum" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "gravação, ainda restam %lu para gravar mas não foi possível" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "Problema ao fechar o ficheiro" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "Problema removendo o link ao ficheiro" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "Problema sincronizando o ficheiro" @@ -2450,7 +2458,7 @@ msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Linha malformada %u na lista de fontes %s (id de fornecedor)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2487,6 +2495,14 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Impossível corrigir problemas, você manteve (hold) pacotes estragados." +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Falhou o download de alguns ficheiros de índice, foram ignorados ou os " +"antigos foram usados em seu lugar." + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2519,18 +2535,18 @@ msgstr "O driver do método %s não pôde ser encontrado." msgid "Method %s did not start correctly" msgstr "Método %s não iniciou corretamente" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Por favor insira o disco denominado: '%s' no leitor '%s' e pressione enter." -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Sistema de empacotamento '%s' não é suportado" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "" "Não foi possível determinar um tipo de sistema de empacotamento aplicável" @@ -2544,13 +2560,13 @@ msgstr "Impossível executar stat %s." msgid "You must put some 'source' URIs in your sources.list" msgstr "Você deve colocar alguns URIs 'source' no seu sources.list" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" "As listas de pacotes ou o ficheiro de status não pôde ser analisado ou " "aberto." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "Você terá que executar apt-get update para corrigir estes problemas" @@ -2667,27 +2683,27 @@ msgstr "Obtendo File Provides" msgid "IO Error saving source cache" msgstr "Erro de I/O ao gravar a cache de código fonte" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "falhou renomear, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum incorreto" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Não existe qualquer chave pública disponível para as seguintes IDs de " "chave:\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2697,7 +2713,7 @@ msgstr "" "que você precisa consertar manualmente este pacote. (devido a arquitectura " "não especificada)." -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2706,7 +2722,7 @@ msgstr "" "Não foi possível localizar arquivo para o pacote %s. Isto pode significar " "que você precisa consertar manualmente este pacote." -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2714,7 +2730,7 @@ msgstr "" "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " "para o pacote %s." -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "Tamanho incorrecto" @@ -2826,71 +2842,78 @@ msgstr "" "Escreveu %i registos com %i ficheiros em falta e %i ficheiros não " "coincidentes\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Falta directório de listas %spartial." -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "A preparar %s" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "A desempacotar %s" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "A preparar para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "A configurar %s" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Erro processando o directório %s" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "%s instalado" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "A preparar para remoção de %s" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "A remover %s" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "%s removido" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "A preparar para remover completamente %s" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "Remoção completa de %s" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "Não foi possível abrir ficheiro o %s" diff --git a/po/pt_BR.po b/po/pt_BR.po index 79534e42c..e94150b13 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2006-08-21 00:40-0300\n" "Last-Translator: Felipe Augusto van de Wiel (faw) \n" "Language-Team: l10n portuguese \n" @@ -158,7 +158,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para %s %s compilado em %s %s\n" @@ -658,7 +658,7 @@ msgstr "Falha ao renomear %s para %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" @@ -820,12 +820,12 @@ msgstr "Pacotes precisam ser removidos mas a remoção está desabilitada." msgid "Internal error, Ordering didn't finish" msgstr "Erro interno, Ordenação não finalizou" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "Impossível criar lock no diretório de download" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "A lista de fontes não pôde ser lida." @@ -854,7 +854,7 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Depois de desempacotar, %sB de espaço em disco serão liberados.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "Não foi possível determinar o espaço livre em %s" @@ -891,7 +891,7 @@ msgstr "Abortar." msgid "Do you want to continue [Y/n]? " msgstr "Quer continuar [S/n]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falha ao buscar %s %s\n" @@ -900,7 +900,7 @@ msgstr "Falha ao buscar %s %s\n" msgid "Some files failed to download" msgstr "Alguns arquivos falharam ao baixar" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "Baixar completo e no modo somente baixar (\"download only\")" @@ -1006,73 +1006,65 @@ msgstr "O comando update não leva argumentos" msgid "Unable to lock the list directory" msgstr "Impossível criar lock no diretório de listas" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"Alguns arquivos de índice falharam para baixar, eles foram ignorados ou os " -"antigos foram usados no lugar." - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Os NOVOS pacotes a seguir serão instalados:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "A informação a seguir pode ajudar a resolver a situação:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Erro interno, o solucionador de problemas quebrou coisas" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro interno, AllUpgrade quebrou as coisas" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Impossível achar pacote %s" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "Impossível achar pacote %s" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, selecionando %s para expressão regular '%s'\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "mas %s está para ser instalado" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Você deve querer executar `apt-get -f install' para corrigir isso:" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1080,7 +1072,7 @@ msgstr "" "Dependências desencontradas. Tente `apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1092,7 +1084,7 @@ msgstr "" "distribuição instável, que alguns pacotes requeridos não foram\n" "criados ainda ou foram tirados do Incoming." -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1102,117 +1094,132 @@ msgstr "" "esteja simplesmente não instalável e um relato de erro sobre esse\n" "pacotes deve ser enviado." -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "Pacotes quebrados" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "Os pacotes extra a seguir serão instalados:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "Pacotes sugeridos:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "Pacotes recomendados:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "Calculando atualização... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Falhou" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "Pronto" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "Erro interno, o solucionador de problemas quebrou coisas" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossível encontrar um pacote fonte para %s" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Ignorando arquivo já obtido '%s'\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Preciso obter %sB/%sB de arquivos fonte.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Precisa obter %sB de arquivos fonte.\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "Obter fonte %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "Falha ao buscar alguns arquivos." -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ignorando desempacotamento de fonte já desempacotado em %s\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando de desempacotamento '%s' falhou.\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando de construção '%s' falhou.\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "Processo filho falhou" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve-se especificar pelo menos um pacote para que se cheque as dependências " "de construção" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossível conseguir informações de dependência de construção para %s" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de construção.\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1221,7 +1228,7 @@ msgstr "" "a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não " "pôde ser encontrado" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1230,32 +1237,32 @@ msgstr "" "a dependência de %s por %s não pôde ser satisfeita porque nenhuma versão " "disponível do pacote %s pôde satisfazer os requerimentos de versão" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falha ao satisfazer a dependência de %s por %s: Pacote instalado %s é muito " "novo" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falha ao satisfazer dependência de %s por %s: %s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Não foi possível satisfazer as dependências de compilação para %s." -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "Falha ao processar as dependências de construção" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "Módulos suportados:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1571,7 +1578,7 @@ msgstr "Arquivo %s/%s sobreescreve arquivo no pacote %s" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "Impossível ler %s" @@ -1804,7 +1811,7 @@ msgstr "Conexão expirou" msgid "Server closed the connection" msgstr "Servidor fechou a conexão" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "Erro de leitura" @@ -1816,7 +1823,7 @@ msgstr "Uma resposta sobrecarregou o buffer" msgid "Protocol corruption" msgstr "Corrupção de protocolo" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "Erro de gravação" @@ -1870,7 +1877,7 @@ msgstr "Conexão do socket de dados expirou" msgid "Unable to accept connection" msgstr "Impossível aceitar conexão" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema fazendo o hash do arquivo" @@ -1897,39 +1904,39 @@ msgstr "Pesquisa" msgid "Unable to invoke " msgstr "Impossível invocar " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Conectando em %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Não foi possível criar um socket para %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Não posso iniciar a conexão para %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Não foi possível conectar em %s:%s (%s), conexão expirou" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Não foi possível conectar em %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Conectando a %s" @@ -2008,76 +2015,76 @@ msgstr "Não foi possível abrir pipe para %s" msgid "Read error from %s process" msgstr "Erro de leitura do processo %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Aguardando por cabeçalhos" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Linha de cabeçalho ruim" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "O servidor HTTP enviou um cabeçalho Content-Length inválido" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "O servidor HTTP enviou um cabeçalho Content-Range inválido" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Este servidor HTTP possui suporte a range quebrado" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Seleção falhou" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Conexão expirou" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Erro gravando para arquivo de saída" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Erro gravando para arquivo" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Erro gravando para o arquivo" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Erro lendo do servidor" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Dados de cabeçalho ruins" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "Conexão falhou" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "Erro interno" @@ -2214,6 +2221,7 @@ msgid "Unable to stat the mount point %s" msgstr "Impossível checar o ponto de montagem %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "Impossível mudar para %s" @@ -2222,70 +2230,70 @@ msgstr "Impossível mudar para %s" msgid "Failed to stat the cdrom" msgstr "Impossível checar o cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Não usando locking para arquivo de trava somente leitura %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "Não foi possível abrir arquivo de trava %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Não usando locking para arquivo de trava montado via nfs %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "Não foi possível obter trava %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperado %s mas este não estava lá" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Sub-processo %s recebeu uma falha de segmentação." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Sub-processo %s retornou um código de erro (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Sub-processo %s finalizou inesperadamente" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "Não foi possível abrir arquivo %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "leitura, ainda restam %lu para serem lidos mas nenhum deixado" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "gravação, ainda restam %lu para gravar mas não foi possível" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "Problema fechando o arquivo" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "Problema removendo o link do arquivo" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "Problema sincronizando o arquivo" @@ -2450,7 +2458,7 @@ msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Linha mal formada %u na lista de fontes %s (id de fornecedor)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2487,6 +2495,14 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Impossível corrigir problemas, você manteve (hold) pacotes quebrados." +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Alguns arquivos de índice falharam para baixar, eles foram ignorados ou os " +"antigos foram usados no lugar." + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2519,18 +2535,18 @@ msgstr "O driver do método %s não pôde ser encontrado." msgid "Method %s did not start correctly" msgstr "Método %s não iniciou corretamente" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Por favor, insira o disco nomeado: '%s' no leitor '%s' e pressione enter." -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Sistema de empacotamento '%s' não é suportado" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "" "Não foi possível determinar um tipo de sistema de empacotamento aplicável." @@ -2544,13 +2560,13 @@ msgstr "Impossível checar %s." msgid "You must put some 'source' URIs in your sources.list" msgstr "Você deve colocar algumas URIs 'source' em seu sources.list" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" "As listas de pacotes ou os arquivos de status não puderam ser analisados ou " "abertos." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "Você terá que executar apt-get update para corrigir esses problemas" @@ -2667,25 +2683,25 @@ msgstr "Coletando Arquivo Provides" msgid "IO Error saving source cache" msgstr "Erro de I/O ao gravar cache fonte" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "renomeação falhou, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum incorreto" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "Não existem chaves públicas para os seguintes IDs de chaves:\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2695,7 +2711,7 @@ msgstr "" "que você precisa consertar manualmente este pacote. (devido a arquitetura " "não especificada)." -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2704,7 +2720,7 @@ msgstr "" "Não foi possível localizar arquivo para o pacote %s. Isto pode significar " "que você precisa consertar manualmente este pacote." -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2712,7 +2728,7 @@ msgstr "" "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " "para o pacote %s." -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "Tamanho incorreto" @@ -2827,71 +2843,78 @@ msgstr "" "Gravados %i registros com %i arquivos faltando e %i arquivos que não " "combinam\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Diretório de listas %spartial está faltando." -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "Preparando %s" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "Desempacotando %s" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "Preparando para configurar %s" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "Configurando %s" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Erro processando o diretório %s" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "%s instalado" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "Preparando para a remoção de %s" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "Removendo %s" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "%s removido" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparando para remover completamente %s" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "%s completamente removido" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "Não foi possível aplicar o patch" diff --git a/po/ro.po b/po/ro.po index a4aac3377..d25f84918 100644 --- a/po/ro.po +++ b/po/ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_ro\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2006-09-19 01:35+0300\n" "Last-Translator: Sorin Batariuc \n" "Language-Team: Romanian \n" @@ -159,7 +159,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pentru %s %s compilat pe %s %s\n" @@ -664,7 +664,7 @@ msgstr "Eşuare în a redenumi %s în %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "Eroare de compilare expresie regulată - %s" @@ -825,12 +825,12 @@ msgstr "Pachete trebuiesc şterse dar ştergerea este dezactivată." msgid "Internal error, Ordering didn't finish" msgstr "Eroare internă, Ordering nu s-a terminat" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "Nu pot încuia directorul de descărcare" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Lista surselor nu poate fi citită." @@ -859,7 +859,7 @@ msgstr "După despachetare va fi folosit %sB de spaţiu suplimentar pe disc.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "După despachetare va fi eliberat %sB din spaţiul de pe disc.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "N-am putut determina spaţiul disponibil în %s" @@ -897,7 +897,7 @@ msgstr "Renunţare." msgid "Do you want to continue [Y/n]? " msgstr "Vreţi să continuaţi [Y/n]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Eşuare în aducerea %s %s\n" @@ -906,7 +906,7 @@ msgstr "Eşuare în aducerea %s %s\n" msgid "Some files failed to download" msgstr "Eşuare în descărcarea unor fişiere" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "Descărcare completă şi în modul doar descărcare" @@ -1011,74 +1011,66 @@ msgstr "Comanda de actualizare nu are argumente" msgid "Unable to lock the list directory" msgstr "Nu pot încuia directorul cu lista" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"Unele fişiere index au eşuat la descărcare, fie au fost ignorate, fie au " -"fost folosite în loc unele vechi." - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Următoarele pachete NOI vor fi instalate:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "Următoarele informaţii ar putea să vă ajute la rezolvarea situaţiei:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "" "Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Nu pot găsi pachetul %s" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "Nu pot găsi pachetul %s" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Notă, selectare %s pentru expresie regulată '%s'\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "dar %s este pe cale de a fi instalat" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Aţi putea porni 'apt-get -f install' pentru a corecta acestea:" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1086,7 +1078,7 @@ msgstr "" "Dependenţe neîndeplinite. Încercaţi 'apt-get -f install' fără nici un pachet " "(sau oferiţi o altă soluţie)." -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1099,7 +1091,7 @@ msgstr "" "pachete\n" "cerute n-au fost create încă sau au fost mutate din Incoming." -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1109,118 +1101,133 @@ msgstr "" " că pachetul pur şi simplu nu este instalabil şi un raport de eroare pentru\n" "acest pachet ar trebui completat." -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "Pachete deteriorate" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "Următoarele extra pachete vor fi instalate:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "Pachete sugerate:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "Pachete recomandate:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "Calculez înnoirea... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Eşuare" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "Terminat" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "" "Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "Trebuie specificat cel puţin un pachet pentru a-i aduce sursa" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "Nu pot găsi o sursă pachet pentru %s" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Sar peste fişierul deja descărcat '%s'\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "Nu aveţi suficient spaţiu în %s" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Este nevoie să descărcaţi %sB/%sB din arhivele surselor.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Este nevoie să descărcaţi %sB din arhivele surselor.\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "Aducere sursa %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "Eşuare în a aduce unele arhive." -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Sar peste despachetarea sursei deja despachetate în %s\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comanda de despachetare '%s' eşuată.\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verificaţi dacă pachetul 'dpkg-dev' este instalat.\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comanda de construire '%s' eşuată.\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "Eşuare proces copil" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "" "Trebuie specificat cel puţin un pachet pentru a-i verifica dependenţele " "înglobate" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nu pot prelua informaţiile despre dependenţele înglobate ale lui %s" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s nu are dependenţe înglobate.\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1229,7 +1236,7 @@ msgstr "" "Dependenţa lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu " "poate fi găsit" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1238,32 +1245,32 @@ msgstr "" "Dependenţa lui %s de %s nu poate fi satisfăcută deoarece nici o versiune " "disponibilă a pachetului %s nu poate satisface versiunile cerute" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Eşuare în a satisface dependenţa lui %s de %s: Pachetul instalat %s este " "prea nou" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Eşuare în a satisface dependenţa lui %s de %s: %s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Dependenţele înglobate pentru %s nu pot fi satisfăcute." -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "Eşuare în a prelucra dependenţele înglobate" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "Module suportate:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1579,7 +1586,7 @@ msgstr "Fişierul %s/%s suprascrie pe cel din pachetul %s" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "Nu pot citi %s" @@ -1813,7 +1820,7 @@ msgstr "Timpul de conectare a expirat" msgid "Server closed the connection" msgstr "Serverul a terminat conexiunea" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "Eroare de citire" @@ -1825,7 +1832,7 @@ msgstr "Un răspuns a inundat zona tampon." msgid "Protocol corruption" msgstr "Degradare protocol" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "Eroare de scriere" @@ -1879,7 +1886,7 @@ msgstr "Timp de conectare data socket expirat" msgid "Unable to accept connection" msgstr "Nu pot accepta conexiune" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problemă la indexarea fişierului" @@ -1906,39 +1913,39 @@ msgstr "Interogare" msgid "Unable to invoke " msgstr "Nu pot invoca" -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Conectare la %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Nu pot crea un socket pentru %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Nu pot iniţia conectarea la %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "N-am putut conecta la %s:%s (%s), timp de conectare expirat" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "N-am putut conecta la %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Conectare la %s" @@ -2015,77 +2022,77 @@ msgstr "Nu pot deschide conexiunea pentru %s" msgid "Read error from %s process" msgstr "Eroare de citire din procesul %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "În aşteptarea antetelor" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Primit o singură linie de antet peste %u caractere" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Linie de antet necorespunzătoare" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Serverul http a trimis un antet de răspuns necorespunzător" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Serverul http a trimis un antet lungime-conţinut necorespunzător" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Serverul http a trimis un antet zonă de conţinut necorespunzător" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Acest server http are zonă de suport necorespunzătoare" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Format de date necunoscut" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Eşuarea selecţiei" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Timp de conectare expirat" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Eroare la scrierea fişierului de rezultat" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Eroare la scrierea în fişier" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Eroare la scrierea în fişierul" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "" "Eroare la citirea de pe server, conexiunea a fost închisă de la distanţă" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Eroare la citirea de pe server" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Antet de date necorespunzător" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "Conectare eşuată" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "Eroare internă" @@ -2222,6 +2229,7 @@ msgid "Unable to stat the mount point %s" msgstr "Nu pot determina starea punctului de montare %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "Nu pot schimba la %s" @@ -2230,70 +2238,70 @@ msgstr "Nu pot schimba la %s" msgid "Failed to stat the cdrom" msgstr "Eşuare la determinarea stării cdrom-ului" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Nu s-a folosit închiderea pentru fişierul disponibil doar-citire %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "Nu pot deschide fişierul blocat %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nu este folosit blocajul pentru fişierul montat nfs %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "Nu pot determina blocajul %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Aşteptat %s, dar n-a fost acolo" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Subprocesul %s a primit o eroare de segmentare." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Subprocesul %s a întors un cod de eroare (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Subprocesul %s s-a terminat brusc" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "Nu pot deschide fişierul %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "citire, încă mai am %lu de citit dar n-a mai rămas nimic" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "scriere, încă mai am %lu de scris dar nu pot" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "Problemă la închiderea fişierului" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "Problemă la dezlegarea fişierului" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "Problemă în timpul sincronizării fişierului" @@ -2457,7 +2465,7 @@ msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Linie greşită %u în lista sursă %s (identificator vânzător)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2493,6 +2501,14 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Nu pot corecta problema, aţi ţinut pachete deteriorate." +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Unele fişiere index au eşuat la descărcare, fie au fost ignorate, fie au " +"fost folosite în loc unele vechi." + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2525,18 +2541,18 @@ msgstr "Metoda driver %s nu poate fi găsită." msgid "Method %s did not start correctly" msgstr "Metoda %s nu s-a lansat corect" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Vă rog introduceţi discul numit: '%s' în unitatea '%s' şi apăsaţi Enter." -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Sistemul de pachete '%s' nu este suportat" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Nu pot determina un tip de sistem de pachete potrivit" @@ -2549,13 +2565,13 @@ msgstr "Nu pot determina starea %s." msgid "You must put some 'source' URIs in your sources.list" msgstr "Trebuie să puneţi nişte 'surse' de URI în sources.list" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Listele de pachete sau fişierul de stare n-au putut fi analizate sau " "deschise." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Aţi putea vrea să porniţi 'apt-get update' pentru a corecta aceste probleme." @@ -2673,27 +2689,27 @@ msgstr "Colectare furnizori fişier" msgid "IO Error saving source cache" msgstr "Eroare IO în timpul salvării sursei cache" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "redenumire eşuată, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "Nepotrivire MD5Sum" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 #, fuzzy msgid "Hash Sum mismatch" msgstr "Nepotrivire MD5Sum" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Nu există nici o cheie publică disponibilă pentru următoarele " "identificatoare de chei:\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2702,7 +2718,7 @@ msgstr "" "N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna " "că aveţi nevoie să reparaţi manual acest pachet (din pricina unui arch lipsă)" -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2711,7 +2727,7 @@ msgstr "" "N-am putut localiza un fişier pentru pachetul %s. Aceasta ar putea însemna " "că aveţi nevoie să depanaţi manual acest pachet." -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2719,7 +2735,7 @@ msgstr "" "Fişierele index de pachete sunt deteriorate. Fără câmpul 'nume fişier:' la " "pachetul %s." -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "Nepotrivire dimensiune" @@ -2831,71 +2847,78 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "S-au scris %i înregistrări cu %i fişiere lipsă şi %i fişiere nepotrivite\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Directorul de liste %spartial lipseşte." -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "Se pregăteşte %s" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "Se despachetează %s" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "Se pregăteşte configurarea %s" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "Se configurează %s" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Eroare la prelucrarea directorului %s" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "Instalat %s" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "Se pregăteşte ştergerea lui %s" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "Se şterge %s" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "Şters %s" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "Se pregăteşte ştergerea completă a %s" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "Şters complet %s" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 #, fuzzy msgid "Could not patch file" diff --git a/po/ru.po b/po/ru.po index 6206a1b39..5ef668cea 100644 --- a/po/ru.po +++ b/po/ru.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.6.46.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2007-01-03 23:33+0300\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -167,7 +167,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s для %s %s скомпилирован %s %s\n" @@ -672,7 +672,7 @@ msgstr "Не удалось переименовать %s в %s" msgid "Y" msgstr "д" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "Ошибка компиляции регулярного выражения - %s" @@ -838,12 +838,12 @@ msgstr "Пакеты необходимо удалить, но удаление msgid "Internal error, Ordering didn't finish" msgstr "Внутренняя ошибка, Ordering не завершилась" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "Невозможно заблокировать каталог для загрузки" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Не читается перечень источников." @@ -873,7 +873,7 @@ msgid "After this operation, %sB disk space will be freed.\n" msgstr "" "После распаковки объем занятого дискового пространства уменьшится на %sB.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не удалось определить количество свободного места в %s" @@ -912,7 +912,7 @@ msgstr "Аварийное завершение." msgid "Do you want to continue [Y/n]? " msgstr "Хотите продолжить [Д/н]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не удалось загрузить %s %s\n" @@ -921,7 +921,7 @@ msgstr "Не удалось загрузить %s %s\n" msgid "Some files failed to download" msgstr "Некоторые файлы не удалось загрузить" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "Указан режим \"только загрузка\", и загрузка завершена" @@ -1027,75 +1027,67 @@ msgstr "Команде update не нужны аргументы" msgid "Unable to lock the list directory" msgstr "Невозможно заблокировать каталог со списками пакетов" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"Некоторые индексные файлы не загрузились, они были проигнорированы или " -"вместо них были использованы старые версии" - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "НОВЫЕ пакеты, которые будут установлены:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "Следующая информация, возможно, поможет вам:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Внутренняя ошибка, решатель проблем всё поломал" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "Внутренняя ошибка, AllUpgrade все поломал" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Не удалось найти пакет %s" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "Не удалось найти пакет %s" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Заметьте, регулярное выражение %2$s приводит к выбору %1$s\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "но %s будет установлен" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -" "f install':" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1103,7 +1095,7 @@ msgstr "" "Неудовлетворённые зависимости. Попытайтесь выполнить 'apt-get -f install', " "не указывая имени пакета, (или найдите другое решение)." -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1114,7 +1106,7 @@ msgstr "" "или же используете нестабильную версию дистрибутива, где запрошенные вами\n" "пакеты ещё не созданы или были удалены из Incoming." -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1124,121 +1116,136 @@ msgstr "" "пакет просто не может быть установлен из-за ошибок в самом пакете.\n" "Необходимо послать отчёт об этой ошибке." -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "Сломанные пакеты" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "Будут установлены следующие дополнительные пакеты:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "Предлагаемые пакеты:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "Рекомендуемые пакеты:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "Расчёт обновлений... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Неудачно" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "Готово" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "Внутренняя ошибка, решатель проблем всё поломал" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "" "Укажите как минимум один пакет, для которого необходимо загрузить исходные " "тексты" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "Невозможно найти пакет с исходными текстами для %s" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускаем уже загруженный файл '%s'\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостаточно места в %s" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо загрузить %sB/%sB из архивов исходных текстов.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Нужно загрузить %sB архивов с исходными текстами.\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "Загрузка исходных текстов %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "Некоторые архивы не удалось загрузить." -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Распаковка исходных текстов пропущена, так как в %s уже находятся " "распакованные исходные тексты\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда распаковки '%s' завершилась неудачно.\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверьте, установлен ли пакет 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда сборки '%s' завершилась неудачно.\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "Порождённый процесс завершился неудачно" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для проверки зависимостей для сборки необходимо указать как минимум один " "пакет" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Невозможно получить информацию о зависимостях для сборки %s" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s не имеет зависимостей для сборки.\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1247,7 +1254,7 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "найден" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1256,32 +1263,32 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, поскольку ни одна из " "версий пакета %s не удовлетворяет требованиям" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный " "пакет %s новее, чем надо" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимости для сборки %s не могут быть удовлетворены." -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "Обработка зависимостей для сборки завершилась неудачно" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "Поддерживаемые модули:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1594,7 +1601,7 @@ msgstr "Файл %s/%s переписывает файл в пакете %s" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "Невозможно прочитать %s" @@ -1828,7 +1835,7 @@ msgstr "Допустимое время ожидания для соединен msgid "Server closed the connection" msgstr "Сервер прервал соединение" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "Ошибка чтения" @@ -1840,7 +1847,7 @@ msgstr "Ответ переполнил буфер." msgid "Protocol corruption" msgstr "Искажение протокола" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "Ошибка записи" @@ -1896,7 +1903,7 @@ msgstr "Время установления соединения для соке msgid "Unable to accept connection" msgstr "Невозможно принять соединение" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Проблема при хешировании файла" @@ -1923,39 +1930,39 @@ msgstr "Запрос" msgid "Unable to invoke " msgstr "Невозможно вызвать " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Соединение с %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Не удаётся создать сокет для %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Невозможно инициализировать соединение с %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Не удаётся соединиться с %s:%s (%s), connection timed out" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Не удаётся соединиться с %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Соединение с %s" @@ -2033,76 +2040,76 @@ msgstr "Не удалось открыть канал для %s" msgid "Read error from %s process" msgstr "Ошибка чтения из процесса %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Ожидание заголовков" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Получен заголовок длиннее %u символов" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Неверный заголовок" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Http-сервер послал неверный заголовок" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Http сервер послал неверный заголовок Content-Length" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Http-сервер послал неверный заголовок Content-Range" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Этот http-сервер не поддерживает загрузку фрагментов файлов" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Неизвестный формат данных" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Ошибка в select" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Время ожидания для соединения истекло" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Ошибка записи в выходной файл" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Ошибка записи в файл" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Ошибка записи в файл" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Ошибка чтения, удалённый сервер прервал соединение" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Ошибка чтения с сервера" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Неверный заголовок данных" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "Соединение разорвано" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "Внутренняя ошибка" @@ -2239,6 +2246,7 @@ msgid "Unable to stat the mount point %s" msgstr "Невозможно прочитать атрибуты точки монтирования %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "Невозможно сменить текущий каталог на %s" @@ -2247,76 +2255,76 @@ msgstr "Невозможно сменить текущий каталог на % msgid "Failed to stat the cdrom" msgstr "Невозможно получить атрибуты cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Блокировка не используется, так как файл блокировки %s доступен только для " "чтения" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "Не удалось открыть файл блокировки %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Блокировка не используется, так как файл блокировки %s находится на файловой " "системе nfs" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "Не удалось получить доступ к файлу блокировки %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ожидалось завершение процесса %s, но он не был запущен" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" "Нарушение защиты памяти (segmentation fault) в порождённом процессе %s." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Порождённый процесс %s вернул код ошибки (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Порождённый процесс %s неожиданно завершился" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "Не удалось открыть файл %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "" "ошибка при чтении. собирались прочесть ещё %lu байт, но ничего больше нет" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "ошибка при записи, собирались записать ещё %lu байт, но не смогли" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "Проблема закрытия файла" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "Ошибка при удалении файла" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "Проблема при синхронизации файловых буферов с диском" @@ -2481,7 +2489,7 @@ msgstr "Неизвестный тип '%s' в строке %u в списке и msgid "Malformed line %u in source list %s (vendor id)" msgstr "Искажённая строка %u в списке источников %s (vendor id)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2517,6 +2525,14 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Невозможно исправить ошибки, у вас отложены (held) битые пакеты." +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Некоторые индексные файлы не загрузились, они были проигнорированы или " +"вместо них были использованы старые версии" + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2549,17 +2565,17 @@ msgstr "Драйвер для метода %s не найден." msgid "Method %s did not start correctly" msgstr "Метод %s запустился не корректно" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Вставьте диск с меткой '%s' в устройство '%s' и нажмите ввод." -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Менеджер пакетов '%s' не поддерживается" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Невозможно определить подходящий тип менеджера пакетов" @@ -2572,11 +2588,11 @@ msgstr "Невозможно получить атрибуты %s." msgid "You must put some 'source' URIs in your sources.list" msgstr "Вы должны заполнить sources.list, поместив туда URI источников пактов" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "Списки пакетов или status-файл не могут быть открыты или прочитаны." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "Вы можете запустить 'apt-get update' для исправления этих ошибок" @@ -2687,25 +2703,25 @@ msgstr "Сбор информации о Provides" msgid "IO Error saving source cache" msgstr "Ошибка ввода/вывода при попытке сохранить кеш исходных текстов" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "переименовать не удалось, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "MD5Sum не совпадает" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum не совпадает" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "Недоступен общий ключ для следующих ID ключей:\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2714,7 +2730,7 @@ msgstr "" "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся " "вручную исправить этот пакет (возможно, пропущен arch)" -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2723,13 +2739,13 @@ msgstr "" "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся " "вручную исправить этот пакет." -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s." -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "Не совпадает размер" @@ -2844,71 +2860,78 @@ msgstr "" "Сохранено %i записей с %i отсутствующими файлами и с %i несовпадающими " "файлами\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Каталог %spartial отсутствует." -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "Подготавливается %s" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "Распаковывается %s" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "Подготавливается для конфигурации %s" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "Настройка %s" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Ошибка обработки каталога %s" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "Установлен %s" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "Подготавливается для удаления %s" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "Удаление %s" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "Удалён %s" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "Подготовка к полному удалению %s" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "%s полностью удалён" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "Не удалось пропатчить файл" diff --git a/po/sk.po b/po/sk.po index 0255cd481..f3ab96ef6 100644 --- a/po/sk.po +++ b/po/sk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2006-09-10 18:50+0200\n" "Last-Translator: Peter Mann \n" "Language-Team: Slovak \n" @@ -158,7 +158,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pre %s %s skompilovaný na %s %s\n" @@ -653,7 +653,7 @@ msgstr "Premenovanie %s na %s zlyhalo" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba pri preklade regulárneho výrazu - %s" @@ -814,12 +814,12 @@ msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá." msgid "Internal error, Ordering didn't finish" msgstr "Vnútorná chyba, Triedenie sa neukončilo" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "Adresár pre sťahovanie sa nedá zamknúť" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Nedá sa načítať zoznam zdrojov." @@ -849,7 +849,7 @@ msgstr "Po rozbalení sa na disku použije ďalších %sB.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po rozbalení sa na disku uvoľní %sB.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "Na %s sa nedá zistiť veľkosť voľného miesta" @@ -886,7 +886,7 @@ msgstr "Prerušené." msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovať [Y/n]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Zlyhalo stiahnutie %s %s\n" @@ -895,7 +895,7 @@ msgstr "Zlyhalo stiahnutie %s %s\n" msgid "Some files failed to download" msgstr "Niektoré súbory sa nedajú stiahnuť" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "Sťahovanie ukončené v režime \"iba stiahnuť\"" @@ -999,73 +999,65 @@ msgstr "Príkaz update neprijíma žiadne argumenty" msgid "Unable to lock the list directory" msgstr "Adresár zoznamov sa nedá zamknúť" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"Niektoré indexové súbory sa nepodarilo stiahnuť, boli ignorované, alebo sa " -"použili staršie verzie." - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Nainštalujú sa nasledovné NOVÉ balíky:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "Nasledovné informácie vám možno pomôžu vyriešiť túto situáciu:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Vnútorná chyba, problem resolver pokazil veci" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnútorná chyba, AllUpgrade pokazil veci" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Balík %s sa nedá nájsť" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "Balík %s sa nedá nájsť" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Poznámka: vyberá sa %s pre regulárny výraz '%s'\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ale inštalovať sa bude %s" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Na opravu nasledovných môžete spustiť `apt-get -f install':" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1073,7 +1065,7 @@ msgstr "" "Nesplnené závislosti. Skúste spustiť 'apt-get -f install' bez balíkov (alebo " "navrhnite riešenie)." -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1085,7 +1077,7 @@ msgstr "" "požadované balíky ešte neboli vytvorené alebo presunuté z fronty\n" "Novoprichádzajúcich (Incoming) balíkov." -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1095,124 +1087,139 @@ msgstr "" "balík nie je inštalovateľný a mali by ste zaslať hlásenie o chybe\n" "(bug report) pre daný balík." -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "Poškodené balíky" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "Nainštalujú sa nasledovné extra balíky:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "Odporúčané balíky:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "Prepočítava sa aktualizácia... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Chyba" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "Vnútorná chyba, problem resolver pokazil veci" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "Musíte zadať aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "Nedá sa nájsť zdrojový balík pre %s" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Preskakuje sa už stiahnutý súbor '%s'\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatok voľného miesta" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Je potrebné stiahnuť %sB/%sB zdrojových archívov.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Je potrebné stiahnuť %sB zdrojových archívov.\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "Stiahnuť zdroj %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "Zlyhalo stiahnutie niektorých archívov." -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Preskakuje sa rozbalenie už rozbaleného zdroja v %s\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Príkaz pre rozbalenie '%s' zlyhal.\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Skontrolujte, či je nainštalovaný balík 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "Príkaz pre zostavenie '%s' zlyhal.\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "Proces potomka zlyhal" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "" "Musíte zadať aspoň jeden balík, pre ktorý sa budú overovať závislosti na " "zostavenie" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nedajú sa získať závislosti pre zostavenie %s" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žiadne závislosti pre zostavenie.\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s závislosť pre %s sa nemôže splniť, pretože sa nedá nájsť balík %s" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1221,31 +1228,31 @@ msgstr "" "%s závislosť pre %s sa nedá splniť, protože sa nedá nájsť verzia balíku %s, " "ktorá zodpovedá požiadavke na verziu" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Zlyhalo splnenie %s závislosti pre %s: Inštalovaný balík %s je príliš nový" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Zlyhalo splnenie %s závislosti pre %s: %s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti pre zostavenie %s sa nedajú splniť." -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "Spracovanie závislostí pre zostavenie zlyhalo" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1555,7 +1562,7 @@ msgstr "Súbor %s/%s prepisuje ten z balíka %s" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "%s sa nedá čítať" @@ -1787,7 +1794,7 @@ msgstr "Uplynul čas spojenia" msgid "Server closed the connection" msgstr "Server ukončil spojenie" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "Chyba pri čítaní" @@ -1799,7 +1806,7 @@ msgstr "Odpoveď preplnila zásobník." msgid "Protocol corruption" msgstr "Narušenie protokolu" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "Chyba pri zápise" @@ -1853,7 +1860,7 @@ msgstr "Uplynulo spojenie dátového socketu" msgid "Unable to accept connection" msgstr "Spojenie sa nedá prijať" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problém s hashovaním súboru" @@ -1880,39 +1887,39 @@ msgstr "Dotaz" msgid "Unable to invoke " msgstr "Nedá sa vyvolať " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Pripája sa k %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Nedá sa vytvoriť socket pre %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Nedá sa nadviazať spojenie na %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Nedá sa pripojiť k %s:%s (%s), uplynul čas spojenia" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Nedá sa pripojiť k %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Pripája sa k %s" @@ -1988,76 +1995,76 @@ msgstr "Nedá sa otvoriť rúra pre %s" msgid "Read error from %s process" msgstr "Chyba pri čítaní z procesu %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Čaká sa na hlavičky" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Získal sa jeden riadok hlavičky cez %u znakov" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Chybná hlavička" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP server poslal neplatnú hlavičku odpovede" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP server poslal neplatnú hlavičku Content-Length" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP server poslal neplatnú hlavičku Content-Range" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Tento HTTP server má poškodenú podporu rozsahov" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Neznámy formát dátumu" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Výber zlyhal" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Uplynul čas spojenia" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupného súboru" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Chyba pri čítaní zo servera" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Zlé dátové záhlavie" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "Spojenie zlyhalo" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "Vnútorná chyba" @@ -2193,6 +2200,7 @@ msgid "Unable to stat the mount point %s" msgstr "Prípojný bod %s sa nedá vyhodnotiť" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "Nedá sa prejsť do %s" @@ -2201,70 +2209,70 @@ msgstr "Nedá sa prejsť do %s" msgid "Failed to stat the cdrom" msgstr "Nedá sa vyhodnotiť cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Zamykanie pre zámkový súbor %s, ktorý je iba na čítanie, sa nepoužíva" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "Zámkový súbor %s sa nedá otvoriť" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Zamykanie pre zámkový súbor %s pripojený cez nfs sa nepoužíva" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "Zámok %s sa nedá získať" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Čakalo sa na %s, ale nebolo to tam" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Podproces %s obdržal chybu segmentácie." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s vrátil chybový kód (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s neočakávane skončil" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "Súbor %s sa nedá otvoriť súbor" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "čítanie, stále treba prečítať %lu, ale už nič neostáva" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "zápis, stále treba zapísať %lu, no nedá sa to" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "Problém pri zatváraní súboru" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "Problém pri odstraňovaní súboru" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "Problém pri synchronizovaní súboru" @@ -2428,7 +2436,7 @@ msgstr "Typ '%s' je neznámy na riadku %u v zozname zdrojov %s" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Skomolený riadok %u v zozname zdrojov %s (id výrobcu)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2462,6 +2470,14 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Problémy sa nedajú opraviť, niektoré balíky držíte v poškodenom stave." +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Niektoré indexové súbory sa nepodarilo stiahnuť, boli ignorované, alebo sa " +"použili staršie verzie." + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2494,17 +2510,17 @@ msgstr "Nedá sa nájsť ovládač spôsobu %s." msgid "Method %s did not start correctly" msgstr "Spôsob %s nebol správne spustený" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Vložte disk nazvaný '%s' do mechaniky '%s' a stlačte Enter." -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Balíčkovací systém '%s' nie je podporovaný" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Nedá sa určiť vhodný typ balíčkovacieho systému" @@ -2517,11 +2533,11 @@ msgstr "Nedá sa vyhodnotiť %s." msgid "You must put some 'source' URIs in your sources.list" msgstr "Do sources.list musíte zadať nejaké 'zdrojové' URI" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "Zoznamy balíkov alebo stavový súbor sa nedajú spracovať alebo otvoriť." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "Na opravu týchto problémov môžete skúsiť spustiť apt-get update" @@ -2634,25 +2650,25 @@ msgstr "Collecting File poskytuje" msgid "IO Error saving source cache" msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäte" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "premenovanie zlyhalo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "Nezhoda MD5 súčtov" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 #, fuzzy msgid "Hash Sum mismatch" msgstr "Nezhoda MD5 súčtov" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "Nie sú dostupné žiadne verejné kľúče ku kľúčom s nasledovnými ID:\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2661,7 +2677,7 @@ msgstr "" "Nedá sa nájsť súbor s balíkom %s. To by mohlo znamenať, že tento balík je " "potrebné opraviť manuálne (kvôli chýbajúcej architektúre)." -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2670,13 +2686,13 @@ msgstr "" "Nedá sa nájsť súbor s balíkom %s. Asi budete musieť opraviť tento balík " "manuálne." -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Indexové súbory balíka sú narušené. Chýba pole Filename: pre balík %s." -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "Veľkosti sa nezhodujú" @@ -2788,71 +2804,78 @@ msgstr "Zapísaných %i záznamov s %i chybnými súbormi\n" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Zapísaných %i záznamov s %i chýbajúcimi a %i chybnými súbormi\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Adresár zoznamov %spartial chýba." -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "Pripravuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "Rozbaľuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "Pripravuje sa nastavenie %s" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "Nastavuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Chyba pri spracovávaní adresára %s" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "Nainštalovaný balík %s" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "Pripravuje sa odstránenie %s" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "Odstraňuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "Odstránený balík %s" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "Pripravuje sa úplné odstránenie %s" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "Balík '%s' je úplne odstránený" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "Súbor %s sa nedá otvoriť súbor" diff --git a/po/sl.po b/po/sl.po index 3cb31ee54..e18c1ec1e 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2005-02-16 22:18+0100\n" "Last-Translator: Jure Cuhalev \n" "Language-Team: Slovenian \n" @@ -155,7 +155,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s za %s %s preveden na %s %s\n" @@ -653,7 +653,7 @@ msgstr "Ni mogo msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "Napaka pri prevajanju regex - %s" @@ -816,12 +816,12 @@ msgstr "Odstraniti je potrebno pakete, a je Odstranjevanje onemogo msgid "Internal error, Ordering didn't finish" msgstr "Notranja napaka pri dodajanju odklona" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "Ni mogoe zakleniti imenika za prenose" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Seznama virov ni mogoe brati." @@ -849,7 +849,7 @@ msgstr "Po odpakiranju bo uporabljenega %sB dodatnega prostora na disku.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po odpakiranju bo sproenega %sB prostora na disku.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Nimate dovolj prostora na %s" @@ -886,7 +886,7 @@ msgstr "Prekini." msgid "Do you want to continue [Y/n]? " msgstr "Ali elite nadaljevati [Y/n]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ni mogoe dobiti %s %s\n" @@ -895,7 +895,7 @@ msgstr "Ni mogo msgid "Some files failed to download" msgstr "Prenos nekaterih datotek ni uspel" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "Prenos dokonan in uporabljen nain samo prenos" @@ -1000,73 +1000,65 @@ msgstr "Ukaz update ne potrebuje argumentov" msgid "Unable to lock the list directory" msgstr "Imenika seznamov ni mogoe zakleniti" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"Nekaterih kazal ni mogoe prenesti, zato so preklicana, ali pa so " -"uporabljena stareja." - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Naslednji NOVI paketi bodo nameeni:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "Naslednji podatki vam bodo morda pomagali reiti teavo:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Ni mogoe najti paketa %s" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "Ni mogoe najti paketa %s" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Opomba: izbran %s namesto regex '%s'\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "vendar bo paket %s nameen" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Poskusite zagnati 'apt-get -f install', e elite popraviti:" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1074,7 +1066,7 @@ msgstr "" "Nereene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali " "podajte reitev)." -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1085,7 +1077,7 @@ msgstr "" "nemogo poloaj, e uporabljate nestabilno izdajo pa, da nekateri zahtevani " "paketi e niso ustvarjeni ali preneeni iz Prihajajoe." -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1095,126 +1087,141 @@ msgstr "" "preprosto ne da namestiti in je potrebno vloiti poroilo o hrou\n" "o tem paketu." -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "Pokvarjeni paketi" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "Naslednji dodatni paketi bodo nameeni:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "Predlagani paketi:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "Priporoeni paketi:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "Preraunavanje nadgradnje ... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Spodletelo" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "Opravljeno" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega elite dobiti izorno kodo" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "Izvornega paketa za %s ni mogoe najti" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "Nimate dovolj prostora na %s" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potrebno je dobiti %sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "Dobi vir %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "Nekaterih arhivov ni mogoe dobiti." -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Ukaz odpakiranja '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "Ukaz gradnje '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "Otroki proces ni uspel" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega elite preveriti odvisnosti " "za gradnjo" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni mogoe dobiti informacij o odvisnostih za gradnjo za %s" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s nima odvisnosti za gradnjo.\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s odvisnosti za %s ni mogoe zadostiti, ker ni mogoe najti paketa %s" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1223,31 +1230,31 @@ msgstr "" "%s odvisnosti za %s ni mogoe zadostiti, ker nobena razliica paketa %s ne " "more zadostiti zahtevi po razliici" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Ni mogoe zadostiti %s odvisnosti za %s. Nameen paket %s je preve nov" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Ni mogoe zadostiti %s odvisnosti za %s. %s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Odvisnostim za gradnjo %s ni mogoe zadostiti." -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "Obdelava odvisnosti za gradnjo ni uspela" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "Podprti moduli:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1559,7 +1566,7 @@ msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "Ni mogoe brati %s" @@ -1791,7 +1798,7 @@ msgstr "Povezava potekla" msgid "Server closed the connection" msgstr "Strenik je zaprl povezavo" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "Napaka pri branju" @@ -1803,7 +1810,7 @@ msgstr "Odgovor je prekora msgid "Protocol corruption" msgstr "Okvara protokola" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "Napaka pri pisanju" @@ -1857,7 +1864,7 @@ msgstr "Povezava podatkovne vti msgid "Unable to accept connection" msgstr "Ni mogoe sprejeti povezave" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Teava pri razprevanju datoteke" @@ -1884,39 +1891,39 @@ msgstr "Poizvedba" msgid "Unable to invoke " msgstr "Ni mogoe zagnati " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Povezovanje z %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Ni mogoe ustvariti vtinice za %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Ni mogoe zaeti povezave z %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Ni se mogoe povezati z %s:%s (%s). Povezava potekla." -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Ni se mogoe povezati z %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Povezujem se z %s" @@ -1989,76 +1996,76 @@ msgstr "Ni mogo msgid "Read error from %s process" msgstr "Napaka pri branju iz procesa %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "akanje na glave" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Dobljena je ena vrstica glave preko %u znakov" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Napana vrstica glave" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Strenik HTTP je poslal napano glavo odgovora" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Strenik HTTP je poslal glavo z napano dolino vsebine" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Strenik HTTP je poslal glavo z napanim obsegom vsebine" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Ta strenik HTTP ima pokvarjen obseg podpore" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Neznana oblika datuma" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Izbira ni uspela" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "as za povezavo se je iztekel" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Napaka pri pisanju v izhodno datoteko" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Napaka pri branju oddaljene in zaprte povezave s strenika " -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Napaka pri branju s strenika" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Napani podatki glave" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "Povezava ni uspela" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "Notranja napaka" @@ -2194,6 +2201,7 @@ msgid "Unable to stat the mount point %s" msgstr "Ni mogoe doloiti priklopne toke %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "Ni mogoe spremeniti v %s" @@ -2202,70 +2210,70 @@ msgstr "Ni mogo msgid "Failed to stat the cdrom" msgstr "Ni mogoe doloiti CD-ROM-a" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Brez uporabe zaklepanja za zaklenjeno datoteko samo za branje %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "Ni mogoe odprti zaklenjene datoteke %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Brez uporabe zaklepanja za datoteko %s, priklopljeno z NTFS" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "Ni mogoe dobiti zaklenjene datoteke %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "akal, a %s ni bil tam" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Napaka pri razlenjenosti podprocesa %s." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s je vrnil kodo napake (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s se je nepriakovano zakljuil" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "Ne morem odpreti datoteke %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "berem, e vedno %lu za branje, a nobeden ostal" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "piem, e vedno %lu za pisanje, a ni mogoe" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "Teava pri zapiranju datoteke" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "Teava pri odvezovanju datoteke" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "Teava pri usklajevanju datoteke" @@ -2429,7 +2437,7 @@ msgstr "Vrsta '%s' v vrstici %u v seznamu virov %s ni znana" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Napana vrstica %u v seznamu virov %s (ID ponudnika)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2464,6 +2472,14 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Ni mogoe popraviti teav. Imate zadrane pakete." +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Nekaterih kazal ni mogoe prenesti, zato so preklicana, ali pa so " +"uporabljena stareja." + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2496,7 +2512,7 @@ msgstr "Ni mogo msgid "Method %s did not start correctly" msgstr "Metoda %s se ni zaela pravilno" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, fuzzy, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -2504,12 +2520,12 @@ msgstr "" " '%s'\n" "v enoto '%s' in pritisnite enter\n" -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketni sistem '%s' ni podprt" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Ni mogoe ugotoviti ustrezne vrste paketnega sistema" @@ -2522,11 +2538,11 @@ msgstr "Ni mogo msgid "You must put some 'source' URIs in your sources.list" msgstr "V sources.list morate vstaviti URI-je z viri" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "Ni mogoe odprti ali razleniti seznama paketov ali datoteke stanja." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "e elite odpraviti teave, poskusite zagnati apt-get update." @@ -2637,25 +2653,25 @@ msgstr "Zbiranje dobaviteljev datotek" msgid "IO Error saving source cache" msgstr "Napaka IO pri shranjevanju predpomnilnika virov" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "preimenovanje spodletelo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "Neujemanje vsote MD5" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 #, fuzzy msgid "Hash Sum mismatch" msgstr "Neujemanje vsote MD5" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2664,7 +2680,7 @@ msgstr "" "Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono " "popraviti ta paket (zaradi manjkajoega arhiva)." -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2673,7 +2689,7 @@ msgstr "" "Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono " "popraviti ta paket." -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2681,7 +2697,7 @@ msgstr "" "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket " "%s." -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "Neujemanje velikosti" @@ -2794,71 +2810,78 @@ msgstr "" "Zapisal %i zapisov z %i manjkajoimi datotekami in %i neujemajoimi " "datotekami.\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Manjka imenik s seznami %spartial." -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, fuzzy, c-format msgid "Preparing %s" msgstr "Odpiram %s" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Odpiram %s" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Odpiranje nastavitvene datoteke %s" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, fuzzy, c-format msgid "Configuring %s" msgstr "Povezujem se z %s" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Napaka pri obdelavi imenika %s" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, fuzzy, c-format msgid "Installed %s" msgstr " Nameen: " -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, fuzzy, c-format msgid "Removing %s" msgstr "Odpiram %s" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, fuzzy, c-format msgid "Removed %s" msgstr "Priporoa" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Odpiranje nastavitvene datoteke %s" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Odstranitev %s ni uspela" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 #, fuzzy msgid "Could not patch file" diff --git a/po/sv.po b/po/sv.po index bebc77313..48bfa4a36 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2007-10-30 10:31+0100\n" "Last-Translator: Peter Karlsson \n" "Language-Team: Swedish \n" @@ -158,7 +158,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s fr %s kompilerad den %s %s\n" @@ -659,7 +659,7 @@ msgstr "Misslyckades med att byta namn p msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "Fel vid kompilering av reguljrt uttryck - %s" @@ -821,12 +821,12 @@ msgstr "Paketen m msgid "Internal error, Ordering didn't finish" msgstr "Internt fel. Sorteringen frdigstlldes inte" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "Kunde inte lsa hmtningskatalogen" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Listan ver kllor kunde inte lsas." @@ -856,7 +856,7 @@ msgstr "Efter uppackning kommer ytterligare %sB utrymme anv msgid "After this operation, %sB disk space will be freed.\n" msgstr "Efter uppackning kommer %sB att frigras p disken.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunde inte faststlla ledigt utrymme i %s" @@ -894,7 +894,7 @@ msgstr "Avbryter." msgid "Do you want to continue [Y/n]? " msgstr "Vill du fortstta [J/n]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Misslyckades med att hmta %s %s\n" @@ -903,7 +903,7 @@ msgstr "Misslyckades med att h msgid "Some files failed to download" msgstr "Misslyckades med att hmta vissa filer" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "Hmtningen frdig i \"endast-hmta\"-lge" @@ -1009,31 +1009,23 @@ msgstr "Uppdateringskommandot tar inga argument" msgid "Unable to lock the list directory" msgstr "Kunde inte lsa listkatalogen" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"Vissa indexfiler kunde inte hmtas, de har ignorerats eller s har de gamla " -"anvnts istllet." - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Det r inte meningen att vi ska ta bort ngot, kan inte starta AutoRemover" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" "Fljande paket har installerats automatiskt och r inte lngre ndvndiga:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "Anvnd \"apt-get autoremove\" fr att ta bort dem." -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1041,44 +1033,44 @@ msgstr "" "Hmm, det verkar som AutoRemover frstrde ngot som verkligen\n" "inte skulle hnda. Skicka in en felrapport mot paketet apt." -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "Fljande information kan vara till hjlp fr att lsa situationen:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 msgid "Internal Error, AutoRemover broke stuff" msgstr "Internt fel, AutoRemover frstrde ngot" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internt fel, AllUpgrade frstrde ngot" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, c-format msgid "Couldn't find task %s" msgstr "Kunde inte hitta funktionen %s" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "Kunde inte hitta paketet %s" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Observera, vljer %s fr det reguljra uttrycket \"%s\"\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "%s r satt till manuellt installerad.\n" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Du kan mjligen rtta till detta genom att kra \"apt-get -f install\":" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1086,7 +1078,7 @@ msgstr "" "Otillfredsstllda beroenden. Prova med \"apt-get -f install\" utan paket " "(eller ange en lsning)." -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1098,7 +1090,7 @@ msgstr "" "att ngra ndvndiga paket nnu inte har skapats eller flyttats\n" "ut frn \"Incoming\"." -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1108,115 +1100,130 @@ msgstr "" "helt enkelt inte kan installeras och att en felrapport om detta br\n" "skickas in." -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "Trasiga paket" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "Fljande ytterligare paket kommer att installeras:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "Freslagna paket:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "Rekommenderade paket:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "Berknar uppgradering... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Misslyckades" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "Frdig" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "Internt fel, problemlsaren frstrde ngonting" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "Du mste ange minst ett paket att hmta kllkod fr" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunde inte hitta ngot kllkodspaket fr %s" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar ver redan hmtade filen \"%s\"\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har inte tillrckligt mycket ledigt utrymme i %s" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Behver hmta %sB/%sB kllkodsarkiv.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Behver hmta %sB kllkodsarkiv.\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "Hmtar kllkoden %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "Misslyckades med att hmta vissa arkiv." -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Packar inte upp redan uppackad kllkod i %s\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uppackningskommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Frskra dig om att paketet \"dpkg-dev\" r installerat.\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggkommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "Barnprocessen misslyckades" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "Du mste ange minst ett paket att kontrollera byggberoenden fr" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunde inte hmta information om byggberoenden fr %s" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s har inga byggberoenden.\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1225,7 +1232,7 @@ msgstr "" "%s-beroendet p %s kan inte tillfredsstllas eftersom paketet %s inte kan " "hittas" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1234,32 +1241,32 @@ msgstr "" "%s-beroendet p %s kan inte tillfredsstllas eftersom inga tillgngliga " "versioner av paketet %s tillfredsstller versionskraven" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Misslyckades med att tillfredsstlla %s-beroendet fr %s: Det installerade " "paketet %s r fr nytt" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Misslyckades med att tillfredsstlla %s-beroendet fr %s: %s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggberoenden fr %s kunde inte tillfredsstllas." -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "Misslyckades med att behandla byggberoenden" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "Moduler som stds:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1577,7 +1584,7 @@ msgstr "Filen %s/%s skriver #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "Kunde inte lsa %s" @@ -1810,7 +1817,7 @@ msgstr "Tidsgr msgid "Server closed the connection" msgstr "Servern stngde anslutningen" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "Lsfel" @@ -1822,7 +1829,7 @@ msgstr "Ett svar spillde bufferten." msgid "Protocol corruption" msgstr "Protokollet skadat" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "Skrivfel" @@ -1876,7 +1883,7 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgr msgid "Unable to accept connection" msgstr "Kunde inte ta emot anslutningen" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem med att lgga filen till hashtabellen" @@ -1905,40 +1912,40 @@ msgid "Unable to invoke " msgstr "Kunde inte starta " # Felmeddelande fr misslyckad chdir -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Ansluter till %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" # [f]amilj, [t]yp, [p]rotokoll -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Kunde inte skapa ett uttag (socket) fr %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Kunde inte initiera anslutningen till %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Kunde inte ansluta till %s:%s (%s), anslutningen verskred tidsgrns" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Kunde inte ansluta till %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Ansluter till %s" @@ -2017,76 +2024,76 @@ msgstr "Kunde inte msgid "Read error from %s process" msgstr "Lsfel frn %s-processen" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Vntar p huvuden" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Fick en ensam huvudrad p %u tecken" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Felaktig huvudrad" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Http-servern snde ett ogiltigt svarshuvud" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Http-servern snde ett ogiltigt Content-Length-huvud" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Http-servern snde ett ogiltigt Content-Range-huvud" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Den hr http-serverns std fr delvis hmtning fungerar inte" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Oknt datumformat" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "\"Select\" misslyckades" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Anslutningen verskred tidsgrnsen" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Fel vid skrivning till utdatafil" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Fel vid skrivning till fil" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Fel vid skrivning till filen" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Fel vid lsning frn server: Andra nden stngde frbindelsen" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Fel vid lsning frn server" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Felaktiga data i huvud" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "Anslutningen misslyckades" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "Internt fel" @@ -2223,6 +2230,7 @@ msgstr "Kunde inte ta status p # Felmeddelande fr misslyckad chdir #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "Kunde inte byta till %s" @@ -2231,70 +2239,70 @@ msgstr "Kunde inte byta till %s" msgid "Failed to stat the cdrom" msgstr "Kunde inte ta status p cd-romen." -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Anvnder inte lsning fr skrivskyddade lsfilen %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "Kunde inte ppna lsfilen %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Anvnder inte lsning fr nfs-monterade lsfilen %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "Kunde inte erhlla lset %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Vntade p %s men den fanns inte dr" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprocessen %s rkade ut fr ett segmenteringsfel." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprocessen %s svarade med en felkod (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprocessen %s avslutades ovntat" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "Kunde inte ppna filen %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "lsning, har fortfarande %lu att lsa men ingenting finns kvar" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "skrivning, har fortfarande %lu att skriva men kunde inte" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "Problem med att stnga filen" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "Problem med att lnka ut filen" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "Problem med att synkronisera filen" @@ -2460,7 +2468,7 @@ msgstr "Typ \"%s\" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Rad %u i kllistan %s har fel format (leverantrs-id)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2496,6 +2504,14 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Kunde inte korrigera problemen, du har hllt tillbaka trasiga paket." +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Vissa indexfiler kunde inte hmtas, de har ignorerats eller s har de gamla " +"anvnts istllet." + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2528,19 +2544,19 @@ msgstr "Metoddrivrutinen %s kunde inte hittas." msgid "Method %s did not start correctly" msgstr "Metoden %s startade inte korrekt" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Mata in skivan med etiketten \"%s\" i enheten \"%s\" och tryck p Enter." -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Paketsystemet \"%s\" stds inte" # -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Kunde inte faststlla en lmplig paketsystemstyp" @@ -2553,11 +2569,11 @@ msgstr "Kunde inte ta status p msgid "You must put some 'source' URIs in your sources.list" msgstr "Du mste lgga till ngra \"source\"-URI:er i din sources.list" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "Paketlistan eller statusfilen kunde inte tolkas eller ppnas." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "Du kan mjligen rtta till problemet genom att kra \"apt-get update\"" @@ -2671,24 +2687,24 @@ msgstr "Samlar filtillhandah msgid "IO Error saving source cache" msgstr "In-/utfel vid lagring av kllcache" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "namnbyte misslyckades, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "MD5-kontrollsumman stmmer inte" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 msgid "Hash Sum mismatch" msgstr "Hash-kontrollsumman stmmer inte" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "Det finns ingen ppen nyckel tillgnglig fr fljande nyckel-id:n:\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2697,7 +2713,7 @@ msgstr "" "Jag kunde inte hitta ngon fil fr paketet %s. Detta kan betyda att du " "manuellt mste reparera detta paket (p grund av saknad arkitektur)." -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2706,13 +2722,13 @@ msgstr "" "Jag kunde inte hitta ngon fil fr paketet %s. Detta kan betyda att du " "manuellt mste reparera detta paket." -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Paketindexfilerna r skadede. Inget \"Filename:\"-flt fr paketet %s." -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "Storleken stmmer inte" @@ -2824,72 +2840,79 @@ msgstr "Skrev %i poster med %i filer som inte st msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Skrev %i poster med %i saknade filer och %i filer som inte stmmer\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, c-format msgid "Directory '%s' missing" msgstr "Katalogen \"%s\" saknas" -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "Frbereder %s" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "Packar upp %s" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "Frbereder konfigurering av %s" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "Konfigurerar %s" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, c-format msgid "Processing triggers for %s" msgstr "Behandlar utlsare fr %s" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "Installerade %s" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "Frbereder borttagning av %s" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "Tog bort %s" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "Frbereder borttagning av hela %s" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "Tog bort hela %s" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Kan inte skriva loggfil, openpty() misslyckades (/dev/pts inte monterad?)\n" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "Kunde inte lgga p programfix p filen" diff --git a/po/th.po b/po/th.po index aed0a9b98..ac2b093e0 100644 --- a/po/th.po +++ b/po/th.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2007-09-17 16:07+0700\n" "Last-Translator: Theppitak Karoonboonyanan \n" "Language-Team: Thai \n" @@ -156,7 +156,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s สำหรับ %s คอมไพล์เมื่อ %s %s\n" @@ -645,7 +645,7 @@ msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไป msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s" @@ -806,12 +806,12 @@ msgstr "มีแพกเกจที่จำเป็นต้องถอด msgid "Internal error, Ordering didn't finish" msgstr "ข้อผิดพลาดภายใน: การเรียงลำดับไม่เสร็จสิ้น" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "ไม่สามารถล็อคไดเรกทอรีดาวน์โหลด" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "ไม่สามารถอ่านรายชื่อแหล่งแพกเกจได้" @@ -839,7 +839,7 @@ msgstr "หลังจากแตกแพกเกจแล้ว ต้อ msgid "After this operation, %sB disk space will be freed.\n" msgstr "หลังจากแตกแพกเกจแล้ว เนื้อที่บนดิสก์จะว่างเพิ่มอีก %s\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "ไม่สามารถคำนวณพื้นที่ว่างใน %s" @@ -876,7 +876,7 @@ msgstr "เลิกทำ" msgid "Do you want to continue [Y/n]? " msgstr "คุณต้องการจะดำเนินการต่อไปหรือไม่ [Y/n]?" -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "ไม่สามารถดาวน์โหลด %s %s\n" @@ -885,7 +885,7 @@ msgstr "ไม่สามารถดาวน์โหลด %s %s\n" msgid "Some files failed to download" msgstr "ดาวน์โหลดบางแฟ้มไม่สำเร็จ" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "ดาวน์โหลดสำเร็จแล้ว และอยู่ในโหมดดาวน์โหลดอย่างเดียว" @@ -989,27 +989,21 @@ msgstr "คำสั่ง update ไม่รับอาร์กิวเม msgid "Unable to lock the list directory" msgstr "ไม่สามารถล็อคไดเรกทอรีรายชื่อแพกเกจ" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "ดาวน์โหลดแฟ้มดัชนีบางแฟ้มไม่สำเร็จ จะข้ามรายการดังกล่าวไป หรือใช้ข้อมูลเก่าแทน" - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "apt ถูกกำหนดไม่ให้มีการลบใดๆ จึงไม่สามารถดำเนินการถอดถอนอัตโนมัติได้" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "ใช้ 'apt-get autoremove' เพื่อลบแพกเกจดังกล่าวได้" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1017,43 +1011,43 @@ msgstr "" "ดูเหมือนการถอดถอนอัตโนมัติได้สร้างความเสียหายบางอย่าง ซึ่งไม่ควรเกิดขึ้น\n" "กรุณารายงานบั๊กนี้ของแพกเกจ apt" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "ข้อมูลต่อไปนี้อาจช่วยแก้ปัญหาได้:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 msgid "Internal Error, AutoRemover broke stuff" msgstr "เกิดข้อผิดพลาดภายใน: AutoRemover ทำความเสียหาย" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "เกิดข้อผิดพลาดภายใน: AllUpgrade ทำความเสียหาย" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, c-format msgid "Couldn't find task %s" msgstr "ไม่พบงาน %s" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "ไม่พบแพกเกจ %s" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "หมายเหตุ: จะเลือก %s สำหรับนิพจน์เรกิวลาร์ '%s'\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "กำหนด %s ให้เป็นการติดตั้งแบบเลือกเองแล้ว\n" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "คุณอาจเรียก `apt-get -f install' เพื่อแก้ปัญหานี้ได้:" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1061,7 +1055,7 @@ msgstr "" "มีปัญหาความขึ้นต่อกันระหว่างแพกเกจ กรุณาลองใช้ 'apt-get -f install' โดยไม่ระบุแพกเกจ " "(หรือจะระบุทางแก้ก็ได้)" -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1072,7 +1066,7 @@ msgstr "" "หรือถ้าคุณกำลังใช้รุ่น unstable ก็เป็นไปได้ว่าแพกเกจที่จำเป็นบางรายการ\n" "ยังไม่ถูกสร้างขึ้น หรือถูกย้ายออกจาก Incoming" -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1081,122 +1075,137 @@ msgstr "" "และเนื่องจากคุณได้สั่งดำเนินการเพียงรายการเดียวเท่านั้น ก็เป็นไปได้สูงว่าแพกเกจนี้เสีย\n" "คุณควรจะรายงานบั๊กสำหรับแพกเกจนี้" -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "แพกเกจมีปัญหา" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "จะติดตั้งแพกเกจเพิ่มเติมต่อไปนี้:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "แพกเกจที่แนะนำ:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "แพกเกจที่ควรใช้ร่วมกัน:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "กำลังคำนวณการปรับรุ่น... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "ล้มเหลว" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "เสร็จแล้ว" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "เกิดข้อผิดพลาดภายใน: กลไกการแก้ปัญหาทำความเสียหาย" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะดาวน์โหลดซอร์สโค้ด" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "ไม่พบแพกเกจซอร์สโค้ดสำหรับ %s" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "จะข้ามแฟ้ม '%s' ที่ดาวน์โหลดไว้แล้ว\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB/%sB\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "ดาวน์โหลดซอร์ส %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "ไม่สามารถดาวน์โหลดบางแฟ้ม" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "จะข้ามการแตกซอร์สของซอร์สที่แตกไว้แล้วใน %s\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "คำสั่งแตกแฟ้ม '%s' ล้มเหลว\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "กรุณาตรวจสอบว่าได้ติดตั้งแพกเกจ 'dpkg-dev' แล้ว\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "คำสั่ง build '%s' ล้มเหลว\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "โพรเซสลูกล้มเหลว" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะตรวจสอบสิ่งที่ต้องการสำหรับการ build" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้องการสำหรับการ build ของ %s" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s ไม่ต้องการสิ่งใดสำหรับ build\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่พบแพกเกจ %s" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1205,30 +1214,30 @@ msgstr "" "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มีแพกเกจ %s " "รุ่นที่จะสอดคล้องกับความต้องการรุ่นของแพกเกจได้" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: แพกเกจ %s ที่ติดตั้งไว้ใหม่เกินไป" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับการ build ของ %s ได้" -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับการ build ไม่สำเร็จ" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "มอดูลที่รองรับ:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1537,7 +1546,7 @@ msgstr "แฟ้ม %s/%s เขียนทับแฟ้มในแพก #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "ไม่สามารถอ่าน %s" @@ -1765,7 +1774,7 @@ msgstr "หมดเวลารอเชื่อมต่อ" msgid "Server closed the connection" msgstr "เซิร์ฟเวอร์ปิดการเชื่อมต่อ" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "การอ่านข้อมูลผิดพลาด" @@ -1777,7 +1786,7 @@ msgstr "คำตอบท่วมบัฟเฟอร์" msgid "Protocol corruption" msgstr "มีความเสียหายของโพรโทคอล" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "การเขียนข้อมูลผิดพลาด" @@ -1831,7 +1840,7 @@ msgstr "หมดเวลารอเชื่อมต่อซ็อกเก msgid "Unable to accept connection" msgstr "ไม่สามารถรับการเชื่อมต่อ" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "เกิดปัญหาขณะคำนวณค่า hash ของแฟ้ม" @@ -1858,39 +1867,39 @@ msgstr "สอบถาม" msgid "Unable to invoke " msgstr "ไม่สามารถเรียก " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "เชื่อมต่อไปยัง %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "ไม่สามารถสร้างซ็อกเก็ตสำหรับ %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "ไม่สามารถเริ่มการเชื่อมต่อไปยัง %s:%s (%s)" -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "ไม่สามารถเชื่อมต่อไปยัง %s:%s (%s) เนื่องจากหมดเวลาคอย" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "ไม่สามารถเชื่อมต่อไปยัง %s:%s (%s)" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "เชื่อมต่อไปยัง %s" @@ -1962,76 +1971,76 @@ msgstr "ไม่สามารถเปิดไปป์สำหรับ %s msgid "Read error from %s process" msgstr "เกิดข้อผิดพลาดขณะอ่านจากโพรเซส %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "รอหัวข้อมูล" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "ได้รับบรรทัดข้อมูลส่วนหัวยาวเกิน %u อักขระ" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "บรรทัดข้อมูลส่วนหัวผิดพลาด" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัวตอบมาไม่ถูกต้อง" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัว Content-Length มาไม่ถูกต้อง" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัว Content-Range มาไม่ถูกต้อง" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "การสนับสนุน Content-Range ที่เซิร์ฟเวอร์ HTTP ผิดพลาด" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "พบรูปแบบวันที่ที่ไม่รู้จัก" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "select ไม่สำเร็จ" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "หมดเวลารอเชื่อมต่อ" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้มผลลัพธ์" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์ ปลายทางอีกด้านหนึ่งปิดการเชื่อมต่อ" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "ข้อมูลส่วนหัวผิดพลาด" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "เชื่อมต่อไม่สำเร็จ" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "ข้อผิดพลาดภายใน" @@ -2166,6 +2175,7 @@ msgid "Unable to stat the mount point %s" msgstr "ไม่สามารถ stat จุดเมานท์ %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "ไม่สามารถเปลี่ยนไดเรกทอรีไปยัง %s" @@ -2174,70 +2184,70 @@ msgstr "ไม่สามารถเปลี่ยนไดเรกทอร msgid "Failed to stat the cdrom" msgstr "ไม่สามารถ stat ซีดีรอม" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่อ่านได้อย่างเดียว" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "ไม่สามารถเปิดแฟ้มล็อค %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่เมานท์ผ่าน nfs" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "ไม่สามารถล็อค %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "โพรเซสย่อย %s เกิดข้อผิดพลาดของการใช้ย่านหน่วยความจำ (segmentation fault)" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "โพรเซสย่อย %s คืนค่าข้อผิดพลาด (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "โพรเซสย่อย %s จบการทำงานกระทันหัน" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "ไม่สามารถเปิดแฟ้ม %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "read: ยังเหลือ %lu ที่ยังไม่ได้อ่าน แต่ข้อมูลหมดแล้ว" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "write: ยังเหลือ %lu ที่ยังไม่ได้เขียน แต่ไม่สามารถเขียนได้" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "เกิดปัญหาขณะปิดแฟ้ม" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "เกิดปัญหาขณะลบแฟ้ม" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "เกิดปัญหาขณะ sync แฟ้ม" @@ -2400,7 +2410,7 @@ msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด msgid "Malformed line %u in source list %s (vendor id)" msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (id ผู้ผลิต)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2435,6 +2445,12 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "ไม่สามารถแก้ปัญหาได้ คุณได้คงรุ่นแพกเกจที่เสียอยู่ไว้" +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "ดาวน์โหลดแฟ้มดัชนีบางแฟ้มไม่สำเร็จ จะข้ามรายการดังกล่าวไป หรือใช้ข้อมูลเก่าแทน" + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2467,17 +2483,17 @@ msgstr "ไม่พบไดรเวอร์สำหรับวิธีก msgid "Method %s did not start correctly" msgstr "ไม่สามารถเรียกทำงานวิธีการ %s" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "กรุณาใส่แผ่นชื่อ: '%s' ลงในไดรว์ '%s' แล้วกด enter" -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "ไม่รองรับระบบแพกเกจ '%s'" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "ไม่สามารถระบุชนิดของระบบแพกเกจที่เหมาะสมได้" @@ -2490,11 +2506,11 @@ msgstr "ไม่สามารถ stat %s" msgid "You must put some 'source' URIs in your sources.list" msgstr "คุณต้องเพิ่ม URI ชนิด 'source' ใน sources.list ของคุณด้วย" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "ไม่สามารถแจงหรือเปิดรายชื่อแพกเกจหรือสถานะแพกเกจได้" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "คุณอาจเรียก `apt-get update' เพื่อแก้ปัญหาเหล่านี้ได้" @@ -2604,44 +2620,44 @@ msgstr "กำลังเก็บข้อมูลแฟ้มที่ตร msgid "IO Error saving source cache" msgstr "เกิดข้อผิดพลาด IO ขณะบันทึกแคชของซอร์ส" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "เปลี่ยนชื่อไม่สำเร็จ: %s (%s -> %s)" -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "MD5Sum ไม่ตรงกัน" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 msgid "Hash Sum mismatch" msgstr "Hash Sum ไม่ตรงกัน" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "ไม่มีกุญแจสาธารณะสำหรับกุญแจหมายเลขต่อไปนี้:\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "ไม่พบแฟ้มสำหรับแพกเกจ %s คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง (ไม่มี arch)" -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "ไม่พบแฟ้มสำหรับแพกเกจ %s คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง" -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "แฟ้มดัชนีแพกเกจเสียหาย ไม่มีข้อมูล Filename: สำหรับแพกเกจ %s" -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "ขนาดไม่ตรงกัน" @@ -2753,71 +2769,78 @@ msgstr "เขียนแล้ว %i ระเบียน โดยมีแ msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "เขียนแล้ว %i ระเบียน โดยมีแฟ้มขาดหาย %i แฟ้ม และแฟ้มผิดขนาด %i แฟ้ม\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, c-format msgid "Directory '%s' missing" msgstr "ไม่มีไดเรกทอรี '%s'" -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "กำลังเตรียม %s" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "กำลังแตกแพกเกจ %s" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "กำลังเตรียมตั้งค่า %s" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "กำลังตั้งค่า %s" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "เกิดข้อผิดพลาดขณะประมวลผลไดเรกทอรี %s" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "ติดตั้ง %s แล้ว" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "กำลังเตรียมถอดถอน %s" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "กำลังถอดถอน %s" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "ถอดถอน %s แล้ว" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "กำลังเตรียมถอดถอน %s อย่างสมบูรณ์" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "ไม่สามารถแพตช์แฟ้ม" diff --git a/po/tl.po b/po/tl.po index e575bc35f..f3ef9ac23 100644 --- a/po/tl.po +++ b/po/tl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" @@ -162,7 +162,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para sa %s %s kinompile noong %s %s\n" @@ -665,7 +665,7 @@ msgstr "Bigo ang pagpangalan muli ng %s tungong %s" msgid "Y" msgstr "O" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "Error sa pag-compile ng regex - %s" @@ -830,12 +830,12 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "Hindi maaldaba ang directory ng download" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)." @@ -866,7 +866,7 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "Hindi matantsa ang libreng puwang sa %s" @@ -903,7 +903,7 @@ msgstr "Abort." msgid "Do you want to continue [Y/n]? " msgstr "Nais niyo bang magpatuloy [O/h]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Bigo sa pagkuha ng %s %s\n" @@ -912,7 +912,7 @@ msgstr "Bigo sa pagkuha ng %s %s\n" msgid "Some files failed to download" msgstr "May mga talaksang hindi nakuha" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang" @@ -1018,75 +1018,67 @@ msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento" msgid "Unable to lock the list directory" msgstr "Hindi maaldaba ang directory ng talaan" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"May mga talaksang index na hindi nakuha, sila'y di pinansin, o ginamit ang " -"mga luma na lamang." - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "" "Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Error na internal, may nasira ang problem resolver" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Hindi mahanap ang paketeng %s" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "Hindi mahanap ang paketeng %s" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Paunawa, pinili ang %s para sa regex '%s'\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ngunit ang %s ay iluluklok" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Maaaring patakbuhin niyo ang `apt-get -f install' upang ayusin ang mga ito:" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1094,7 +1086,7 @@ msgstr "" "May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang " "mga pakete (o magtakda ng solusyon)." -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1105,7 +1097,7 @@ msgstr "" "o kung kayo'y gumagamit ng pamudmod na unstable ay may ilang mga paketeng\n" "kailangan na hindi pa nalikha o linipat mula sa Incoming." -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1115,115 +1107,130 @@ msgstr "" "hindi talaga mailuklok at kailangang magpadala ng bug report tungkol sa\n" "pakete na ito." -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "Sirang mga pakete" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "Mga paketeng mungkahi:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "Mga paketeng rekomendado:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "Sinusuri ang pag-upgrade... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Bigo" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "Tapos" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "Error na internal, may nasira ang problem resolver" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "Hindi mahanap ang paketeng source para sa %s" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Linaktawan ang nakuha na na talaksan '%s'\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "Kulang kayo ng libreng puwang sa %s" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibong source.\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "Kunin ang Source %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "Bigo sa pagkuha ng ilang mga arkibo." -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Bigo ang utos ng pagbuklat '%s'.\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "Utos na build '%s' ay bigo.\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "Bigo ang prosesong anak" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "Kailangang magtakda ng kahit isang pakete na susuriin ang builddeps" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Hindi makuha ang impormasyong build-dependency para sa %s" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "Walang build depends ang %s.\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1232,7 +1239,7 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1241,32 +1248,32 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil walang magamit na bersyon " "ng paketeng %s na tumutugon sa kinakailangang bersyon" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %" "s ay bagong-bago pa lamang." -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Hindi mabuo ang build-dependencies para sa %s." -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "Bigo sa pagproseso ng build dependencies" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "Suportadong mga Module:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1579,7 +1586,7 @@ msgstr "Ang talaksang %s/%s ay pumapatong sa isang talaksan sa paketeng %s" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "Hindi mabasa ang %s" @@ -1812,7 +1819,7 @@ msgstr "Lumipas ang koneksyon" msgid "Server closed the connection" msgstr "Sinarhan ng server ang koneksyon" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "Error sa pagbasa" @@ -1824,7 +1831,7 @@ msgstr "May sagot na bumubo sa buffer." msgid "Protocol corruption" msgstr "Sira ang protocol" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "Error sa pagsulat" @@ -1878,7 +1885,7 @@ msgstr "Nag-timeout ang socket ng datos" msgid "Unable to accept connection" msgstr "Hindi makatanggap ng koneksyon" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema sa pag-hash ng talaksan" @@ -1905,39 +1912,39 @@ msgstr "Tanong" msgid "Unable to invoke " msgstr "Hindi ma-invoke " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Kumokonekta sa %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Hindi makalikha ng socket para sa %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Hindi maumpisahan ang koneksyon sa %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Hindi maka-konekta sa %s:%s (%s), nag-timeout ang koneksyon" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Hindi maka-konekta sa %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Kumokonekta sa %s" @@ -2016,76 +2023,76 @@ msgstr "Hindi makapag-bukas ng pipe para sa %s" msgid "Read error from %s process" msgstr "Error sa pagbasa mula sa prosesong %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Naghihintay ng panimula" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Nakatanggap ng isang linyang panimula mula %u na mga karakter" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Maling linyang panimula" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Nagpadala ang HTTP server ng di tanggap na reply header" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Length header" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Range header" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Sira ang range support ng HTTP server na ito" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Di kilalang anyo ng petsa" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Bigo ang pagpili" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Nag-timeout ang koneksyon" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Error sa pagsulat ng talaksang output" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Error sa pagsulat sa talaksan" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Error sa pagsusulat sa talaksan" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Error sa pagbasa mula sa server" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Maling datos sa panimula" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "Bigo ang koneksyon" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "Internal na error" @@ -2223,6 +2230,7 @@ msgid "Unable to stat the mount point %s" msgstr "Di mai-stat ang mount point %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "Di makalipat sa %s" @@ -2231,73 +2239,73 @@ msgstr "Di makalipat sa %s" msgid "Failed to stat the cdrom" msgstr "Bigo sa pag-stat ng cdrom" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Hindi ginagamit ang pagaldaba para sa basa-lamang na talaksang aldaba %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "Hindi mabuksan ang talaksang aldaba %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Hindi gumagamit ng pag-aldaba para sa talaksang aldaba %s na naka-mount sa " "nfs" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "hindi makuha ang aldaba %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Naghintay, para sa %s ngunit wala nito doon" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Nakatanggap ang sub-process %s ng segmentation fault." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Naghudyat ang sub-process %s ng error code (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Ang sub-process %s ay lumabas ng di inaasahan" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "Hindi mabuksan ang talaksang %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "pagbasa, mayroong %lu na babasahin ngunit walang natira" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "pagsulat, mayroon pang %lu na isusulat ngunit hindi makasulat" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "Problema sa pagsara ng talaksan" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "Problema sa pag-unlink ng talaksan" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "Problema sa pag-sync ng talaksan" @@ -2461,7 +2469,7 @@ msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (vendor id)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2499,6 +2507,14 @@ msgid "Unable to correct problems, you have held broken packages." msgstr "" "Hindi maayos ang mga problema, mayroon kayong sirang mga pakete na naka-hold." +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"May mga talaksang index na hindi nakuha, sila'y di pinansin, o ginamit ang " +"mga luma na lamang." + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2531,18 +2547,18 @@ msgstr "Ang driver ng paraang %s ay hindi mahanap." msgid "Method %s did not start correctly" msgstr "Hindi umandar ng tama ang paraang %s" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Ikasa ang disk na may pangalang: '%s' sa drive '%s' at pindutin ang enter." -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Hindi suportado ang sistema ng paketeng '%s'" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Hindi matuklasan ang akmang uri ng sistema ng pakete " @@ -2555,12 +2571,12 @@ msgstr "Hindi ma-stat ang %s" msgid "You must put some 'source' URIs in your sources.list" msgstr "Kailangan niyong maglagay ng 'source' URIs sa inyong sources.list" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" "Hindi ma-parse o mabuksan ang talaan ng mga pakete o ng talaksang estado." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Maaaring patakbuhin niyo ang apt-get update upang ayusin ang mga problemang " @@ -2675,25 +2691,25 @@ msgstr "Kinukuha ang Talaksang Provides" msgid "IO Error saving source cache" msgstr "IO Error sa pag-imbak ng source cache" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "Di tugmang MD5Sum" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 #, fuzzy msgid "Hash Sum mismatch" msgstr "Di tugmang MD5Sum" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "Walang public key na magamit para sa sumusunod na key ID:\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2702,7 +2718,7 @@ msgstr "" "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)" -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2711,7 +2727,7 @@ msgstr "" "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito." -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2719,7 +2735,7 @@ msgstr "" "Sira ang talaksang index ng mga pakete. Walang Filename: field para sa " "paketeng %s." -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "Di tugmang laki" @@ -2834,71 +2850,78 @@ msgstr "" "Nagsulat ng %i na record na may %i na talaksang kulang at %i na talaksang " "mismatch\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Nawawala ang directory ng talaan %spartial." -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "Hinahanda ang %s" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "Binubuklat ang %s" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "Hinahanda ang %s upang isaayos" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "Isasaayos ang %s" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "Error sa pagproseso ng directory %s" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "Iniluklok ang %s" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "Naghahanda para sa pagtanggal ng %s" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "Tinatanggal ang %s" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "Tinanggal ang %s" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "Naghahanda upang tanggalin ng lubusan ang %s" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "Natanggal ng lubusan ang %s" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "Hindi mai-patch ang talaksan" diff --git a/po/uk.po b/po/uk.po index fffd0b566..8592193be 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-all\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-26 07:15+0200\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2006-07-29 15:57+0300\n" "Last-Translator: Artem Bondarenko \n" "Language-Team: Українська \n" @@ -15,1228 +15,1452 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.1\n" -#: methods/cdrom.cc:114 +#: cmdline/apt-cache.cc:143 #, c-format -msgid "Unable to read the cdrom database %s" -msgstr "Неможливо прочитати базу %s з cdrom'у" - -#: methods/cdrom.cc:123 -msgid "" -"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " -"cannot be used to add new CD-ROMs" -msgstr "" -"Будь-ласка використовуйте apt-cdrom, щоб APT розпізнав цей CD-ROM, apt-get " -"update не може бути використаним для додання нових CD" - -#: methods/cdrom.cc:131 -msgid "Wrong CD-ROM" -msgstr "Невірний CD-ROM" +msgid "Package %s version %s has an unmet dep:\n" +msgstr "Пакунок %s версії %s має незадоволену залежність:\n" -#: methods/cdrom.cc:166 +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format -msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "Неможливо демонтувати CDROM в %s, можливо він все ще використовується." - -#: methods/cdrom.cc:171 -msgid "Disk not found." -msgstr "Диск не знайдено." - -#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 -msgid "File not found" -msgstr "Файл не знайдено" - -#: methods/copy.cc:43 methods/gpgv.cc:281 methods/gzip.cc:141 -#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 -msgid "Failed to stat" -msgstr "Не вдалося одержати атрибути" - -#: methods/copy.cc:80 methods/gpgv.cc:278 methods/gzip.cc:147 -#: methods/rred.cc:240 -msgid "Failed to set modification time" -msgstr "Не вдалося встановити час модифікації" - -#: methods/file.cc:44 -msgid "Invalid URI, local URIS must not start with //" -msgstr "Невірне посилання, локальні посилання повинні починатися з //" +msgid "Unable to locate package %s" +msgstr "Не можу знайти пакунок %s" -#. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:162 -msgid "Logging in" -msgstr "Логінюсь в" +#: cmdline/apt-cache.cc:247 +msgid "Total package names : " +msgstr "Всього імен пакунків : " -#: methods/ftp.cc:168 -msgid "Unable to determine the peer name" -msgstr "Неможливо визначити назву вузла" +#: cmdline/apt-cache.cc:287 +msgid " Normal packages: " +msgstr " Нормальних пакунків: " -#: methods/ftp.cc:173 -msgid "Unable to determine the local name" -msgstr "Неможливо визначити локальну назву" +#: cmdline/apt-cache.cc:288 +msgid " Pure virtual packages: " +msgstr " Чисто віртуальних пакунків: " -#: methods/ftp.cc:204 methods/ftp.cc:232 -#, c-format -msgid "The server refused the connection and said: %s" -msgstr "Сервер розірвав з'єднання і мовив: %s" +#: cmdline/apt-cache.cc:289 +msgid " Single virtual packages: " +msgstr " Окремих віртуальних пакунків: " -#: methods/ftp.cc:210 -#, c-format -msgid "USER failed, server said: %s" -msgstr "USER невдало, сервер мовив: %s" +#: cmdline/apt-cache.cc:290 +msgid " Mixed virtual packages: " +msgstr " Змішаних віртуальних пакунків: " -#: methods/ftp.cc:217 -#, c-format -msgid "PASS failed, server said: %s" -msgstr "PASS невдало, сервер мовив: %s" +#: cmdline/apt-cache.cc:291 +msgid " Missing: " +msgstr " Пропущено: " -#: methods/ftp.cc:237 -msgid "" -"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " -"is empty." -msgstr "" -"Вказано проксі-сервер, але відсутній скрипт логіну, Acquire::ftp::ProxyLogin " -"пустий." +#: cmdline/apt-cache.cc:293 +msgid "Total distinct versions: " +msgstr "Всього унікальних версій: " -#: methods/ftp.cc:265 -#, c-format -msgid "Login script command '%s' failed, server said: %s" -msgstr "Команда '%s'скрипту логіна не вдалася, сервер мовив: %s" +#: cmdline/apt-cache.cc:295 +#, fuzzy +msgid "Total Distinct Descriptions: " +msgstr "Всього унікальних версій: " -#: methods/ftp.cc:291 -#, c-format -msgid "TYPE failed, server said: %s" -msgstr "TYPE невдало, сервер мовив: %s" +#: cmdline/apt-cache.cc:297 +msgid "Total dependencies: " +msgstr "Всього залежностей: " -#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 -msgid "Connection timeout" -msgstr "Час з'єднання вичерпався" +#: cmdline/apt-cache.cc:300 +msgid "Total ver/file relations: " +msgstr "Всього відносин Версія/Файл: " -#: methods/ftp.cc:335 -msgid "Server closed the connection" -msgstr "Сервер закрив з'єднання" +#: cmdline/apt-cache.cc:302 +#, fuzzy +msgid "Total Desc/File relations: " +msgstr "Всього відносин Версія/Файл: " -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 -msgid "Read error" -msgstr "Помилка читання" +#: cmdline/apt-cache.cc:304 +msgid "Total Provides mappings: " +msgstr "Всього відносин Provides: " -#: methods/ftp.cc:345 methods/rsh.cc:197 -msgid "A response overflowed the buffer." -msgstr "Відповідь переповнила буфер." +#: cmdline/apt-cache.cc:316 +msgid "Total globbed strings: " +msgstr "Всього розгорнутих рядків: " -#: methods/ftp.cc:362 methods/ftp.cc:374 -msgid "Protocol corruption" -msgstr "Спотворений протокол" +#: cmdline/apt-cache.cc:330 +msgid "Total dependency version space: " +msgstr "Всього інформації про залежності: " -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 -msgid "Write error" -msgstr "Помилка запису" +#: cmdline/apt-cache.cc:335 +msgid "Total slack space: " +msgstr "Порожнього місця в кеші: " -#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 -msgid "Could not create a socket" -msgstr "Неможливо створити сокет (socket)" +#: cmdline/apt-cache.cc:343 +msgid "Total space accounted for: " +msgstr "Загальний простір полічений для: " -#: methods/ftp.cc:698 -msgid "Could not connect data socket, connection timed out" -msgstr "Неможливо під'єднати сокет (socket) з даними, час з'єднання вичерпався" +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 +#, c-format +msgid "Package file %s is out of sync." +msgstr "Перелік пакунків %s розсинхронізований." -#: methods/ftp.cc:702 methods/connect.cc:101 -msgid "Failed" -msgstr "Невдача" +#: cmdline/apt-cache.cc:1293 +msgid "You must give exactly one pattern" +msgstr "Ви повинні задати рівно один шаблон" -#: methods/ftp.cc:704 -msgid "Could not connect passive socket." -msgstr "Неможливо під'єднати пасивний сокет (passive socket)." +#: cmdline/apt-cache.cc:1447 +msgid "No packages found" +msgstr "Не знайдено жодного пакунка" -#: methods/ftp.cc:722 -#, fuzzy -msgid "getaddrinfo was unable to get a listening socket" -msgstr "Виклик getaddrinfo не зміг отримати сокет" +#: cmdline/apt-cache.cc:1524 +msgid "Package files:" +msgstr "Переліки пакунків:" -#: methods/ftp.cc:736 -msgid "Could not bind a socket" -msgstr "Неможливо приєднатися до сокета" +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 +msgid "Cache is out of sync, can't x-ref a package file" +msgstr "Кеш не синхронізований, неможливо знайти посилання на перелік пакунків" -#: methods/ftp.cc:740 -#, fuzzy -msgid "Could not listen on the socket" -msgstr "Не можливо утримувати з'єднання на сокеті" +#: cmdline/apt-cache.cc:1532 +#, c-format +msgid "%4i %s\n" +msgstr "%4i %s\n" -#: methods/ftp.cc:747 -msgid "Could not determine the socket's name" -msgstr "Не вдалося визначити назву сокета" +#. Show any packages have explicit pins +#: cmdline/apt-cache.cc:1544 +msgid "Pinned packages:" +msgstr "Зафіксовані пакунки:" -#: methods/ftp.cc:779 -msgid "Unable to send PORT command" -msgstr "Неможливо відіслати команду PORT" +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 +msgid "(not found)" +msgstr "(не знайдено)" -#: methods/ftp.cc:789 -#, c-format -msgid "Unknown address family %u (AF_*)" -msgstr "Невідоме адресове сімейство %u (AF_*)" +#. Installed version +#: cmdline/apt-cache.cc:1577 +msgid " Installed: " +msgstr " Встановлено: " -#: methods/ftp.cc:798 -#, c-format -msgid "EPRT failed, server said: %s" -msgstr "EPRT невдало, сервер мовив: %s" +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 +msgid "(none)" +msgstr "(відсутній)" -#: methods/ftp.cc:818 -msgid "Data socket connect timed out" -msgstr "Час з'єднання з сокетом даних вичерпався" +#. Candidate Version +#: cmdline/apt-cache.cc:1584 +msgid " Candidate: " +msgstr " Кандидат: " -#: methods/ftp.cc:825 -msgid "Unable to accept connection" -msgstr "Неможливо прийняти з'єднання" +#: cmdline/apt-cache.cc:1594 +msgid " Package pin: " +msgstr " Фіксатор(pin) пакунка: " -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 -msgid "Problem hashing file" -msgstr "Проблема хешування файла" +#. Show the priority tables +#: cmdline/apt-cache.cc:1603 +msgid " Version table:" +msgstr " Таблиця версій:" -#: methods/ftp.cc:877 +#: cmdline/apt-cache.cc:1618 #, c-format -msgid "Unable to fetch file, server said '%s'" -msgstr "Неможливо завантажити файл, сервер мовив: '%s'" - -#: methods/ftp.cc:892 methods/rsh.cc:322 -msgid "Data socket timed out" -msgstr "Час з'єднання з сокетом (socket) з даними вичерпався" +msgid " %4i %s\n" +msgstr " %4i %s\n" -#: methods/ftp.cc:922 -#, c-format -msgid "Data transfer failed, server said '%s'" -msgstr "Передача даних обірвалася, сервер мовив '%s'" +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 +#, fuzzy, c-format +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s для %s %s скомпільовано %s %s\n" -#. Get the files information -#: methods/ftp.cc:997 -msgid "Query" -msgstr "Черга" - -#: methods/ftp.cc:1109 -msgid "Unable to invoke " -msgstr "Неможливо викликати " - -#: methods/connect.cc:64 -#, c-format -msgid "Connecting to %s (%s)" -msgstr "З'єднання з %s (%s)" - -#: methods/connect.cc:71 -#, c-format -msgid "[IP: %s %s]" -msgstr "[IP: %s %s]" - -#: methods/connect.cc:80 -#, c-format -msgid "Could not create a socket for %s (f=%u t=%u p=%u)" -msgstr "Неможливо створити сокет для %s (f=%u t=%u p=%u)" - -#: methods/connect.cc:86 -#, c-format -msgid "Cannot initiate the connection to %s:%s (%s)." -msgstr "Неможливо ініціалізувати з'єднання з %s:%s (%s)." - -#: methods/connect.cc:93 -#, c-format -msgid "Could not connect to %s:%s (%s), connection timed out" -msgstr "Неможливо з'єднатися з %s:%s (%s), час з'єднання вичерпався" - -#: methods/connect.cc:108 -#, c-format -msgid "Could not connect to %s:%s (%s)." -msgstr "Не можливо під'єднатися до %s:%s (%s)." - -#. We say this mainly because the pause here is for the -#. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 -#, c-format -msgid "Connecting to %s" -msgstr "З'єднання з %s" - -#: methods/connect.cc:167 -#, c-format -msgid "Could not resolve '%s'" -msgstr "Не можу знайти IP адрес для %s" - -#: methods/connect.cc:173 -#, c-format -msgid "Temporary failure resolving '%s'" -msgstr "Тимчасова помилка при отриманні IP адреси '%s'" +#: cmdline/apt-cache.cc:1721 +msgid "" +"Usage: apt-cache [options] command\n" +" apt-cache [options] add file1 [file2 ...]\n" +" apt-cache [options] showpkg pkg1 [pkg2 ...]\n" +" apt-cache [options] showsrc pkg1 [pkg2 ...]\n" +"\n" +"apt-cache is a low-level tool used to manipulate APT's binary\n" +"cache files, and query information from them\n" +"\n" +"Commands:\n" +" add - Add a package file to the source cache\n" +" gencaches - Build both the package and source cache\n" +" showpkg - Show some general information for a single package\n" +" showsrc - Show source records\n" +" stats - Show some basic statistics\n" +" dump - Show the entire file in a terse form\n" +" dumpavail - Print an available file to stdout\n" +" unmet - Show unmet dependencies\n" +" search - Search the package list for a regex pattern\n" +" show - Show a readable record for the package\n" +" depends - Show raw dependency information for a package\n" +" rdepends - Show reverse dependency information for a package\n" +" pkgnames - List the names of all packages\n" +" dotty - Generate package graphs for GraphVis\n" +" xvcg - Generate package graphs for xvcg\n" +" policy - Show policy settings\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -p=? The package cache.\n" +" -s=? The source cache.\n" +" -q Disable progress indicator.\n" +" -i Show only important deps for the unmet command.\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" +msgstr "" +"Використання: apt-cache [options] command\n" +" або: apt-cache [options] add file1 [file1 ...]\n" +" або: apt-cache [options] showpkg pkg1 [pkg2 ...]\n" +" або: apt-cache [options] showsrc pkg1 [pkg2 ...]\n" +"\n" +"apt-cache - низькорівневий інструмент, що використається для керування\n" +"двійковими кеш-файлами APT'а, а також для добування інформації з них\n" +"Команди:\n" +" add - додати файл пакунка в кеш джерел\n" +" gencaches - побудувати обидва кеша пакунків - бінарних і з вихідними " +"текстами\n" +" showpkg - загальна інформація про конкретний пакунок\n" +" stats - основна статистика\n" +" dump - показати весь файл у стислій формі\n" +" dumpavail - видати на stdout список доступних пакунків\n" +" unmet - показати незадоволені залежності\n" +" search - знайти пакунки, назва яких задовольняє регулярний вираз\n" +" show - показати інформацію про пакунок в зрозумілій формі\n" +" depends - показати інформацію про залежності пакунка построково\n" +" rdepends - показати інформацію про зворотні залежності пакунка\n" +" pkgnames - показати імена всіх пакунків\n" +" dotty - генерувати граф залежностей пакунків у форматі GraphVis\n" +" xvcg - генерувати граф залежностей пакунків у форматі xvcg\n" +" policy - показати поточну політику вибору пакунків\n" +"\n" +"Опції:\n" +" -h Цей текст.\n" +" -p=? Кеш пакунків.\n" +" -s=? Кеш джерел.\n" +" -q Не показувати індикатор прогресу.\n" +" -i Показувати тільки важливі залежності для команди unmet.\n" +" -c=? Читати зазначений файл конфігурації.\n" +" -o=? Встановити довільну опцію конфігурації, наприклад, -o dir::cache=/" +"tmp\n" +"Подробиці в сторінках керівництва apt-cache(8) і apt.conf(5).\n" -#: methods/connect.cc:176 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" -msgstr "Сталося щось дивне при спробі отримати IP адрес для '%s:%s' (%i)" +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "Задайте назву для цього диска, наприклад 'Debian 2.1r1 Disk 1'" -#: methods/connect.cc:223 -#, c-format -msgid "Unable to connect to %s %s:" -msgstr "Не можливо під'єднатися до %s %s:" +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "Вставте диск у пристрій і натисніть Ввід" -#: methods/gpgv.cc:65 -#, fuzzy, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Неможливо отримати доступ до keyring: '%s'" +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "Повторіть цей процес для інших наявних CD." -#: methods/gpgv.cc:100 -msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "" -"E: Перелік аргументів з Acquire::gpgv::Options занадто довгий. Відміна." +#: cmdline/apt-config.cc:41 +msgid "Arguments not in pairs" +msgstr "Непарні аргументи" -#: methods/gpgv.cc:204 +#: cmdline/apt-config.cc:76 msgid "" -"Internal error: Good signature, but could not determine key fingerprint?!" +"Usage: apt-config [options] command\n" +"\n" +"apt-config is a simple tool to read the APT config file\n" +"\n" +"Commands:\n" +" shell - Shell mode\n" +" dump - Show the configuration\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Внутрішня помилка: Вірний підпис (signature), але не можливо визначити його " -"відбиток?!" - -#: methods/gpgv.cc:209 -msgid "At least one invalid signature was encountered." -msgstr "Знайдено як мінімум один невірний підпис." +"Використання: apt-config [options] command\n" +"\n" +"apt-config - простий інструмент для читання конфігураційного файлу APT\n" +"\n" +"Команди:\n" +" shell - режим shell\n" +" dump - показати конфігурацію\n" +"\n" +"Опції:\n" +" -h Цей текст.\n" +" -с=? Читати зазначений конфігураційний файл.\n" +" -o=? Встановити довільну опцію, наприклад, -o dir::cache=/tmp\n" -#: methods/gpgv.cc:213 +#: cmdline/apt-extracttemplates.cc:98 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr "Неможливо виконати '%s' для перевірки підпису, gnupg встановлено?" - -#: methods/gpgv.cc:218 -msgid "Unknown error executing gpgv" -msgstr "Невідома помилка виконання gpgv" - -#: methods/gpgv.cc:249 -msgid "The following signatures were invalid:\n" -msgstr "Слідуючі підписи були невірними:\n" +msgid "%s not a valid DEB package." +msgstr "%s не є правильним DEB-пакунком." -#: methods/gpgv.cc:256 +#: cmdline/apt-extracttemplates.cc:232 msgid "" -"The following signatures couldn't be verified because the public key is not " -"available:\n" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Слідуючі підписи не можуть бути перевірені, тому що, публічний ключ " -"відсутній:\n" - -#: methods/gpgv.cc:272 -#, c-format -msgid "Failed to stat %s" -msgstr "Не вдалося одержати атрибути %s" +"Використання: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates витягує з пакунків Debian конфігураційні скрипти\n" +"і файли-шаблони\n" +"\n" +"Опції:\n" +" -h Цей текст\n" +" -t Встановити теку для тимчасових файлів\n" +" -c=? Читати зазначений конфігураційний файл\n" +" -o=? Вказати довільну опцію, наприклад, -o dir::cache=/tmp\n" -#: methods/gzip.cc:64 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format -msgid "Couldn't open pipe for %s" -msgstr "Неможливо відкрити канал (pipe) для %s" +msgid "Unable to write to %s" +msgstr "Неможливо записати в %s" -#: methods/gzip.cc:109 -#, c-format -msgid "Read error from %s process" -msgstr "Помилка читання з процесу %s" +#: cmdline/apt-extracttemplates.cc:310 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Неможливо визначити версію debconf. Він встановлений?" -#: methods/http.cc:377 -msgid "Waiting for headers" -msgstr "Очікування на заголовки" +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 +msgid "Package extension list is too long" +msgstr "Список розширень, припустимих для пакунків, занадто довгий" -#: methods/http.cc:523 +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format -msgid "Got a single header line over %u chars" -msgstr "Отримано одну заголовкову лінію понад %u символів" +msgid "Error processing directory %s" +msgstr "Помилка обробки течи %s" -#: methods/http.cc:531 -msgid "Bad header line" -msgstr "Невірна лінія заголовку" +#: ftparchive/apt-ftparchive.cc:251 +msgid "Source extension list is too long" +msgstr "" +"Список розширень, припустимих для пакунків з вихідними текстами, занадто " +"довгий" -#: methods/http.cc:550 methods/http.cc:557 -msgid "The HTTP server sent an invalid reply header" -msgstr "HTTP сервер відіслав невірний заголовок 'reply'" +#: ftparchive/apt-ftparchive.cc:368 +msgid "Error writing header to contents file" +msgstr "Помилка запису заголовка в повний перелік вмісту пакунків (Contents)" -#: methods/http.cc:586 -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "HTTP сервер відіслав невірний заголовок 'Content-Length'" +#: ftparchive/apt-ftparchive.cc:398 +#, c-format +msgid "Error processing contents %s" +msgstr "помилка обробки повного переліку вмісту пакунків (Contents) %s" -#: methods/http.cc:601 -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "HTTP сервер відіслав невірний заголовок 'Content-Length'" +#: ftparchive/apt-ftparchive.cc:553 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"Використання: apt-ftparchive [параметри] команда\n" +"Команди: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive генерує індексні файли архівів Debian. Він підтримує\n" +"безліч стилів генерації: від повністю автоматичного до функціональної " +"заміни\n" +"програм dpkg-scanpackages і dpkg-scansources\n" +"\n" +"apt-ftparchive генерує файли Package (переліки пакунків) для дерева\n" +"тек, що містять файли .deb. Файл Package містить у собі керуючі\n" +"поля кожного пакунка, а також хеш MD5 і розмір файлу. Значення керуючих\n" +"полів \"пріоритет\" (Priority) і \"секція\" (Section) можуть бути змінені з\n" +"допомогою файлу override.\n" +"\n" +"Крім того, apt-ftparchive може генерувати файли Sources з дерева\n" +"тек, що містять файли .dsc. Для вказівки файлу override у цьому \n" +"режимі можна використати параметр --source-override.\n" +"\n" +"Команди 'packages' і 'sources' треба виконувати, перебуваючи в кореневій " +"теці\n" +"дерева, що ви хочете обробити. BinaryPath повинен вказувати на місце,\n" +"з якого починається рекурсивний обхід, а файл перепризначень (override)\n" +"повинен містити запис про перепризначення керуючих полів. Якщо був " +"зазначений\n" +"Pathprefix, то його значення додається до керуючих полів, що містять\n" +"імена файлів. Приклад використання для архіву Debian:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Параметри:\n" +" -h Цей текст\n" +" --md5 Керування генерацією MD5-хешів\n" +" -s=? Вказати файл перепризначень (override) для пакунків з вихідними " +"текстами\n" +" -q Не виводити повідомлення в процесі роботи\n" +" -d=? Вказати кешуючу базу даних (не обов'язково)\n" +" --no-delink Включити режим налагодження процесу видалення файлів\n" +" --contents Керування генерацією повного переліку вмісту пакунків\n" +" (файлу Contents)\n" +" -c=? Використати зазначений конфігураційний файл\n" +" -o=? Вказати довільний параметр конфігурації" -#: methods/http.cc:603 -msgid "This HTTP server has broken range support" -msgstr "Цей HTTP сервер має поламану підтримку 'range'" +#: ftparchive/apt-ftparchive.cc:759 +msgid "No selections matched" +msgstr "Збігів не виявлено" -#: methods/http.cc:627 -msgid "Unknown date format" -msgstr "Невідомий формат дати" +#: ftparchive/apt-ftparchive.cc:832 +#, c-format +msgid "Some files are missing in the package file group `%s'" +msgstr "У групі пакунків '%s' відсутні деякі файли" -#: methods/http.cc:774 -msgid "Select failed" -msgstr "Вибір не вдався" +#: ftparchive/cachedb.cc:43 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "БД була пошкоджена, файл перейменований в %s.old" -#: methods/http.cc:779 -msgid "Connection timed out" -msgstr "Час очікування з'єднання вийшов" +#: ftparchive/cachedb.cc:61 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "DB застаріла, намагаюсь оновити %s" -#: methods/http.cc:802 -msgid "Error writing to output file" -msgstr "Помилка запису в вихідний файл" +#: ftparchive/cachedb.cc:72 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" +"Формати DB не є правильним. Якщо ви оновилися зі старої версії apt, будь-" +"ласка видаліть і наново створіть базу." -#: methods/http.cc:833 -#, fuzzy -msgid "Error writing to file" -msgstr "Помилка запису в файл" +#: ftparchive/cachedb.cc:77 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "Не вдалося відкрити DB файл %s: %s" -#: methods/http.cc:861 -#, fuzzy -msgid "Error writing to the file" -msgstr "Помилка запису в файл" +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 +#, c-format +msgid "Failed to stat %s" +msgstr "Не вдалося одержати атрибути %s" -#: methods/http.cc:875 -msgid "Error reading from server. Remote end closed connection" -msgstr "Помилка читання з сервера. Віддалена сторона закрила з'єднання" +#: ftparchive/cachedb.cc:238 +msgid "Archive has no control record" +msgstr "В архіві немає поля control" -#: methods/http.cc:877 -msgid "Error reading from server" -msgstr "Помилка читання з сервера" +#: ftparchive/cachedb.cc:444 +msgid "Unable to get a cursor" +msgstr "Неможливо одержати курсор" -#: methods/http.cc:1104 -msgid "Bad header data" -msgstr "Погана заголовкова інформація" +#: ftparchive/writer.cc:76 +#, c-format +msgid "W: Unable to read directory %s\n" +msgstr "W: Не вдалося прочитати теку %s\n" -#: methods/http.cc:1121 methods/http.cc:1176 -msgid "Connection failed" -msgstr "З'єднання не вдалося" +#: ftparchive/writer.cc:81 +#, c-format +msgid "W: Unable to stat %s\n" +msgstr "W: Неможливо прочитати атрибути %s\n" -#: methods/http.cc:1228 -msgid "Internal error" -msgstr "Внутрішня помилка" +#: ftparchive/writer.cc:132 +msgid "E: " +msgstr "E: " -#: apt-pkg/contrib/mmap.cc:80 -msgid "Can't mmap an empty file" -msgstr "Неможливо відобразити в пам'яті пустий файл" +#: ftparchive/writer.cc:134 +msgid "W: " +msgstr "W: " -#: apt-pkg/contrib/mmap.cc:85 -#, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "Неможливо відобразити в пам'яті %lu байт" +#: ftparchive/writer.cc:141 +msgid "E: Errors apply to file " +msgstr "E: Помилки відносяться до файлу" -#: apt-pkg/contrib/strutl.cc:978 +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format -msgid "Selection %s not found" -msgstr "Вибір %s не знайдено" +msgid "Failed to resolve %s" +msgstr "Не вдалося піти по посиланню %s" -#: apt-pkg/contrib/configuration.cc:434 -#, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "Нерозпізнаваний тип абревіатури: '%c'" +#: ftparchive/writer.cc:170 +msgid "Tree walking failed" +msgstr "Не вдалося зробити обхід дерева" -#: apt-pkg/contrib/configuration.cc:492 +#: ftparchive/writer.cc:195 #, c-format -msgid "Opening configuration file %s" -msgstr "Відкривається конфігураційний файл %s" - -#: apt-pkg/contrib/configuration.cc:510 -#, fuzzy, c-format -msgid "Line %d too long (max %u)" -msgstr "Лінія %d занадто довга (максимум %d)" +msgid "Failed to open %s" +msgstr "Не вдалося відкрити %s" -#: apt-pkg/contrib/configuration.cc:606 +#: ftparchive/writer.cc:254 #, c-format -msgid "Syntax error %s:%u: Block starts with no name." -msgstr "Синтаксова помилка %s:%u: Блок починається без назви." +msgid " DeLink %s [%s]\n" +msgstr "DeLink %s [%s]\n" -#: apt-pkg/contrib/configuration.cc:625 +#: ftparchive/writer.cc:262 #, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "Синтаксова помилка %s:%u: спотворений тег" +msgid "Failed to readlink %s" +msgstr "Не вдалося прочитати посилання %s" -#: apt-pkg/contrib/configuration.cc:642 +#: ftparchive/writer.cc:266 #, c-format -msgid "Syntax error %s:%u: Extra junk after value" -msgstr "Синтаксова помилка %s:%u: зайві символи після величини" - -#: apt-pkg/contrib/configuration.cc:682 -#, fuzzy, c-format -msgid "Syntax error %s:%u: Directives can only be done at the top level" -msgstr "" -"Синтаксова помилка %s:%u: Директиви можуть бути виконані тільки на " -"найвищому рівні" +msgid "Failed to unlink %s" +msgstr "Не вдалося видалити %s" -#: apt-pkg/contrib/configuration.cc:689 +#: ftparchive/writer.cc:273 #, c-format -msgid "Syntax error %s:%u: Too many nested includes" -msgstr "Синтаксова помилка %s:%u: Забагато вмонтованих включень" +msgid "*** Failed to link %s to %s" +msgstr "*** Не вдалося створити посилання %s на %s" -#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 +#: ftparchive/writer.cc:283 #, c-format -msgid "Syntax error %s:%u: Included from here" -msgstr "Синтаксова помилка %s:%u: Включена звідси" +msgid " DeLink limit of %sB hit.\n" +msgstr "Перевищено ліміт в %s в DeLink.\n" + +#: ftparchive/writer.cc:387 +msgid "Archive had no package field" +msgstr "В архіві немає поля package" -#: apt-pkg/contrib/configuration.cc:702 +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format -msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Синтаксова помилка %s:%u: Директива '%s' не підтримується" +msgid " %s has no override entry\n" +msgstr " Відсутній запис про перепризначення для %s\n" -#: apt-pkg/contrib/configuration.cc:736 +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format -msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "Синтаксова помилка %s:%u: зайві символи в кінці файла" +msgid " %s maintainer is %s not %s\n" +msgstr " пакунок %s супроводжує %s, а не %s\n" -#: apt-pkg/contrib/configuration.cc:748 apt-pkg/contrib/cdromutl.cc:150 -#: apt-pkg/sourcelist.cc:320 apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: ftparchive/writer.cc:620 #, c-format -msgid "Unable to read %s" -msgstr "Неможливо прочитати %s" +msgid " %s has no source override entry\n" +msgstr "" -#: apt-pkg/contrib/progress.cc:153 +#: ftparchive/writer.cc:624 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... Помилка!" +msgid " %s has no binary override entry either\n" +msgstr "" -#: apt-pkg/contrib/progress.cc:155 +#: ftparchive/contents.cc:321 #, c-format -msgid "%c%s... Done" -msgstr "%c%s... Виконано" +msgid "Internal error, could not locate member %s" +msgstr "Внутрішня помилка, не можу знайти складову частину %s" -#: apt-pkg/contrib/cmndline.cc:77 -#, c-format -msgid "Command line option '%c' [from %s] is not known." -msgstr "Невідомий параметр '%c' [з %s] командного рядка." +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - не вдалося виділити пам'ять" -#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 -#: apt-pkg/contrib/cmndline.cc:119 +#: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format -msgid "Command line option %s is not understood" -msgstr "Незрозумілий параметр %s командного рядка" +msgid "Unable to open %s" +msgstr "Не вдалося відкрити %s" -#: apt-pkg/contrib/cmndline.cc:124 +#: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format -msgid "Command line option %s is not boolean" -msgstr "Не логічний параметр %s командного рядка" +msgid "Malformed override %s line %lu #1" +msgstr "Спотворений запис про перепризначення (override) %s на рядку %lu #1" -#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 +#: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format -msgid "Option %s requires an argument." -msgstr "Параметр %s потребує аргумента." +msgid "Malformed override %s line %lu #2" +msgstr "Спотворений запис про перепризначення (override) %s на рядку %lu #2" -#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 +#: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "" +msgid "Malformed override %s line %lu #3" +msgstr "Спотворений запис про перепризначення (override) %s на рядку %lu #3" -#: apt-pkg/contrib/cmndline.cc:234 +#: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format -msgid "Option %s requires an integer argument, not '%s'" -msgstr "Параметр %s потребує integer аргумент, але не '%s'" +msgid "Failed to read the override file %s" +msgstr "Не вдалося прочитати файл перепризначень (override)%s" -#: apt-pkg/contrib/cmndline.cc:265 +#: ftparchive/multicompress.cc:72 #, c-format -msgid "Option '%s' is too long" -msgstr "Параметр '%s' занадто довгий" +msgid "Unknown compression algorithm '%s'" +msgstr "Невідомий алгоритм стиснення '%s'" -#: apt-pkg/contrib/cmndline.cc:298 +#: ftparchive/multicompress.cc:102 #, c-format -msgid "Sense %s is not understood, try true or false." -msgstr "Незрозумілий вираз %s , спробуйте true чи false." +msgid "Compressed output %s needs a compression set" +msgstr "Для отримання стиснутого виводу %s необхідно ввімкнути пакування" -#: apt-pkg/contrib/cmndline.cc:348 -#, c-format -msgid "Invalid operation %s" -msgstr "Невірна дія %s" +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 +msgid "Failed to create IPC pipe to subprocess" +msgstr "Не вдалося створити IPC-канал для породженого процесу" -#: apt-pkg/contrib/cdromutl.cc:52 -#, c-format -msgid "Unable to stat the mount point %s" -msgstr "Неможливо прочитати атрибути точки монтування %s" +#: ftparchive/multicompress.cc:195 +msgid "Failed to create FILE*" +msgstr "Не вдалося створити FILE*" -#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 -#, c-format -msgid "Unable to change to %s" -msgstr "Неможливо зробити зміни у %s" +#: ftparchive/multicompress.cc:198 +msgid "Failed to fork" +msgstr "Не вдалося виконати породжений процес" -#: apt-pkg/contrib/cdromutl.cc:187 -msgid "Failed to stat the cdrom" -msgstr "Не вдалося прочитати атрибути cdrom" +#: ftparchive/multicompress.cc:212 +msgid "Compress child" +msgstr "Процес-нащадок, що виконує пакування" -#: apt-pkg/contrib/fileutl.cc:82 +#: ftparchive/multicompress.cc:235 #, c-format -msgid "Not using locking for read only lock file %s" -msgstr "" -"Блокування не використовується, так як файл блокування %s доступний тільки " -"для читання" +msgid "Internal error, failed to create %s" +msgstr "Внутрішня помилка, не вдалося створити %s" -#: apt-pkg/contrib/fileutl.cc:87 -#, c-format -msgid "Could not open lock file %s" -msgstr "Не можливо відкрити lock файл %s" +#: ftparchive/multicompress.cc:286 +msgid "Failed to create subprocess IPC" +msgstr "Не вдалося створити IPC з породженим процесом" -#: apt-pkg/contrib/fileutl.cc:105 -#, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "" -"Блокування не використовується, так як файл блокування %s знаходиться на " -"файловій системі nfs" +#: ftparchive/multicompress.cc:321 +msgid "Failed to exec compressor " +msgstr "Не вдалося виконати компресор " -#: apt-pkg/contrib/fileutl.cc:109 -#, fuzzy, c-format -msgid "Could not get lock %s" -msgstr "Не можливо отримати lock %s" +#: ftparchive/multicompress.cc:360 +msgid "decompressor" +msgstr "декомпресор" -#: apt-pkg/contrib/fileutl.cc:377 -#, c-format -msgid "Waited for %s but it wasn't there" -msgstr "Очікується на %s але його тут немає" +#: ftparchive/multicompress.cc:403 +msgid "IO to subprocess/file failed" +msgstr "Помилка уведення/виводу в підпроцес/файл" -#: apt-pkg/contrib/fileutl.cc:387 -#, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "Підпроцес %s отримав segmentation fault." +#: ftparchive/multicompress.cc:455 +msgid "Failed to read while computing MD5" +msgstr "Помилка читання під час обчислення MD5" -#: apt-pkg/contrib/fileutl.cc:390 +#: ftparchive/multicompress.cc:472 #, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "Підпроцес %s повернув код помилки (%u)" +msgid "Problem unlinking %s" +msgstr "Не вдалося видалити %s" -#: apt-pkg/contrib/fileutl.cc:392 +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "Підпроцес %s раптово завершився" +msgid "Failed to rename %s to %s" +msgstr "Не вдалося перейменувати %s в %s" + +#: cmdline/apt-get.cc:124 +msgid "Y" +msgstr "Т" -#: apt-pkg/contrib/fileutl.cc:436 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format -msgid "Could not open file %s" -msgstr "Не можливо відкрити файл %s" +msgid "Regex compilation error - %s" +msgstr "Помилка компіляції регулярного виразу - %s" + +#: cmdline/apt-get.cc:241 +msgid "The following packages have unmet dependencies:" +msgstr "Пакунки, що мають незадоволені залежності:" -#: apt-pkg/contrib/fileutl.cc:492 +#: cmdline/apt-get.cc:331 #, c-format -msgid "read, still have %lu to read but none left" -msgstr "" -"помилка при читанні. мали прочитати ще %lu байт, але нічого більше нема" +msgid "but %s is installed" +msgstr "але %s вже встановлений" -#: apt-pkg/contrib/fileutl.cc:522 +#: cmdline/apt-get.cc:333 #, c-format -msgid "write, still have %lu to write but couldn't" -msgstr "помилка при записі, мали прочитати ще %lu байт, але не змогли" +msgid "but %s is to be installed" +msgstr "але %s буде встановлений" -#: apt-pkg/contrib/fileutl.cc:597 -msgid "Problem closing the file" -msgstr "Проблема з закриттям файла" +#: cmdline/apt-get.cc:340 +msgid "but it is not installable" +msgstr "але він не може бути встановлений" -#: apt-pkg/contrib/fileutl.cc:603 -msgid "Problem unlinking the file" -msgstr "Проблема з роз'єднанням файла" +#: cmdline/apt-get.cc:342 +msgid "but it is a virtual package" +msgstr "але це віртуальний пакунок" -#: apt-pkg/contrib/fileutl.cc:614 -msgid "Problem syncing the file" -msgstr "Проблема з синхронізацією файла" +#: cmdline/apt-get.cc:345 +msgid "but it is not installed" +msgstr "але він не встановлений" -#: apt-pkg/pkgcache.cc:132 -msgid "Empty package cache" -msgstr "Кеш пакунків пустий" +#: cmdline/apt-get.cc:345 +msgid "but it is not going to be installed" +msgstr "але він не буде встановлений" -#: apt-pkg/pkgcache.cc:138 -msgid "The package cache file is corrupted" -msgstr "Файл кешу пакунків пошкоджений" +#: cmdline/apt-get.cc:350 +msgid " or" +msgstr " чи" -#: apt-pkg/pkgcache.cc:143 -msgid "The package cache file is an incompatible version" -msgstr "Файл кешу пакунків має несумісну версію" +#: cmdline/apt-get.cc:379 +msgid "The following NEW packages will be installed:" +msgstr "НОВІ пакунки, які будуть встановлені:" -#: apt-pkg/pkgcache.cc:148 -#, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "APT не підтримує систему призначення версій '%s'" +#: cmdline/apt-get.cc:405 +msgid "The following packages will be REMOVED:" +msgstr "Пакунки, які будуть ВИДАЛЕНІ:" -#: apt-pkg/pkgcache.cc:153 -msgid "The package cache was built for a different architecture" -msgstr "Кеш пакунків був побудований для іншої архітектури" +#: cmdline/apt-get.cc:427 +msgid "The following packages have been kept back:" +msgstr "Пакунки, які будуть залишені в незмінному вигляді:" -#: apt-pkg/pkgcache.cc:224 -msgid "Depends" -msgstr "Залежності (Depends)" +#: cmdline/apt-get.cc:448 +msgid "The following packages will be upgraded:" +msgstr "Пакунки, які будуть ОНОВЛЕНІ:" -#: apt-pkg/pkgcache.cc:224 -msgid "PreDepends" -msgstr "Пре-Залежності (PreDepends)" +#: cmdline/apt-get.cc:469 +msgid "The following packages will be DOWNGRADED:" +msgstr "Пакунки, будуть замінені на більш СТАРІ версії:" -#: apt-pkg/pkgcache.cc:224 -msgid "Suggests" -msgstr "Пропонує (Suggests)" +#: cmdline/apt-get.cc:489 +msgid "The following held packages will be changed:" +msgstr "Пакунки, які повинні були б залишитися без змін, але будуть замінені:" -#: apt-pkg/pkgcache.cc:225 -msgid "Recommends" -msgstr "Рекомендує" +#: cmdline/apt-get.cc:542 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (внаслідок %s) " -#: apt-pkg/pkgcache.cc:225 -msgid "Conflicts" -msgstr "Конфлікти" +#: cmdline/apt-get.cc:550 +msgid "" +"WARNING: The following essential packages will be removed.\n" +"This should NOT be done unless you know exactly what you are doing!" +msgstr "" +"УВАГА: Ці істотно важливі пакунки будуть вилучені.\n" +"НЕ РОБІТЬ цього, якщо ви НЕ уявляєте собі всі можливі наслідки!" -#: apt-pkg/pkgcache.cc:225 -msgid "Replaces" -msgstr "Заміняє (Replaces)" +#: cmdline/apt-get.cc:581 +#, c-format +msgid "%lu upgraded, %lu newly installed, " +msgstr "оновлено %lu, встановлено %lu нових пакунків, " -#: apt-pkg/pkgcache.cc:226 -msgid "Obsoletes" -msgstr "Застарілі (Obsoletes)" +#: cmdline/apt-get.cc:585 +#, c-format +msgid "%lu reinstalled, " +msgstr " %lu перевстановлено, " -#: apt-pkg/pkgcache.cc:226 -msgid "Breaks" -msgstr "" +#: cmdline/apt-get.cc:587 +#, c-format +msgid "%lu downgraded, " +msgstr "%lu пакунків замінено на старі версії, " -#: apt-pkg/pkgcache.cc:237 -msgid "important" -msgstr "Важливі (Important)" +#: cmdline/apt-get.cc:589 +#, c-format +msgid "%lu to remove and %lu not upgraded.\n" +msgstr "для видалення відмічено %lu пакунків, і %lu пакунків не оновлено.\n" -#: apt-pkg/pkgcache.cc:237 -msgid "required" -msgstr "Необхідні (Required)" +#: cmdline/apt-get.cc:593 +#, c-format +msgid "%lu not fully installed or removed.\n" +msgstr "не встановлено до кінця чи видалено %lu пакунків.\n" -#: apt-pkg/pkgcache.cc:237 -msgid "standard" -msgstr "Стандартні (Standard)" +#: cmdline/apt-get.cc:667 +msgid "Correcting dependencies..." +msgstr "Виправлення залежностей..." -#: apt-pkg/pkgcache.cc:238 -msgid "optional" -msgstr "Необов'язкові (Optional)" +#: cmdline/apt-get.cc:670 +msgid " failed." +msgstr " невдача." -#: apt-pkg/pkgcache.cc:238 -msgid "extra" -msgstr "Додаткові (Extra)" +#: cmdline/apt-get.cc:673 +msgid "Unable to correct dependencies" +msgstr "Неможливо скоригувати залежності" -#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 -msgid "Building dependency tree" -msgstr "Побудова дерева залежностей" +#: cmdline/apt-get.cc:676 +msgid "Unable to minimize the upgrade set" +msgstr "Неможливо мінімізувати набір оновлень" -#: apt-pkg/depcache.cc:122 -msgid "Candidate versions" -msgstr "Версії кандидатів" +#: cmdline/apt-get.cc:678 +msgid " Done" +msgstr " Виконано" -#: apt-pkg/depcache.cc:151 -msgid "Dependency generation" -msgstr "Ґенерація залежностей" +#: cmdline/apt-get.cc:682 +msgid "You might want to run `apt-get -f install' to correct these." +msgstr "" +"Можливо, для виправлення цих помилок ви захочете скористатися 'apt-get -f " +"install'." -#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 -#, fuzzy -msgid "Reading state information" -msgstr "Об'єднання інформації про доступні пакунки" +#: cmdline/apt-get.cc:685 +msgid "Unmet dependencies. Try using -f." +msgstr "Незадоволені залежності. Спробуйте використати -f." -#: apt-pkg/depcache.cc:219 -#, fuzzy, c-format -msgid "Failed to open StateFile %s" -msgstr "Не вдалося відкрити %s" +#: cmdline/apt-get.cc:707 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "УВАГА: Наступні пакунки неможливо автентифікувати!" -#: apt-pkg/depcache.cc:225 -#, fuzzy, c-format -msgid "Failed to write temporary StateFile %s" -msgstr "Не вдалося записати файл %s" +#: cmdline/apt-get.cc:711 +msgid "Authentication warning overridden.\n" +msgstr "Автентифікаційне попередження не прийнято до уваги.\n" -#: apt-pkg/tagfile.cc:102 -#, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Неможливо обробити файл %s пакунку (1)" +#: cmdline/apt-get.cc:718 +msgid "Install these packages without verification [y/N]? " +msgstr "Встановити ці пакунки без перевірки [т/Н]? " -#: apt-pkg/tagfile.cc:189 -#, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Неможливо обробити файл %s пакунку (2)" +#: cmdline/apt-get.cc:720 +msgid "Some packages could not be authenticated" +msgstr "Деякі пакунки неможливо автентифікувати" -#: apt-pkg/sourcelist.cc:90 -#, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "Спотворена лінія %lu у переліку джерел %s (проблема в URI)" +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 +msgid "There are problems and -y was used without --force-yes" +msgstr "Існують проблеми, а опція -y використана без --force-yes" -#: apt-pkg/sourcelist.cc:92 -#, c-format -msgid "Malformed line %lu in source list %s (dist)" +#: cmdline/apt-get.cc:773 +msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -"Спотворена лінія %lu у переліку джерел %s (проблема в назві дистрибутиву)" +"Внутрішня помилка, InstallPackages була викликана з непрацездатними " +"пакунками!" -#: apt-pkg/sourcelist.cc:95 -#, c-format -msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "Спотворена лінія %lu у переліку джерел %s (обробка URI)" +#: cmdline/apt-get.cc:782 +msgid "Packages need to be removed but remove is disabled." +msgstr "Пакунки необхідно видалити, але видалення заборонене." -#: apt-pkg/sourcelist.cc:101 -#, c-format -msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "Спотворена лінія %lu у переліку джерел %s (absolute dist)" +#: cmdline/apt-get.cc:793 +msgid "Internal error, Ordering didn't finish" +msgstr "Внутрішня помилка, Ordering не завершилася" -#: apt-pkg/sourcelist.cc:108 -#, c-format -msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "Спотворена лінія %lu у переліку джерел %s (dist parse)" +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 +msgid "Unable to lock the download directory" +msgstr "Неможливо заблокувати теку для завантаження" -#: apt-pkg/sourcelist.cc:199 -#, c-format -msgid "Opening %s" -msgstr "Відкриття %s" +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 +msgid "The list of sources could not be read." +msgstr "Неможливо прочитати перелік джерел." -#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 -#, c-format -msgid "Line %u too long in source list %s." -msgstr "Лінія %u занадто довга в переліку джерел %s." +#: cmdline/apt-get.cc:834 +msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgstr "Дивно.. Розбіжність розмірів, напишіть на apt@packages.debian.org" -#: apt-pkg/sourcelist.cc:236 +#: cmdline/apt-get.cc:839 #, c-format -msgid "Malformed line %u in source list %s (type)" -msgstr "Спотворена лінія %u у переліку джерел %s (тип)" +msgid "Need to get %sB/%sB of archives.\n" +msgstr "Необхідно завантажити %sB/%sB архівів.\n" -#: apt-pkg/sourcelist.cc:240 +#: cmdline/apt-get.cc:842 #, c-format -msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Невідомий тип '%s' в лінії %u в переліку джерел %s" +msgid "Need to get %sB of archives.\n" +msgstr "Необхідно завантажити %sB архівів.\n" -#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 -#, c-format -msgid "Malformed line %u in source list %s (vendor id)" -msgstr "Спотворена лінія %u у переліку джерел %s (vendor id)" +#: cmdline/apt-get.cc:847 +#, fuzzy, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "Після розпакування об'єм зайнятого дискового простору зросте на %sB.\n" -#: apt-pkg/packagemanager.cc:399 -#, c-format -msgid "" -"This installation run will require temporarily removing the essential " -"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " -"you really want to do it, activate the APT::Force-LoopBreak option." +#: cmdline/apt-get.cc:850 +#, fuzzy, c-format +msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -"Для виконання даного встановлення потрібне тимчасове видалення важливого " -"пакету %s через конфлікти/петлеві пре-залежності (Pre-Depends loop). Це " -"погано, але якщо Ви дійсно бажаєте зробити це, активуйте параметр APT::Force-" -"LoopBreak." +"Після розпакування об'єм зайнятого дискового простору зменшиться на %sB.\n" -#: apt-pkg/pkgrecords.cc:32 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "Тип '%s' індексного файлу не підтримується" +msgid "Couldn't determine free space in %s" +msgstr "Не вдалося визначити кількість вільного місця в %s" -#: apt-pkg/algorithms.cc:247 +#: cmdline/apt-get.cc:871 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." +msgid "You don't have enough free space in %s." +msgstr "Недостатньо вільного місця в %s." + +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 +msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -"Пакунок %s повинен бути перевстановленим, але я не можу знайти архіву для " -"нього." +"Запитане виконання тільки тривіальних операцій, але це не тривіальна " +"операція." -#: apt-pkg/algorithms.cc:1105 +#: cmdline/apt-get.cc:889 +msgid "Yes, do as I say!" +msgstr "Так, робити, як я скажу!" + +#: cmdline/apt-get.cc:891 +#, c-format msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " msgstr "" -"Помилка, pkgProblemResolver::Resolve згенерував зупинку, це може бути " -"пов'язано з зафіксованими пакунками." +"Те, що ви хочете зробити, може мати небажані наслідки.\n" +"Щоб продовжити, введіть фразу: '%s'\n" +" ?] " -#: apt-pkg/algorithms.cc:1107 -msgid "Unable to correct problems, you have held broken packages." -msgstr "Неможливо усунути проблеми, Ви маєте поламані зафіксовані пакунки." +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 +msgid "Abort." +msgstr "Перервано." -#: apt-pkg/acquire.cc:59 -#, c-format -msgid "Lists directory %spartial is missing." -msgstr "Lists тека %spartial відсутня." +#: cmdline/apt-get.cc:912 +msgid "Do you want to continue [Y/n]? " +msgstr "Бажаєте продовжити [Т/н]? " -#: apt-pkg/acquire.cc:63 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format -msgid "Archive directory %spartial is missing." -msgstr "Архівна тека %spartial відсутня." +msgid "Failed to fetch %s %s\n" +msgstr "Не вдалося завантажити %s %s\n" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:827 -#, fuzzy, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Завантажується файл %li з %li (%s залишилось)" +#: cmdline/apt-get.cc:1002 +msgid "Some files failed to download" +msgstr "Деякі файли не вдалося завантажити" -#: apt-pkg/acquire.cc:829 -#, fuzzy, c-format -msgid "Retrieving file %li of %li" -msgstr "Завантажується файл %li з %li" +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 +msgid "Download complete and in download only mode" +msgstr "Вказано режим \"тільки завантаження\", і завантаження завершено" -#: apt-pkg/acquire-worker.cc:110 -#, c-format -msgid "The method driver %s could not be found." -msgstr "Драйвер для метода %s не знайдено." +#: cmdline/apt-get.cc:1009 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Неможливо завантажити деякі архіви, імовірно треба виконати apt-get update " +"або спробувати повторити запуск з ключем --fix-missing?" -#: apt-pkg/acquire-worker.cc:159 +#: cmdline/apt-get.cc:1013 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "--fix-missing і зміна носія в даний момент не підтримується" + +#: cmdline/apt-get.cc:1018 +msgid "Unable to correct missing packages." +msgstr "Неможливо виправити втрачені пакунки." + +#: cmdline/apt-get.cc:1019 +msgid "Aborting install." +msgstr "Переривається встановлення." + +#: cmdline/apt-get.cc:1053 #, c-format -msgid "Method %s did not start correctly" -msgstr "Метод %s не стартував коректно" +msgid "Note, selecting %s instead of %s\n" +msgstr "Помітьте, замість %2$s вибирається %1$s\n" -#: apt-pkg/acquire-worker.cc:398 +#: cmdline/apt-get.cc:1063 #, c-format -msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." +msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -"Будь-ласка, вставте диск з поміткою: '%s' в CD привід '%s' і натисніть Enter." +"Пропускається %s - пакунок вже встановлений, і опція upgrade не " +"встановлена.\n" -#: apt-pkg/init.cc:124 +#: cmdline/apt-get.cc:1081 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "Система пакування '%s' не підтримується" - -#: apt-pkg/init.cc:140 -msgid "Unable to determine a suitable packaging system type" -msgstr "Неможливо визначити тип необхідної системи пакування " +msgid "Package %s is not installed, so not removed\n" +msgstr "Пакунок %s не встановлений, тому не може бути видалений\n" -#: apt-pkg/clean.cc:57 +#: cmdline/apt-get.cc:1092 #, c-format -msgid "Unable to stat %s." -msgstr "Неможливо прочитати атрибути %s." +msgid "Package %s is a virtual package provided by:\n" +msgstr "Пакунок %s - віртуальний, його функції надаються пакунками:\n" -#: apt-pkg/srcrecords.cc:44 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "Ви повинні записати певні 'source' посилання в твій sources.list" +#: cmdline/apt-get.cc:1104 +msgid " [Installed]" +msgstr " [Встановлено]" -#: apt-pkg/cachefile.cc:63 -msgid "The list of sources could not be read." -msgstr "Неможливо прочитати перелік джерел." +#: cmdline/apt-get.cc:1109 +msgid "You should explicitly select one to install." +msgstr "Ви повинні явно вказати, який саме ви хочете встановити." -#: apt-pkg/cachefile.cc:69 -msgid "The package lists or status file could not be parsed or opened." -msgstr "Не можу обробити чи відкрити перелік пакунків чи status файл." +#: cmdline/apt-get.cc:1114 +#, c-format +msgid "" +"Package %s is not available, but is referred to by another package.\n" +"This may mean that the package is missing, has been obsoleted, or\n" +"is only available from another source\n" +msgstr "" +"Пакунок %s недоступний, але згадується у переліку залежностей іншого " +"пакунка.\n" +"Це може означати, що пакунок відсутній, застарів, або доступний з джерел, не " +"згаданих в sources.list\n" -#: apt-pkg/cachefile.cc:73 -msgid "You may want to run apt-get update to correct these problems" -msgstr "Можливо, для виправлення цих помилок Ви захочете запустити apt-get" +#: cmdline/apt-get.cc:1133 +msgid "However the following packages replace it:" +msgstr "Однак наступні пакунки можуть його замінити:" -#: apt-pkg/policy.cc:267 -msgid "Invalid record in the preferences file, no Package header" -msgstr "Невірний запис в preferences файлі, відсутній заголовок Package" +#: cmdline/apt-get.cc:1136 +#, c-format +msgid "Package %s has no installation candidate" +msgstr "Для пакунка %s не знайдені кандидати на встановлення" -#: apt-pkg/policy.cc:289 +#: cmdline/apt-get.cc:1156 #, c-format -msgid "Did not understand pin type %s" -msgstr "Не зрозумів тип %s для pin" +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "Перевстановлення %s неможливе, бо він не може бути завантаженим.\n" -#: apt-pkg/policy.cc:297 -msgid "No priority (or zero) specified for pin" -msgstr "Не встановлено пріоритету (або встановлено 0) для pin" - -#: apt-pkg/pkgcachegen.cc:72 -msgid "Cache has an incompatible versioning system" -msgstr "Кеш має несумісну систему призначення версій" - -#: apt-pkg/pkgcachegen.cc:115 +#: cmdline/apt-get.cc:1164 #, c-format -msgid "Error occurred while processing %s (NewPackage)" -msgstr "Помилка, яка була викликана внаслідок обробки %s (NewPackage)" +msgid "%s is already the newest version.\n" +msgstr "Вже встановлена найновіша версія %s.\n" -#: apt-pkg/pkgcachegen.cc:130 +#: cmdline/apt-get.cc:1193 #, c-format -msgid "Error occurred while processing %s (UsePackage1)" -msgstr "Помилка, яка була викликана внаслідок обробки %s (UsePackage1)" - -#: apt-pkg/pkgcachegen.cc:153 -#, fuzzy, c-format -msgid "Error occurred while processing %s (NewFileDesc1)" -msgstr "Помилка, яка була викликана внаслідок обробки %s (NewFileVer1)" +msgid "Release '%s' for '%s' was not found" +msgstr "Реліз '%s' для '%s' не знайдений" -#: apt-pkg/pkgcachegen.cc:178 +#: cmdline/apt-get.cc:1195 #, c-format -msgid "Error occurred while processing %s (UsePackage2)" -msgstr "Помилка, яка була викликана внаслідок обробки %s (UsePackage2)" +msgid "Version '%s' for '%s' was not found" +msgstr "Версія '%s' для '%s' не знайдена" -#: apt-pkg/pkgcachegen.cc:182 +#: cmdline/apt-get.cc:1201 #, c-format -msgid "Error occurred while processing %s (NewFileVer1)" -msgstr "Помилка, яка була викликана внаслідок обробки %s (NewFileVer1)" +msgid "Selected version %s (%s) for %s\n" +msgstr "Обрана версія %s (%s) для %s\n" -#: apt-pkg/pkgcachegen.cc:213 -#, c-format -msgid "Error occurred while processing %s (NewVersion1)" -msgstr "Помилка, яка була викликана внаслідок обробки %s (NewVersion1)" +#: cmdline/apt-get.cc:1338 +msgid "The update command takes no arguments" +msgstr "Команді update не потрібні аргументи" -#: apt-pkg/pkgcachegen.cc:217 -#, c-format -msgid "Error occurred while processing %s (UsePackage3)" -msgstr "Помилка, яка була викликана внаслідок обробки %s (UsePackage3)" +#: cmdline/apt-get.cc:1351 +msgid "Unable to lock the list directory" +msgstr "Неможливо заблокувати теку з переліками пакунків" -#: apt-pkg/pkgcachegen.cc:221 -#, c-format -msgid "Error occurred while processing %s (NewVersion2)" -msgstr "Помилка, яка була викликана внаслідок обробки %s (NewVersion2)" +#: cmdline/apt-get.cc:1402 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" -#: apt-pkg/pkgcachegen.cc:245 -#, fuzzy, c-format -msgid "Error occurred while processing %s (NewFileDesc2)" -msgstr "Помилка, яка була викликана внаслідок обробки %s (NewFileVer1)" +#: cmdline/apt-get.cc:1434 +#, fuzzy +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "НОВІ пакунки, які будуть встановлені:" -#: apt-pkg/pkgcachegen.cc:251 -msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "Ви перевищили кількість імен пакунків, які APT може обробити." +#: cmdline/apt-get.cc:1436 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "" -#: apt-pkg/pkgcachegen.cc:254 -msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "Ви перевищили кількість версій, які APT може обробити." +#: cmdline/apt-get.cc:1441 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" -#: apt-pkg/pkgcachegen.cc:257 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 +msgid "The following information may help to resolve the situation:" +msgstr "Наступна інформація можливо допоможе Вам:" + +#: cmdline/apt-get.cc:1448 #, fuzzy -msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "Ви перевищили кількість версій, які APT може обробити." +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Внутрішня помилка, вирішувач проблем все поламав" -#: apt-pkg/pkgcachegen.cc:260 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "Ви перевищили кількість залежностей які APT може обробити." +#: cmdline/apt-get.cc:1467 +msgid "Internal error, AllUpgrade broke stuff" +msgstr "Внутрішня помилка, AllUpgrade все поламав" -#: apt-pkg/pkgcachegen.cc:288 -#, c-format -msgid "Error occurred while processing %s (FindPkg)" -msgstr "Помилка, яка була викликана внаслідок обробки %s (FindPkg)" +#: cmdline/apt-get.cc:1514 +#, fuzzy, c-format +msgid "Couldn't find task %s" +msgstr "Не можу знайти пакунок %s" -#: apt-pkg/pkgcachegen.cc:301 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format -msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "Помилка, яка була викликана внаслідок обробки %s (CollectFileProvides)" +msgid "Couldn't find package %s" +msgstr "Не можу знайти пакунок %s" -#: apt-pkg/pkgcachegen.cc:307 +#: cmdline/apt-get.cc:1652 #, c-format -msgid "Package %s %s was not found while processing file dependencies" -msgstr "Пакунок %s %s не був знайдений під час обробки залежностей файла" +msgid "Note, selecting %s for regex '%s'\n" +msgstr "Помітьте, регулярний вираз %2$s призводить до вибору %1$s\n" -#: apt-pkg/pkgcachegen.cc:678 -#, c-format -msgid "Couldn't stat source package list %s" -msgstr "Не вдалося прочитати атрибути переліку вихідних текстів%s" +#: cmdline/apt-get.cc:1683 +#, fuzzy, c-format +msgid "%s set to manually installed.\n" +msgstr "але %s буде встановлений" -#. Build the status cache -#: apt-pkg/pkgcachegen.cc:748 apt-pkg/pkgcachegen.cc:817 -#: apt-pkg/pkgcachegen.cc:822 apt-pkg/pkgcachegen.cc:945 -msgid "Reading package lists" -msgstr "Читання переліків пакетів" +#: cmdline/apt-get.cc:1696 +msgid "You might want to run `apt-get -f install' to correct these:" +msgstr "" +"Можливо, для виправлення цих помилок Ви захочете скористатися 'apt-get -f " +"install':" -#: apt-pkg/pkgcachegen.cc:763 -#, fuzzy -msgid "Collecting File Provides" -msgstr "Збирання інформації про файлів " +#: cmdline/apt-get.cc:1699 +msgid "" +"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " +"solution)." +msgstr "" +"Незадоволені залежності. Спробуйте виконати 'apt-get -f install', не " +"вказуючи імені пакунка (або знайдіть інше рішення)." -#: apt-pkg/pkgcachegen.cc:815 -#, c-format -msgid "Unable to write to %s" -msgstr "Неможливо записати в %s" +#: cmdline/apt-get.cc:1711 +msgid "" +"Some packages could not be installed. This may mean that you have\n" +"requested an impossible situation or if you are using the unstable\n" +"distribution that some required packages have not yet been created\n" +"or been moved out of Incoming." +msgstr "" +"Деякі пакунки неможливо встановити. Можливо, Ви просите неможливого,\n" +"або ж використаєте нестабільний дистрибутив, і запитані Вами пакунки\n" +"ще не створені або були вилучені з Incoming." -#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 -msgid "IO Error saving source cache" -msgstr "Помилка IO під час збереження джерельного кешу" +#: cmdline/apt-get.cc:1719 +msgid "" +"Since you only requested a single operation it is extremely likely that\n" +"the package is simply not installable and a bug report against\n" +"that package should be filed." +msgstr "" +"Так як Ви просили виконати тільки одну операцію, те найімовірніше, що\n" +"пакунок просто не може бути встановлений через помилки в самому пакунку.\n" +"Необхідно відіслати звіт про цю помилку." -#: apt-pkg/acquire-item.cc:127 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "Не вдалося перейменувати, %s (%s -> %s)." +#: cmdline/apt-get.cc:1727 +msgid "Broken packages" +msgstr "Зламані пакунки" -#: apt-pkg/acquire-item.cc:401 -msgid "MD5Sum mismatch" -msgstr "Невідповідність MD5Sum" +#: cmdline/apt-get.cc:1756 +msgid "The following extra packages will be installed:" +msgstr "Будуть встановлені наступні додаткові пакунки:" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1399 -#, fuzzy -msgid "Hash Sum mismatch" -msgstr "Невідповідність MD5Sum" +#: cmdline/apt-get.cc:1845 +msgid "Suggested packages:" +msgstr "Пропоновані пакунки:" -#: apt-pkg/acquire-item.cc:1091 -#, fuzzy -msgid "There is no public key available for the following key IDs:\n" -msgstr "Відсутній публічний ключ для заданих ID ключа:\n" +#: cmdline/apt-get.cc:1846 +msgid "Recommended packages:" +msgstr "Рекомендовані пакунки:" -#: apt-pkg/acquire-item.cc:1204 -#, c-format -msgid "" -"I wasn't able to locate a file for the %s package. This might mean you need " -"to manually fix this package. (due to missing arch)" +#: cmdline/apt-get.cc:1874 +msgid "Calculating upgrade... " +msgstr "Обчислення оновлень... " + +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 +msgid "Failed" +msgstr "Невдача" + +#: cmdline/apt-get.cc:1882 +msgid "Done" +msgstr "Виконано" + +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 +msgid "Internal error, problem resolver broke stuff" +msgstr "Внутрішня помилка, вирішувач проблем все поламав" + +#: cmdline/apt-get.cc:2057 +msgid "Must specify at least one package to fetch source for" msgstr "" -"Я не можу знайти файл для пакунку %s. Можливо, Ви захочете власноруч " -"виправити цей пакунок. (due to missing arch)" +"Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні " +"тексти" + +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 +#, c-format +msgid "Unable to find a source package for %s" +msgstr "Неможливо знайти пакунок з вихідними текстами для %s" -#: apt-pkg/acquire-item.cc:1263 +#: cmdline/apt-get.cc:2103 #, c-format msgid "" -"I wasn't able to locate file for the %s package. This might mean you need to " -"manually fix this package." +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" msgstr "" -"Я не можу знайти файл для пакунку %s. Можливо, Ви захочете власноруч " -"виправити цей пакунок." -#: apt-pkg/acquire-item.cc:1304 +#: cmdline/apt-get.cc:2108 #, c-format msgid "" -"The package index files are corrupted. No Filename: field for package %s." +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" msgstr "" -"Індексні файли пакунків пошкоджені. Немає поля Filename для пакунку %s." -#: apt-pkg/acquire-item.cc:1391 -msgid "Size mismatch" -msgstr "Невідповідність розміру" - -#: apt-pkg/vendorlist.cc:66 +#: cmdline/apt-get.cc:2163 #, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "Блок постачальника %s не містить відбитку (fingerprint)" +msgid "Skipping already downloaded file '%s'\n" +msgstr "Пропускаємо вже завантажений файл '%s'\n" -#: apt-pkg/cdrom.cc:529 +#: cmdline/apt-get.cc:2191 #, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" -"Використовується точка монтування CDROM: %s\n" -"Монтування CD-ROM\n" +msgid "You don't have enough free space in %s" +msgstr "Недостатньо місця в %s" -#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 -msgid "Identifying.. " -msgstr "Ідентифікація.. " +#: cmdline/apt-get.cc:2197 +#, c-format +msgid "Need to get %sB/%sB of source archives.\n" +msgstr "Необхідно завантажити %sB/%sB з архівів вихідних текстів.\n" -#: apt-pkg/cdrom.cc:563 +#: cmdline/apt-get.cc:2200 #, c-format -msgid "Stored label: %s\n" -msgstr "Записано мітку: %s \n" +msgid "Need to get %sB of source archives.\n" +msgstr "Потрібно завантажити %sB архівів з вихідними текстами.\n" -#: apt-pkg/cdrom.cc:583 +#: cmdline/apt-get.cc:2206 #, c-format -msgid "Using CD-ROM mount point %s\n" -msgstr "Використовується точка монтування CDROM: %s\n" +msgid "Fetch source %s\n" +msgstr "Завантаження вихідних текстів %s\n" -#: apt-pkg/cdrom.cc:601 -msgid "Unmounting CD-ROM\n" -msgstr "Демонтується CD-ROM\n" +#: cmdline/apt-get.cc:2237 +msgid "Failed to fetch some archives." +msgstr "Деякі архіви не вдалося завантажити." -#: apt-pkg/cdrom.cc:605 -msgid "Waiting for disc...\n" -msgstr "Чекаю на диск...\n" +#: cmdline/apt-get.cc:2265 +#, c-format +msgid "Skipping unpack of already unpacked source in %s\n" +msgstr "" +"Розпакування вихідних текстів пропущено, тому що в %s вже перебувають " +"розпаковані вихідні тексти\n" -#. Mount the new CDROM -#: apt-pkg/cdrom.cc:613 -msgid "Mounting CD-ROM...\n" -msgstr "Монтується CD-ROM...\n" +#: cmdline/apt-get.cc:2277 +#, c-format +msgid "Unpack command '%s' failed.\n" +msgstr "Команда розпакування '%s' завершилася невдало.\n" -#: apt-pkg/cdrom.cc:631 -msgid "Scanning disc for index files..\n" -msgstr "Диск сканується на індексні файли..\n" +#: cmdline/apt-get.cc:2278 +#, c-format +msgid "Check if the 'dpkg-dev' package is installed.\n" +msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n" -#: apt-pkg/cdrom.cc:671 -#, fuzzy, c-format -msgid "" -"Found %u package indexes, %u source indexes, %u translation indexes and %u " -"signatures\n" -msgstr "Знайдено %i індексів пакунків, %i індексів джерел і %i підписів\n" - -#: apt-pkg/cdrom.cc:708 -#, fuzzy, c-format -msgid "Found label '%s'\n" -msgstr "Записано мітку: %s \n" - -#: apt-pkg/cdrom.cc:737 -msgid "That is not a valid name, try again.\n" -msgstr "Не є вірною назвою, спробуйте ще.\n" - -#: apt-pkg/cdrom.cc:753 +#: cmdline/apt-get.cc:2295 #, c-format -msgid "" -"This disc is called: \n" -"'%s'\n" -msgstr "" -"Цей диск зветься: \n" -"'%s'\n" - -#: apt-pkg/cdrom.cc:757 -msgid "Copying package lists..." -msgstr "Копіюються переліки пакунків..." - -#: apt-pkg/cdrom.cc:783 -msgid "Writing new source list\n" -msgstr "Записується новий перелік джерел\n" +msgid "Build command '%s' failed.\n" +msgstr "Команда побудови '%s' закінчилася невдало.\n" -#: apt-pkg/cdrom.cc:792 -msgid "Source list entries for this disc are:\n" -msgstr "Перелік джерел для цього диску:\n" +#: cmdline/apt-get.cc:2314 +msgid "Child process failed" +msgstr "Породжений процес завершився невдало" -#: apt-pkg/cdrom.cc:834 -#, fuzzy -msgid "Unmounting CD-ROM...\n" -msgstr "Демонтується CD-ROM..." +#: cmdline/apt-get.cc:2330 +msgid "Must specify at least one package to check builddeps for" +msgstr "" +"Для перевірки залежностей для побудови необхідно вказати як мінімум один " +"пакунок" -#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 +#: cmdline/apt-get.cc:2358 #, c-format -msgid "Wrote %i records.\n" -msgstr "Записано %i записів.\n" +msgid "Unable to get build-dependency information for %s" +msgstr "Неможливо одержати інформацію про залежності для побудови %s" -#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 +#: cmdline/apt-get.cc:2378 #, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "Записано %i записів з %i відсутніми файлами.\n" +msgid "%s has no build depends.\n" +msgstr "%s не має залежностей для побудови.\n" -#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 +#: cmdline/apt-get.cc:2430 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "Записано %i записів з %i невідповідними файлам\n" +msgid "" +"%s dependency for %s cannot be satisfied because the package %s cannot be " +"found" +msgstr "" +"Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено" -#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831 +#: cmdline/apt-get.cc:2483 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "Записано %i записів з %i відсутніми і %i невідповідними файлами\n" - -#: apt-pkg/deb/dpkgpm.cc:510 -#, fuzzy, c-format -msgid "Directory '%s' missing" -msgstr "Lists тека %spartial відсутня." +msgid "" +"%s dependency for %s cannot be satisfied because no available versions of " +"package %s can satisfy version requirements" +msgstr "" +"Залежність типу %s для %s не може бути задоволена, бо ні одна з версій " +"пакунка %s не задовольняє умови" -#: apt-pkg/deb/dpkgpm.cc:572 +#: cmdline/apt-get.cc:2519 #, c-format -msgid "Preparing %s" -msgstr "Підготовка %s" +msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" +msgstr "" +"Не вдалося задовольнити залежність типу %s для пакунка %s: Встановлений " +"пакунок %s новіше, аніж треба" -#: apt-pkg/deb/dpkgpm.cc:573 +#: cmdline/apt-get.cc:2544 #, c-format -msgid "Unpacking %s" -msgstr "Розпакування %s" +msgid "Failed to satisfy %s dependency for %s: %s" +msgstr "Неможливо задовольнити залежність типу %s для пакунка %s: %s" -#: apt-pkg/deb/dpkgpm.cc:578 +#: cmdline/apt-get.cc:2558 #, c-format -msgid "Preparing to configure %s" -msgstr "Підготовка до конфігурації %s" +msgid "Build-dependencies for %s could not be satisfied." +msgstr "Залежності для побудови %s не можуть бути задоволені." -#: apt-pkg/deb/dpkgpm.cc:579 -#, c-format -msgid "Configuring %s" -msgstr "Конфігурація %s" +#: cmdline/apt-get.cc:2562 +msgid "Failed to process build dependencies" +msgstr "Обробка залежностей для побудови закінчилася невдало" -#: apt-pkg/deb/dpkgpm.cc:581 apt-pkg/deb/dpkgpm.cc:582 -#, fuzzy, c-format -#| msgid "Error processing directory %s" -msgid "Processing triggers for %s" -msgstr "Помилка обробки течи %s" +#: cmdline/apt-get.cc:2594 +msgid "Supported modules:" +msgstr "Підтримувані модулі:" -#: apt-pkg/deb/dpkgpm.cc:584 -#, c-format -msgid "Installed %s" -msgstr "Встановлено %s" +#: cmdline/apt-get.cc:2635 +#, fuzzy +msgid "" +"Usage: apt-get [options] command\n" +" apt-get [options] install|remove pkg1 [pkg2 ...]\n" +" apt-get [options] source pkg1 [pkg2 ...]\n" +"\n" +"apt-get is a simple command line interface for downloading and\n" +"installing packages. The most frequently used commands are update\n" +"and install.\n" +"\n" +"Commands:\n" +" update - Retrieve new lists of packages\n" +" upgrade - Perform an upgrade\n" +" install - Install new packages (pkg is libc6 not libc6.deb)\n" +" remove - Remove packages\n" +" autoremove - Remove all automatic unused packages\n" +" purge - Remove and purge packages\n" +" source - Download source archives\n" +" build-dep - Configure build-dependencies for source packages\n" +" dist-upgrade - Distribution upgrade, see apt-get(8)\n" +" dselect-upgrade - Follow dselect selections\n" +" clean - Erase downloaded archive files\n" +" autoclean - Erase old downloaded archive files\n" +" check - Verify that there are no broken dependencies\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -qq No output except for errors\n" +" -d Download only - do NOT install or unpack archives\n" +" -s No-act. Perform ordering simulation\n" +" -y Assume Yes to all queries and do not prompt\n" +" -f Attempt to continue if the integrity check fails\n" +" -m Attempt to continue if archives are unlocatable\n" +" -u Show a list of upgraded packages as well\n" +" -b Build the source package after fetching it\n" +" -V Show verbose version numbers\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n" +"pages for more information and options.\n" +" This APT has Super Cow Powers.\n" +msgstr "" +"Використання: apt-get [options] command\n" +" apt-get [options] install|remove pkg1 [pkg2 ...]\n" +" apt-get [options] source pkg1 [pkg2 ...]\n" +"\n" +"apt-get - простий інтерфейс командного рядка для завантаження й\n" +"встановлення пакунків. Найбільш часто використовувані команди - update \n" +"і install.\n" +"\n" +"Команди:\n" +" update - завантажити нові переліки пакунків\n" +" upgrade - виконати оновлення пакунків\n" +" install - встановити нові пакунки (назва пакунка вказується\n" +" як libc6, а не libc6.deb)\n" +" remove - видалити пакунок\n" +" source - завантажити архіви з вихідними текстами\n" +" build-dep - завантажити все необхідне для побудови зазначеного\n" +" пакунку з вихідних текстів\n" +" dist-upgrade - оновити всю систему, докладніше - в apt-get(8)\n" +" dselect-upgrade - керуватися вибором, зробленим в dselect'і\n" +" clean - видалити завантажені архіви\n" +" autoclean - видалити старі завантажені архіви\n" +" check - перевірити наявність порушених залежностей\n" +"\n" +"Опції:\n" +" -h Цей текст.\n" +" -q Виводити повідомлення, придатні для запису у файл журналу.\n" +" Не виводити індикатор прогресу\n" +" -qq Виводити тільки повідомлення про помилки\n" +" -d Тільки завантажити - не встановлювати й не розпаковувати архіви\n" +" -s Не виконувати дії насправді. Імітація роботи\n" +" -y Відповідати \"Так\" на всі питання. Самі питання при цьому не " +"виводяться\n" +" -f Продовжувати, навіть якщо перевірка цілісності не пройшла\n" +" -m Продовжувати, навіть якщо місце розташування архівів невідомо\n" +" -u Показувати список оновлюваних пакунків\n" +" -b Компілювати пакунок з вихідних текстів після їхнього завантаження\n" +" -V Показувати версії пакунків\n" +" -c=? Читати зазначений файл конфігурації\n" +" -o=? Встановити довільну опцію, наприклад, -o dir::cache=/tmp\n" +"Сторінки керівництва apt-get(8), sources.list(5) і apt.conf(5)\n" +"містять більше інформації.\n" +" This APT has Super Cow Powers.\n" -#: apt-pkg/deb/dpkgpm.cc:589 apt-pkg/deb/dpkgpm.cc:591 -#: apt-pkg/deb/dpkgpm.cc:592 -#, c-format -msgid "Preparing for removal of %s" -msgstr "Підготовка до видалення %s" +#: cmdline/acqprogress.cc:55 +msgid "Hit " +msgstr "В кеші " -#: apt-pkg/deb/dpkgpm.cc:594 -#, c-format -msgid "Removing %s" -msgstr "Видаляється %s" +#: cmdline/acqprogress.cc:79 +msgid "Get:" +msgstr "Отр:" -#: apt-pkg/deb/dpkgpm.cc:595 -#, c-format -msgid "Removed %s" -msgstr "Видалено %s" +#: cmdline/acqprogress.cc:110 +msgid "Ign " +msgstr "Ігн " + +#: cmdline/acqprogress.cc:114 +msgid "Err " +msgstr "Пом " -#: apt-pkg/deb/dpkgpm.cc:600 +#: cmdline/acqprogress.cc:135 #, c-format -msgid "Preparing to completely remove %s" -msgstr "Підготовка до повного видалення %s" +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Отримано %sB за %sB (%sB/s)\n" -#: apt-pkg/deb/dpkgpm.cc:601 +#: cmdline/acqprogress.cc:225 #, c-format -msgid "Completely removed %s" -msgstr "Повністю видалено %s" +msgid " [Working]" +msgstr " [Йде робота]" -#: apt-pkg/deb/dpkgpm.cc:749 -msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +#: cmdline/acqprogress.cc:271 +#, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" msgstr "" +"Зміна носія: вставте диск з міткою '%s' у пристрій '%s' і натисніть Ввід\n" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Неможливо накласти латку на файл" - -#: methods/rsh.cc:91 -msgid "Failed to create IPC pipe to subprocess" -msgstr "Не вдалося створити IPC-канал для породженого процесу" +#: cmdline/apt-sortpkgs.cc:86 +msgid "Unknown package record!" +msgstr "Запис про невідомий пакунок!" -#: methods/rsh.cc:330 -msgid "Connection closed prematurely" -msgstr "З'єднання завершено передчасно" +#: cmdline/apt-sortpkgs.cc:150 +msgid "" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Використання: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs - простий інструмент для сортування переліків пакунків. Опція -" +"s\n" +"використається, щоб вказати тип списку.\n" +"\n" +"Опції:\n" +" -h цей текст\n" +" -s сортувати список файлів з вихідними текстами\n" +" -c=? читати зазначений файл конфігурації\n" +" -o=? встановити довільну опцію, наприклад, -o dir::cache=/tmp\n" + +#: dselect/install:32 +msgid "Bad default setting!" +msgstr "Неправильне значення по замовчуванню!" + +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 +#: dselect/install:104 dselect/update:45 +msgid "Press enter to continue." +msgstr "Для продовження натисніть Ввід." + +#: dselect/install:100 +msgid "Some errors occurred while unpacking. I'm going to configure the" +msgstr "" +"Під час розпакування виникли помилки. Буде продовжено процес налаштування" + +#: dselect/install:101 +msgid "packages that were installed. This may result in duplicate errors" +msgstr "встановлених пакунків. Це може призвести до повторення помилок або" + +#: dselect/install:102 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "виникненню нових через незадоволені залежності. Це нормально," + +#: dselect/install:103 +msgid "" +"above this message are important. Please fix them and run [I]nstall again" +msgstr "" +"важливі тільки помилки, зазначені вище. Виправте їх і виконаєте установку ще " +"раз" + +#: dselect/update:30 +msgid "Merging available information" +msgstr "Об'єднання інформації про доступні пакунки" #: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" @@ -1347,11 +1571,6 @@ msgstr "Пакет пробує писати у diversion %s/%s" msgid "The diversion path is too long" msgstr "Шлях diversion занадто довгий" -#: apt-inst/extract.cc:185 -#, c-format -msgid "Failed to rename %s to %s" -msgstr "Не вдалося перейменувати %s в %s" - #: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" @@ -1376,6 +1595,13 @@ msgstr "Файли заміняються вмістом пакета %s без msgid "File %s/%s overwrites the one in the package %s" msgstr "Файл %s/%s перезаписує інший з пакету %s" +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 +#, c-format +msgid "Unable to read %s" +msgstr "Неможливо прочитати %s" + #: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" @@ -1400,6 +1626,13 @@ msgstr "Не вдалося прочитати атрибути %sinfo" msgid "The info and temp directories need to be on the same filesystem" msgstr "Теки info і temp повинні бути на тій самій файловій системі" +#. Build the status cache +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 +msgid "Reading package lists" +msgstr "Читання переліків пакетів" + #: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" @@ -1502,1416 +1735,1208 @@ msgstr "Не вдалося знайти правильний контрольн msgid "Unparsable control file" msgstr "Контрольний файл не можливо обробити" -#: cmdline/apt-cache.cc:143 -#, c-format -msgid "Package %s version %s has an unmet dep:\n" -msgstr "Пакунок %s версії %s має незадоволену залежність:\n" - -#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 -#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 -#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 +#: methods/cdrom.cc:114 #, c-format -msgid "Unable to locate package %s" -msgstr "Не можу знайти пакунок %s" - -#: cmdline/apt-cache.cc:247 -msgid "Total package names : " -msgstr "Всього імен пакунків : " +msgid "Unable to read the cdrom database %s" +msgstr "Неможливо прочитати базу %s з cdrom'у" -#: cmdline/apt-cache.cc:287 -msgid " Normal packages: " -msgstr " Нормальних пакунків: " +#: methods/cdrom.cc:123 +msgid "" +"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " +"cannot be used to add new CD-ROMs" +msgstr "" +"Будь-ласка використовуйте apt-cdrom, щоб APT розпізнав цей CD-ROM, apt-get " +"update не може бути використаним для додання нових CD" -#: cmdline/apt-cache.cc:288 -msgid " Pure virtual packages: " -msgstr " Чисто віртуальних пакунків: " +#: methods/cdrom.cc:131 +msgid "Wrong CD-ROM" +msgstr "Невірний CD-ROM" -#: cmdline/apt-cache.cc:289 -msgid " Single virtual packages: " -msgstr " Окремих віртуальних пакунків: " +#: methods/cdrom.cc:166 +#, c-format +msgid "Unable to unmount the CD-ROM in %s, it may still be in use." +msgstr "Неможливо демонтувати CDROM в %s, можливо він все ще використовується." -#: cmdline/apt-cache.cc:290 -msgid " Mixed virtual packages: " -msgstr " Змішаних віртуальних пакунків: " +#: methods/cdrom.cc:171 +msgid "Disk not found." +msgstr "Диск не знайдено." -#: cmdline/apt-cache.cc:291 -msgid " Missing: " -msgstr " Пропущено: " +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 +msgid "File not found" +msgstr "Файл не знайдено" -#: cmdline/apt-cache.cc:293 -msgid "Total distinct versions: " -msgstr "Всього унікальних версій: " +#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 +#: methods/rred.cc:234 methods/rred.cc:243 +msgid "Failed to stat" +msgstr "Не вдалося одержати атрибути" -#: cmdline/apt-cache.cc:295 -#, fuzzy -msgid "Total Distinct Descriptions: " -msgstr "Всього унікальних версій: " +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +msgid "Failed to set modification time" +msgstr "Не вдалося встановити час модифікації" -#: cmdline/apt-cache.cc:297 -msgid "Total dependencies: " -msgstr "Всього залежностей: " +#: methods/file.cc:44 +msgid "Invalid URI, local URIS must not start with //" +msgstr "Невірне посилання, локальні посилання повинні починатися з //" -#: cmdline/apt-cache.cc:300 -msgid "Total ver/file relations: " -msgstr "Всього відносин Версія/Файл: " +#. Login must be before getpeername otherwise dante won't work. +#: methods/ftp.cc:162 +msgid "Logging in" +msgstr "Логінюсь в" -#: cmdline/apt-cache.cc:302 -#, fuzzy -msgid "Total Desc/File relations: " -msgstr "Всього відносин Версія/Файл: " +#: methods/ftp.cc:168 +msgid "Unable to determine the peer name" +msgstr "Неможливо визначити назву вузла" -#: cmdline/apt-cache.cc:304 -msgid "Total Provides mappings: " -msgstr "Всього відносин Provides: " +#: methods/ftp.cc:173 +msgid "Unable to determine the local name" +msgstr "Неможливо визначити локальну назву" -#: cmdline/apt-cache.cc:316 -msgid "Total globbed strings: " -msgstr "Всього розгорнутих рядків: " +#: methods/ftp.cc:204 methods/ftp.cc:232 +#, c-format +msgid "The server refused the connection and said: %s" +msgstr "Сервер розірвав з'єднання і мовив: %s" -#: cmdline/apt-cache.cc:330 -msgid "Total dependency version space: " -msgstr "Всього інформації про залежності: " +#: methods/ftp.cc:210 +#, c-format +msgid "USER failed, server said: %s" +msgstr "USER невдало, сервер мовив: %s" -#: cmdline/apt-cache.cc:335 -msgid "Total slack space: " -msgstr "Порожнього місця в кеші: " +#: methods/ftp.cc:217 +#, c-format +msgid "PASS failed, server said: %s" +msgstr "PASS невдало, сервер мовив: %s" -#: cmdline/apt-cache.cc:343 -msgid "Total space accounted for: " -msgstr "Загальний простір полічений для: " +#: methods/ftp.cc:237 +msgid "" +"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " +"is empty." +msgstr "" +"Вказано проксі-сервер, але відсутній скрипт логіну, Acquire::ftp::ProxyLogin " +"пустий." -#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 +#: methods/ftp.cc:265 #, c-format -msgid "Package file %s is out of sync." -msgstr "Перелік пакунків %s розсинхронізований." +msgid "Login script command '%s' failed, server said: %s" +msgstr "Команда '%s'скрипту логіна не вдалася, сервер мовив: %s" -#: cmdline/apt-cache.cc:1293 -msgid "You must give exactly one pattern" -msgstr "Ви повинні задати рівно один шаблон" +#: methods/ftp.cc:291 +#, c-format +msgid "TYPE failed, server said: %s" +msgstr "TYPE невдало, сервер мовив: %s" -#: cmdline/apt-cache.cc:1447 -msgid "No packages found" -msgstr "Не знайдено жодного пакунка" +#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 +msgid "Connection timeout" +msgstr "Час з'єднання вичерпався" -#: cmdline/apt-cache.cc:1524 -msgid "Package files:" -msgstr "Переліки пакунків:" +#: methods/ftp.cc:335 +msgid "Server closed the connection" +msgstr "Сервер закрив з'єднання" -#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 -msgid "Cache is out of sync, can't x-ref a package file" -msgstr "Кеш не синхронізований, неможливо знайти посилання на перелік пакунків" +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +msgid "Read error" +msgstr "Помилка читання" -#: cmdline/apt-cache.cc:1532 -#, c-format -msgid "%4i %s\n" -msgstr "%4i %s\n" +#: methods/ftp.cc:345 methods/rsh.cc:197 +msgid "A response overflowed the buffer." +msgstr "Відповідь переповнила буфер." -#. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1544 -msgid "Pinned packages:" -msgstr "Зафіксовані пакунки:" +#: methods/ftp.cc:362 methods/ftp.cc:374 +msgid "Protocol corruption" +msgstr "Спотворений протокол" -#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 -msgid "(not found)" -msgstr "(не знайдено)" +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +msgid "Write error" +msgstr "Помилка запису" -#. Installed version -#: cmdline/apt-cache.cc:1577 -msgid " Installed: " -msgstr " Встановлено: " +#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 +msgid "Could not create a socket" +msgstr "Неможливо створити сокет (socket)" -#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 -msgid "(none)" -msgstr "(відсутній)" +#: methods/ftp.cc:698 +msgid "Could not connect data socket, connection timed out" +msgstr "Неможливо під'єднати сокет (socket) з даними, час з'єднання вичерпався" -#. Candidate Version -#: cmdline/apt-cache.cc:1584 -msgid " Candidate: " -msgstr " Кандидат: " +#: methods/ftp.cc:704 +msgid "Could not connect passive socket." +msgstr "Неможливо під'єднати пасивний сокет (passive socket)." -#: cmdline/apt-cache.cc:1594 -msgid " Package pin: " -msgstr " Фіксатор(pin) пакунка: " +#: methods/ftp.cc:722 +#, fuzzy +msgid "getaddrinfo was unable to get a listening socket" +msgstr "Виклик getaddrinfo не зміг отримати сокет" -#. Show the priority tables -#: cmdline/apt-cache.cc:1603 -msgid " Version table:" -msgstr " Таблиця версій:" +#: methods/ftp.cc:736 +msgid "Could not bind a socket" +msgstr "Неможливо приєднатися до сокета" -#: cmdline/apt-cache.cc:1618 -#, c-format -msgid " %4i %s\n" -msgstr " %4i %s\n" +#: methods/ftp.cc:740 +#, fuzzy +msgid "Could not listen on the socket" +msgstr "Не можливо утримувати з'єднання на сокеті" -#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2588 cmdline/apt-sortpkgs.cc:144 -#, fuzzy, c-format -msgid "%s %s for %s compiled on %s %s\n" -msgstr "%s %s для %s %s скомпільовано %s %s\n" +#: methods/ftp.cc:747 +msgid "Could not determine the socket's name" +msgstr "Не вдалося визначити назву сокета" -#: cmdline/apt-cache.cc:1721 -msgid "" -"Usage: apt-cache [options] command\n" -" apt-cache [options] add file1 [file2 ...]\n" -" apt-cache [options] showpkg pkg1 [pkg2 ...]\n" -" apt-cache [options] showsrc pkg1 [pkg2 ...]\n" -"\n" -"apt-cache is a low-level tool used to manipulate APT's binary\n" -"cache files, and query information from them\n" -"\n" -"Commands:\n" -" add - Add a package file to the source cache\n" -" gencaches - Build both the package and source cache\n" -" showpkg - Show some general information for a single package\n" -" showsrc - Show source records\n" -" stats - Show some basic statistics\n" -" dump - Show the entire file in a terse form\n" -" dumpavail - Print an available file to stdout\n" -" unmet - Show unmet dependencies\n" -" search - Search the package list for a regex pattern\n" -" show - Show a readable record for the package\n" -" depends - Show raw dependency information for a package\n" -" rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" -" xvcg - Generate package graphs for xvcg\n" -" policy - Show policy settings\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -p=? The package cache.\n" -" -s=? The source cache.\n" -" -q Disable progress indicator.\n" -" -i Show only important deps for the unmet command.\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" -msgstr "" -"Використання: apt-cache [options] command\n" -" або: apt-cache [options] add file1 [file1 ...]\n" -" або: apt-cache [options] showpkg pkg1 [pkg2 ...]\n" -" або: apt-cache [options] showsrc pkg1 [pkg2 ...]\n" -"\n" -"apt-cache - низькорівневий інструмент, що використається для керування\n" -"двійковими кеш-файлами APT'а, а також для добування інформації з них\n" -"Команди:\n" -" add - додати файл пакунка в кеш джерел\n" -" gencaches - побудувати обидва кеша пакунків - бінарних і з вихідними " -"текстами\n" -" showpkg - загальна інформація про конкретний пакунок\n" -" stats - основна статистика\n" -" dump - показати весь файл у стислій формі\n" -" dumpavail - видати на stdout список доступних пакунків\n" -" unmet - показати незадоволені залежності\n" -" search - знайти пакунки, назва яких задовольняє регулярний вираз\n" -" show - показати інформацію про пакунок в зрозумілій формі\n" -" depends - показати інформацію про залежності пакунка построково\n" -" rdepends - показати інформацію про зворотні залежності пакунка\n" -" pkgnames - показати імена всіх пакунків\n" -" dotty - генерувати граф залежностей пакунків у форматі GraphVis\n" -" xvcg - генерувати граф залежностей пакунків у форматі xvcg\n" -" policy - показати поточну політику вибору пакунків\n" -"\n" -"Опції:\n" -" -h Цей текст.\n" -" -p=? Кеш пакунків.\n" -" -s=? Кеш джерел.\n" -" -q Не показувати індикатор прогресу.\n" -" -i Показувати тільки важливі залежності для команди unmet.\n" -" -c=? Читати зазначений файл конфігурації.\n" -" -o=? Встановити довільну опцію конфігурації, наприклад, -o dir::cache=/" -"tmp\n" -"Подробиці в сторінках керівництва apt-cache(8) і apt.conf(5).\n" +#: methods/ftp.cc:779 +msgid "Unable to send PORT command" +msgstr "Неможливо відіслати команду PORT" -#: cmdline/apt-cdrom.cc:78 -msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "Задайте назву для цього диска, наприклад 'Debian 2.1r1 Disk 1'" +#: methods/ftp.cc:789 +#, c-format +msgid "Unknown address family %u (AF_*)" +msgstr "Невідоме адресове сімейство %u (AF_*)" -#: cmdline/apt-cdrom.cc:93 -msgid "Please insert a Disc in the drive and press enter" -msgstr "Вставте диск у пристрій і натисніть Ввід" +#: methods/ftp.cc:798 +#, c-format +msgid "EPRT failed, server said: %s" +msgstr "EPRT невдало, сервер мовив: %s" -#: cmdline/apt-cdrom.cc:117 -msgid "Repeat this process for the rest of the CDs in your set." -msgstr "Повторіть цей процес для інших наявних CD." +#: methods/ftp.cc:818 +msgid "Data socket connect timed out" +msgstr "Час з'єднання з сокетом даних вичерпався" -#: cmdline/apt-config.cc:41 -msgid "Arguments not in pairs" -msgstr "Непарні аргументи" +#: methods/ftp.cc:825 +msgid "Unable to accept connection" +msgstr "Неможливо прийняти з'єднання" -#: cmdline/apt-config.cc:76 -msgid "" -"Usage: apt-config [options] command\n" -"\n" -"apt-config is a simple tool to read the APT config file\n" -"\n" -"Commands:\n" -" shell - Shell mode\n" -" dump - Show the configuration\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Використання: apt-config [options] command\n" -"\n" -"apt-config - простий інструмент для читання конфігураційного файлу APT\n" -"\n" -"Команди:\n" -" shell - режим shell\n" -" dump - показати конфігурацію\n" -"\n" -"Опції:\n" -" -h Цей текст.\n" -" -с=? Читати зазначений конфігураційний файл.\n" -" -o=? Встановити довільну опцію, наприклад, -o dir::cache=/tmp\n" +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 +msgid "Problem hashing file" +msgstr "Проблема хешування файла" -#: cmdline/apt-extracttemplates.cc:98 +#: methods/ftp.cc:877 #, c-format -msgid "%s not a valid DEB package." -msgstr "%s не є правильним DEB-пакунком." - -#: cmdline/apt-extracttemplates.cc:232 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Використання: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates витягує з пакунків Debian конфігураційні скрипти\n" -"і файли-шаблони\n" -"\n" -"Опції:\n" -" -h Цей текст\n" -" -t Встановити теку для тимчасових файлів\n" -" -c=? Читати зазначений конфігураційний файл\n" -" -o=? Вказати довільну опцію, наприклад, -o dir::cache=/tmp\n" - -#: cmdline/apt-extracttemplates.cc:310 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Неможливо визначити версію debconf. Він встановлений?" +msgid "Unable to fetch file, server said '%s'" +msgstr "Неможливо завантажити файл, сервер мовив: '%s'" -#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 -msgid "Package extension list is too long" -msgstr "Список розширень, припустимих для пакунків, занадто довгий" +#: methods/ftp.cc:892 methods/rsh.cc:322 +msgid "Data socket timed out" +msgstr "Час з'єднання з сокетом (socket) з даними вичерпався" -#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 -#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 -#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 +#: methods/ftp.cc:922 #, c-format -msgid "Error processing directory %s" -msgstr "Помилка обробки течи %s" +msgid "Data transfer failed, server said '%s'" +msgstr "Передача даних обірвалася, сервер мовив '%s'" -#: ftparchive/apt-ftparchive.cc:251 -msgid "Source extension list is too long" -msgstr "" -"Список розширень, припустимих для пакунків з вихідними текстами, занадто " -"довгий" +#. Get the files information +#: methods/ftp.cc:997 +msgid "Query" +msgstr "Черга" -#: ftparchive/apt-ftparchive.cc:368 -msgid "Error writing header to contents file" -msgstr "Помилка запису заголовка в повний перелік вмісту пакунків (Contents)" +#: methods/ftp.cc:1109 +msgid "Unable to invoke " +msgstr "Неможливо викликати " -#: ftparchive/apt-ftparchive.cc:398 +#: methods/connect.cc:65 #, c-format -msgid "Error processing contents %s" -msgstr "помилка обробки повного переліку вмісту пакунків (Contents) %s" - -#: ftparchive/apt-ftparchive.cc:553 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"Використання: apt-ftparchive [параметри] команда\n" -"Команди: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive генерує індексні файли архівів Debian. Він підтримує\n" -"безліч стилів генерації: від повністю автоматичного до функціональної " -"заміни\n" -"програм dpkg-scanpackages і dpkg-scansources\n" -"\n" -"apt-ftparchive генерує файли Package (переліки пакунків) для дерева\n" -"тек, що містять файли .deb. Файл Package містить у собі керуючі\n" -"поля кожного пакунка, а також хеш MD5 і розмір файлу. Значення керуючих\n" -"полів \"пріоритет\" (Priority) і \"секція\" (Section) можуть бути змінені з\n" -"допомогою файлу override.\n" -"\n" -"Крім того, apt-ftparchive може генерувати файли Sources з дерева\n" -"тек, що містять файли .dsc. Для вказівки файлу override у цьому \n" -"режимі можна використати параметр --source-override.\n" -"\n" -"Команди 'packages' і 'sources' треба виконувати, перебуваючи в кореневій " -"теці\n" -"дерева, що ви хочете обробити. BinaryPath повинен вказувати на місце,\n" -"з якого починається рекурсивний обхід, а файл перепризначень (override)\n" -"повинен містити запис про перепризначення керуючих полів. Якщо був " -"зазначений\n" -"Pathprefix, то його значення додається до керуючих полів, що містять\n" -"імена файлів. Приклад використання для архіву Debian:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Параметри:\n" -" -h Цей текст\n" -" --md5 Керування генерацією MD5-хешів\n" -" -s=? Вказати файл перепризначень (override) для пакунків з вихідними " -"текстами\n" -" -q Не виводити повідомлення в процесі роботи\n" -" -d=? Вказати кешуючу базу даних (не обов'язково)\n" -" --no-delink Включити режим налагодження процесу видалення файлів\n" -" --contents Керування генерацією повного переліку вмісту пакунків\n" -" (файлу Contents)\n" -" -c=? Використати зазначений конфігураційний файл\n" -" -o=? Вказати довільний параметр конфігурації" +msgid "Connecting to %s (%s)" +msgstr "З'єднання з %s (%s)" -#: ftparchive/apt-ftparchive.cc:759 -msgid "No selections matched" -msgstr "Збігів не виявлено" +#: methods/connect.cc:72 +#, c-format +msgid "[IP: %s %s]" +msgstr "[IP: %s %s]" -#: ftparchive/apt-ftparchive.cc:832 +#: methods/connect.cc:79 #, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "У групі пакунків '%s' відсутні деякі файли" +msgid "Could not create a socket for %s (f=%u t=%u p=%u)" +msgstr "Неможливо створити сокет для %s (f=%u t=%u p=%u)" -#: ftparchive/cachedb.cc:43 +#: methods/connect.cc:85 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "БД була пошкоджена, файл перейменований в %s.old" +msgid "Cannot initiate the connection to %s:%s (%s)." +msgstr "Неможливо ініціалізувати з'єднання з %s:%s (%s)." -#: ftparchive/cachedb.cc:61 +#: methods/connect.cc:92 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "DB застаріла, намагаюсь оновити %s" +msgid "Could not connect to %s:%s (%s), connection timed out" +msgstr "Неможливо з'єднатися з %s:%s (%s), час з'єднання вичерпався" -#: ftparchive/cachedb.cc:72 -msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " -"remove and re-create the database." -msgstr "" -"Формати DB не є правильним. Якщо ви оновилися зі старої версії apt, будь-" -"ласка видаліть і наново створіть базу." +#: methods/connect.cc:107 +#, c-format +msgid "Could not connect to %s:%s (%s)." +msgstr "Не можливо під'єднатися до %s:%s (%s)." -#: ftparchive/cachedb.cc:77 +#. We say this mainly because the pause here is for the +#. ssh connection that is still going +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Не вдалося відкрити DB файл %s: %s" +msgid "Connecting to %s" +msgstr "З'єднання з %s" -#: ftparchive/cachedb.cc:238 -msgid "Archive has no control record" -msgstr "В архіві немає поля control" +#: methods/connect.cc:167 +#, c-format +msgid "Could not resolve '%s'" +msgstr "Не можу знайти IP адрес для %s" -#: ftparchive/cachedb.cc:444 -msgid "Unable to get a cursor" -msgstr "Неможливо одержати курсор" +#: methods/connect.cc:173 +#, c-format +msgid "Temporary failure resolving '%s'" +msgstr "Тимчасова помилка при отриманні IP адреси '%s'" -#: ftparchive/writer.cc:76 +#: methods/connect.cc:176 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "W: Не вдалося прочитати теку %s\n" +msgid "Something wicked happened resolving '%s:%s' (%i)" +msgstr "Сталося щось дивне при спробі отримати IP адрес для '%s:%s' (%i)" -#: ftparchive/writer.cc:81 +#: methods/connect.cc:223 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "W: Неможливо прочитати атрибути %s\n" +msgid "Unable to connect to %s %s:" +msgstr "Не можливо під'єднатися до %s %s:" -#: ftparchive/writer.cc:132 -msgid "E: " -msgstr "E: " +#: methods/gpgv.cc:65 +#, fuzzy, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Неможливо отримати доступ до keyring: '%s'" -#: ftparchive/writer.cc:134 -msgid "W: " -msgstr "W: " +#: methods/gpgv.cc:101 +msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." +msgstr "" +"E: Перелік аргументів з Acquire::gpgv::Options занадто довгий. Відміна." -#: ftparchive/writer.cc:141 -msgid "E: Errors apply to file " -msgstr "E: Помилки відносяться до файлу" +#: methods/gpgv.cc:205 +msgid "" +"Internal error: Good signature, but could not determine key fingerprint?!" +msgstr "" +"Внутрішня помилка: Вірний підпис (signature), але не можливо визначити його " +"відбиток?!" -#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 +#: methods/gpgv.cc:210 +msgid "At least one invalid signature was encountered." +msgstr "Знайдено як мінімум один невірний підпис." + +#: methods/gpgv.cc:214 #, c-format -msgid "Failed to resolve %s" -msgstr "Не вдалося піти по посиланню %s" +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgstr "Неможливо виконати '%s' для перевірки підпису, gnupg встановлено?" -#: ftparchive/writer.cc:170 -msgid "Tree walking failed" -msgstr "Не вдалося зробити обхід дерева" +#: methods/gpgv.cc:219 +msgid "Unknown error executing gpgv" +msgstr "Невідома помилка виконання gpgv" -#: ftparchive/writer.cc:195 +#: methods/gpgv.cc:250 +msgid "The following signatures were invalid:\n" +msgstr "Слідуючі підписи були невірними:\n" + +#: methods/gpgv.cc:257 +msgid "" +"The following signatures couldn't be verified because the public key is not " +"available:\n" +msgstr "" +"Слідуючі підписи не можуть бути перевірені, тому що, публічний ключ " +"відсутній:\n" + +#: methods/gzip.cc:64 #, c-format -msgid "Failed to open %s" -msgstr "Не вдалося відкрити %s" +msgid "Couldn't open pipe for %s" +msgstr "Неможливо відкрити канал (pipe) для %s" -#: ftparchive/writer.cc:254 +#: methods/gzip.cc:109 #, c-format -msgid " DeLink %s [%s]\n" -msgstr "DeLink %s [%s]\n" +msgid "Read error from %s process" +msgstr "Помилка читання з процесу %s" -#: ftparchive/writer.cc:262 +#: methods/http.cc:376 +msgid "Waiting for headers" +msgstr "Очікування на заголовки" + +#: methods/http.cc:522 #, c-format -msgid "Failed to readlink %s" -msgstr "Не вдалося прочитати посилання %s" +msgid "Got a single header line over %u chars" +msgstr "Отримано одну заголовкову лінію понад %u символів" -#: ftparchive/writer.cc:266 +#: methods/http.cc:530 +msgid "Bad header line" +msgstr "Невірна лінія заголовку" + +#: methods/http.cc:549 methods/http.cc:556 +msgid "The HTTP server sent an invalid reply header" +msgstr "HTTP сервер відіслав невірний заголовок 'reply'" + +#: methods/http.cc:585 +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "HTTP сервер відіслав невірний заголовок 'Content-Length'" + +#: methods/http.cc:600 +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "HTTP сервер відіслав невірний заголовок 'Content-Length'" + +#: methods/http.cc:602 +msgid "This HTTP server has broken range support" +msgstr "Цей HTTP сервер має поламану підтримку 'range'" + +#: methods/http.cc:626 +msgid "Unknown date format" +msgstr "Невідомий формат дати" + +#: methods/http.cc:773 +msgid "Select failed" +msgstr "Вибір не вдався" + +#: methods/http.cc:778 +msgid "Connection timed out" +msgstr "Час очікування з'єднання вийшов" + +#: methods/http.cc:801 +msgid "Error writing to output file" +msgstr "Помилка запису в вихідний файл" + +#: methods/http.cc:832 +#, fuzzy +msgid "Error writing to file" +msgstr "Помилка запису в файл" + +#: methods/http.cc:860 +#, fuzzy +msgid "Error writing to the file" +msgstr "Помилка запису в файл" + +#: methods/http.cc:874 +msgid "Error reading from server. Remote end closed connection" +msgstr "Помилка читання з сервера. Віддалена сторона закрила з'єднання" + +#: methods/http.cc:876 +msgid "Error reading from server" +msgstr "Помилка читання з сервера" + +#: methods/http.cc:1106 +msgid "Bad header data" +msgstr "Погана заголовкова інформація" + +#: methods/http.cc:1123 methods/http.cc:1178 +msgid "Connection failed" +msgstr "З'єднання не вдалося" + +#: methods/http.cc:1230 +msgid "Internal error" +msgstr "Внутрішня помилка" + +#: apt-pkg/contrib/mmap.cc:80 +msgid "Can't mmap an empty file" +msgstr "Неможливо відобразити в пам'яті пустий файл" + +#: apt-pkg/contrib/mmap.cc:85 #, c-format -msgid "Failed to unlink %s" -msgstr "Не вдалося видалити %s" +msgid "Couldn't make mmap of %lu bytes" +msgstr "Неможливо відобразити в пам'яті %lu байт" -#: ftparchive/writer.cc:273 +#: apt-pkg/contrib/strutl.cc:978 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Не вдалося створити посилання %s на %s" +msgid "Selection %s not found" +msgstr "Вибір %s не знайдено" -#: ftparchive/writer.cc:283 +#: apt-pkg/contrib/configuration.cc:439 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr "Перевищено ліміт в %s в DeLink.\n" +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Нерозпізнаваний тип абревіатури: '%c'" -#: ftparchive/writer.cc:387 -msgid "Archive had no package field" -msgstr "В архіві немає поля package" +#: apt-pkg/contrib/configuration.cc:497 +#, c-format +msgid "Opening configuration file %s" +msgstr "Відкривається конфігураційний файл %s" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: apt-pkg/contrib/configuration.cc:515 +#, fuzzy, c-format +msgid "Line %d too long (max %u)" +msgstr "Лінія %d занадто довга (максимум %d)" + +#: apt-pkg/contrib/configuration.cc:611 #, c-format -msgid " %s has no override entry\n" -msgstr " Відсутній запис про перепризначення для %s\n" +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "Синтаксова помилка %s:%u: Блок починається без назви." -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: apt-pkg/contrib/configuration.cc:630 #, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " пакунок %s супроводжує %s, а не %s\n" +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Синтаксова помилка %s:%u: спотворений тег" -#: ftparchive/writer.cc:620 +#: apt-pkg/contrib/configuration.cc:647 #, c-format -msgid " %s has no source override entry\n" +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "Синтаксова помилка %s:%u: зайві символи після величини" + +#: apt-pkg/contrib/configuration.cc:687 +#, fuzzy, c-format +msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" +"Синтаксова помилка %s:%u: Директиви можуть бути виконані тільки на " +"найвищому рівні" -#: ftparchive/writer.cc:624 +#: apt-pkg/contrib/configuration.cc:694 #, c-format -msgid " %s has no binary override entry either\n" -msgstr "" +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "Синтаксова помилка %s:%u: Забагато вмонтованих включень" -#: ftparchive/contents.cc:317 +#: apt-pkg/contrib/configuration.cc:698 apt-pkg/contrib/configuration.cc:703 #, c-format -msgid "Internal error, could not locate member %s" -msgstr "Внутрішня помилка, не можу знайти складову частину %s" +msgid "Syntax error %s:%u: Included from here" +msgstr "Синтаксова помилка %s:%u: Включена звідси" -#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - не вдалося виділити пам'ять" +#: apt-pkg/contrib/configuration.cc:707 +#, c-format +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "Синтаксова помилка %s:%u: Директива '%s' не підтримується" -#: ftparchive/override.cc:34 ftparchive/override.cc:142 +#: apt-pkg/contrib/configuration.cc:741 #, c-format -msgid "Unable to open %s" -msgstr "Не вдалося відкрити %s" +msgid "Syntax error %s:%u: Extra junk at end of file" +msgstr "Синтаксова помилка %s:%u: зайві символи в кінці файла" -#: ftparchive/override.cc:60 ftparchive/override.cc:166 +#: apt-pkg/contrib/progress.cc:153 #, c-format -msgid "Malformed override %s line %lu #1" -msgstr "Спотворений запис про перепризначення (override) %s на рядку %lu #1" +msgid "%c%s... Error!" +msgstr "%c%s... Помилка!" -#: ftparchive/override.cc:74 ftparchive/override.cc:178 +#: apt-pkg/contrib/progress.cc:155 #, c-format -msgid "Malformed override %s line %lu #2" -msgstr "Спотворений запис про перепризначення (override) %s на рядку %lu #2" +msgid "%c%s... Done" +msgstr "%c%s... Виконано" -#: ftparchive/override.cc:88 ftparchive/override.cc:191 +#: apt-pkg/contrib/cmndline.cc:77 #, c-format -msgid "Malformed override %s line %lu #3" -msgstr "Спотворений запис про перепризначення (override) %s на рядку %lu #3" +msgid "Command line option '%c' [from %s] is not known." +msgstr "Невідомий параметр '%c' [з %s] командного рядка." -#: ftparchive/override.cc:127 ftparchive/override.cc:201 +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 #, c-format -msgid "Failed to read the override file %s" -msgstr "Не вдалося прочитати файл перепризначень (override)%s" +msgid "Command line option %s is not understood" +msgstr "Незрозумілий параметр %s командного рядка" -#: ftparchive/multicompress.cc:71 +#: apt-pkg/contrib/cmndline.cc:124 #, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Невідомий алгоритм стиснення '%s'" +msgid "Command line option %s is not boolean" +msgstr "Не логічний параметр %s командного рядка" -#: ftparchive/multicompress.cc:101 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format -msgid "Compressed output %s needs a compression set" -msgstr "Для отримання стиснутого виводу %s необхідно ввімкнути пакування" - -#: ftparchive/multicompress.cc:194 -msgid "Failed to create FILE*" -msgstr "Не вдалося створити FILE*" +msgid "Option %s requires an argument." +msgstr "Параметр %s потребує аргумента." -#: ftparchive/multicompress.cc:197 -msgid "Failed to fork" -msgstr "Не вдалося виконати породжений процес" +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 +#, c-format +msgid "Option %s: Configuration item specification must have an =." +msgstr "" -#: ftparchive/multicompress.cc:211 -msgid "Compress child" -msgstr "Процес-нащадок, що виконує пакування" +#: apt-pkg/contrib/cmndline.cc:234 +#, c-format +msgid "Option %s requires an integer argument, not '%s'" +msgstr "Параметр %s потребує integer аргумент, але не '%s'" -#: ftparchive/multicompress.cc:234 +#: apt-pkg/contrib/cmndline.cc:265 #, c-format -msgid "Internal error, failed to create %s" -msgstr "Внутрішня помилка, не вдалося створити %s" +msgid "Option '%s' is too long" +msgstr "Параметр '%s' занадто довгий" -#: ftparchive/multicompress.cc:285 -msgid "Failed to create subprocess IPC" -msgstr "Не вдалося створити IPC з породженим процесом" +#: apt-pkg/contrib/cmndline.cc:298 +#, c-format +msgid "Sense %s is not understood, try true or false." +msgstr "Незрозумілий вираз %s , спробуйте true чи false." -#: ftparchive/multicompress.cc:320 -msgid "Failed to exec compressor " -msgstr "Не вдалося виконати компресор " +#: apt-pkg/contrib/cmndline.cc:348 +#, c-format +msgid "Invalid operation %s" +msgstr "Невірна дія %s" -#: ftparchive/multicompress.cc:359 -msgid "decompressor" -msgstr "декомпресор" +#: apt-pkg/contrib/cdromutl.cc:52 +#, c-format +msgid "Unable to stat the mount point %s" +msgstr "Неможливо прочитати атрибути точки монтування %s" -#: ftparchive/multicompress.cc:402 -msgid "IO to subprocess/file failed" -msgstr "Помилка уведення/виводу в підпроцес/файл" +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 +#, c-format +msgid "Unable to change to %s" +msgstr "Неможливо зробити зміни у %s" -#: ftparchive/multicompress.cc:454 -msgid "Failed to read while computing MD5" -msgstr "Помилка читання під час обчислення MD5" +#: apt-pkg/contrib/cdromutl.cc:187 +msgid "Failed to stat the cdrom" +msgstr "Не вдалося прочитати атрибути cdrom" -#: ftparchive/multicompress.cc:471 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format -msgid "Problem unlinking %s" -msgstr "Не вдалося видалити %s" +msgid "Not using locking for read only lock file %s" +msgstr "" +"Блокування не використовується, так як файл блокування %s доступний тільки " +"для читання" -#: cmdline/apt-get.cc:121 -msgid "Y" -msgstr "Т" +#: apt-pkg/contrib/fileutl.cc:152 +#, c-format +msgid "Could not open lock file %s" +msgstr "Не можливо відкрити lock файл %s" -#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format -msgid "Regex compilation error - %s" -msgstr "Помилка компіляції регулярного виразу - %s" +msgid "Not using locking for nfs mounted lock file %s" +msgstr "" +"Блокування не використовується, так як файл блокування %s знаходиться на " +"файловій системі nfs" -#: cmdline/apt-get.cc:238 -msgid "The following packages have unmet dependencies:" -msgstr "Пакунки, що мають незадоволені залежності:" +#: apt-pkg/contrib/fileutl.cc:174 +#, fuzzy, c-format +msgid "Could not get lock %s" +msgstr "Не можливо отримати lock %s" -#: cmdline/apt-get.cc:328 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format -msgid "but %s is installed" -msgstr "але %s вже встановлений" +msgid "Waited for %s but it wasn't there" +msgstr "Очікується на %s але його тут немає" -#: cmdline/apt-get.cc:330 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format -msgid "but %s is to be installed" -msgstr "але %s буде встановлений" +msgid "Sub-process %s received a segmentation fault." +msgstr "Підпроцес %s отримав segmentation fault." -#: cmdline/apt-get.cc:337 -msgid "but it is not installable" -msgstr "але він не може бути встановлений" +#: apt-pkg/contrib/fileutl.cc:455 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "Підпроцес %s повернув код помилки (%u)" -#: cmdline/apt-get.cc:339 -msgid "but it is a virtual package" -msgstr "але це віртуальний пакунок" +#: apt-pkg/contrib/fileutl.cc:457 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "Підпроцес %s раптово завершився" -#: cmdline/apt-get.cc:342 -msgid "but it is not installed" -msgstr "але він не встановлений" +#: apt-pkg/contrib/fileutl.cc:501 +#, c-format +msgid "Could not open file %s" +msgstr "Не можливо відкрити файл %s" -#: cmdline/apt-get.cc:342 -msgid "but it is not going to be installed" -msgstr "але він не буде встановлений" +#: apt-pkg/contrib/fileutl.cc:557 +#, c-format +msgid "read, still have %lu to read but none left" +msgstr "" +"помилка при читанні. мали прочитати ще %lu байт, але нічого більше нема" -#: cmdline/apt-get.cc:347 -msgid " or" -msgstr " чи" +#: apt-pkg/contrib/fileutl.cc:587 +#, c-format +msgid "write, still have %lu to write but couldn't" +msgstr "помилка при записі, мали прочитати ще %lu байт, але не змогли" -#: cmdline/apt-get.cc:376 -msgid "The following NEW packages will be installed:" -msgstr "НОВІ пакунки, які будуть встановлені:" +#: apt-pkg/contrib/fileutl.cc:662 +msgid "Problem closing the file" +msgstr "Проблема з закриттям файла" -#: cmdline/apt-get.cc:402 -msgid "The following packages will be REMOVED:" -msgstr "Пакунки, які будуть ВИДАЛЕНІ:" +#: apt-pkg/contrib/fileutl.cc:668 +msgid "Problem unlinking the file" +msgstr "Проблема з роз'єднанням файла" -#: cmdline/apt-get.cc:424 -msgid "The following packages have been kept back:" -msgstr "Пакунки, які будуть залишені в незмінному вигляді:" +#: apt-pkg/contrib/fileutl.cc:679 +msgid "Problem syncing the file" +msgstr "Проблема з синхронізацією файла" -#: cmdline/apt-get.cc:445 -msgid "The following packages will be upgraded:" -msgstr "Пакунки, які будуть ОНОВЛЕНІ:" +#: apt-pkg/pkgcache.cc:132 +msgid "Empty package cache" +msgstr "Кеш пакунків пустий" -#: cmdline/apt-get.cc:466 -msgid "The following packages will be DOWNGRADED:" -msgstr "Пакунки, будуть замінені на більш СТАРІ версії:" +#: apt-pkg/pkgcache.cc:138 +msgid "The package cache file is corrupted" +msgstr "Файл кешу пакунків пошкоджений" -#: cmdline/apt-get.cc:486 -msgid "The following held packages will be changed:" -msgstr "Пакунки, які повинні були б залишитися без змін, але будуть замінені:" +#: apt-pkg/pkgcache.cc:143 +msgid "The package cache file is an incompatible version" +msgstr "Файл кешу пакунків має несумісну версію" -#: cmdline/apt-get.cc:539 +#: apt-pkg/pkgcache.cc:148 #, c-format -msgid "%s (due to %s) " -msgstr "%s (внаслідок %s) " +msgid "This APT does not support the versioning system '%s'" +msgstr "APT не підтримує систему призначення версій '%s'" -#: cmdline/apt-get.cc:547 -msgid "" -"WARNING: The following essential packages will be removed.\n" -"This should NOT be done unless you know exactly what you are doing!" -msgstr "" -"УВАГА: Ці істотно важливі пакунки будуть вилучені.\n" -"НЕ РОБІТЬ цього, якщо ви НЕ уявляєте собі всі можливі наслідки!" +#: apt-pkg/pkgcache.cc:153 +msgid "The package cache was built for a different architecture" +msgstr "Кеш пакунків був побудований для іншої архітектури" -#: cmdline/apt-get.cc:578 -#, c-format -msgid "%lu upgraded, %lu newly installed, " -msgstr "оновлено %lu, встановлено %lu нових пакунків, " +#: apt-pkg/pkgcache.cc:224 +msgid "Depends" +msgstr "Залежності (Depends)" -#: cmdline/apt-get.cc:582 -#, c-format -msgid "%lu reinstalled, " -msgstr " %lu перевстановлено, " +#: apt-pkg/pkgcache.cc:224 +msgid "PreDepends" +msgstr "Пре-Залежності (PreDepends)" -#: cmdline/apt-get.cc:584 -#, c-format -msgid "%lu downgraded, " -msgstr "%lu пакунків замінено на старі версії, " +#: apt-pkg/pkgcache.cc:224 +msgid "Suggests" +msgstr "Пропонує (Suggests)" -#: cmdline/apt-get.cc:586 -#, c-format -msgid "%lu to remove and %lu not upgraded.\n" -msgstr "для видалення відмічено %lu пакунків, і %lu пакунків не оновлено.\n" +#: apt-pkg/pkgcache.cc:225 +msgid "Recommends" +msgstr "Рекомендує" -#: cmdline/apt-get.cc:590 -#, c-format -msgid "%lu not fully installed or removed.\n" -msgstr "не встановлено до кінця чи видалено %lu пакунків.\n" +#: apt-pkg/pkgcache.cc:225 +msgid "Conflicts" +msgstr "Конфлікти" -#: cmdline/apt-get.cc:664 -msgid "Correcting dependencies..." -msgstr "Виправлення залежностей..." +#: apt-pkg/pkgcache.cc:225 +msgid "Replaces" +msgstr "Заміняє (Replaces)" -#: cmdline/apt-get.cc:667 -msgid " failed." -msgstr " невдача." +#: apt-pkg/pkgcache.cc:226 +msgid "Obsoletes" +msgstr "Застарілі (Obsoletes)" -#: cmdline/apt-get.cc:670 -msgid "Unable to correct dependencies" -msgstr "Неможливо скоригувати залежності" +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "" -#: cmdline/apt-get.cc:673 -msgid "Unable to minimize the upgrade set" -msgstr "Неможливо мінімізувати набір оновлень" +#: apt-pkg/pkgcache.cc:237 +msgid "important" +msgstr "Важливі (Important)" -#: cmdline/apt-get.cc:675 -msgid " Done" -msgstr " Виконано" +#: apt-pkg/pkgcache.cc:237 +msgid "required" +msgstr "Необхідні (Required)" -#: cmdline/apt-get.cc:679 -msgid "You might want to run `apt-get -f install' to correct these." -msgstr "" -"Можливо, для виправлення цих помилок ви захочете скористатися 'apt-get -f " -"install'." +#: apt-pkg/pkgcache.cc:237 +msgid "standard" +msgstr "Стандартні (Standard)" -#: cmdline/apt-get.cc:682 -msgid "Unmet dependencies. Try using -f." -msgstr "Незадоволені залежності. Спробуйте використати -f." +#: apt-pkg/pkgcache.cc:238 +msgid "optional" +msgstr "Необов'язкові (Optional)" -#: cmdline/apt-get.cc:704 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "УВАГА: Наступні пакунки неможливо автентифікувати!" +#: apt-pkg/pkgcache.cc:238 +msgid "extra" +msgstr "Додаткові (Extra)" -#: cmdline/apt-get.cc:708 -msgid "Authentication warning overridden.\n" -msgstr "Автентифікаційне попередження не прийнято до уваги.\n" +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 +msgid "Building dependency tree" +msgstr "Побудова дерева залежностей" + +#: apt-pkg/depcache.cc:122 +msgid "Candidate versions" +msgstr "Версії кандидатів" -#: cmdline/apt-get.cc:715 -msgid "Install these packages without verification [y/N]? " -msgstr "Встановити ці пакунки без перевірки [т/Н]? " +#: apt-pkg/depcache.cc:151 +msgid "Dependency generation" +msgstr "Ґенерація залежностей" -#: cmdline/apt-get.cc:717 -msgid "Some packages could not be authenticated" -msgstr "Деякі пакунки неможливо автентифікувати" +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +#, fuzzy +msgid "Reading state information" +msgstr "Об'єднання інформації про доступні пакунки" -#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 -msgid "There are problems and -y was used without --force-yes" -msgstr "Існують проблеми, а опція -y використана без --force-yes" +#: apt-pkg/depcache.cc:219 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Не вдалося відкрити %s" -#: cmdline/apt-get.cc:770 -msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" -"Внутрішня помилка, InstallPackages була викликана з непрацездатними " -"пакунками!" +#: apt-pkg/depcache.cc:225 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Не вдалося записати файл %s" -#: cmdline/apt-get.cc:779 -msgid "Packages need to be removed but remove is disabled." -msgstr "Пакунки необхідно видалити, але видалення заборонене." +#: apt-pkg/tagfile.cc:102 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Неможливо обробити файл %s пакунку (1)" -#: cmdline/apt-get.cc:790 -msgid "Internal error, Ordering didn't finish" -msgstr "Внутрішня помилка, Ordering не завершилася" +#: apt-pkg/tagfile.cc:189 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Неможливо обробити файл %s пакунку (2)" -#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2012 cmdline/apt-get.cc:2045 -msgid "Unable to lock the download directory" -msgstr "Неможливо заблокувати теку для завантаження" +#: apt-pkg/sourcelist.cc:90 +#, c-format +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Спотворена лінія %lu у переліку джерел %s (проблема в URI)" -#: cmdline/apt-get.cc:831 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "Дивно.. Розбіжність розмірів, напишіть на apt@packages.debian.org" +#: apt-pkg/sourcelist.cc:92 +#, c-format +msgid "Malformed line %lu in source list %s (dist)" +msgstr "" +"Спотворена лінія %lu у переліку джерел %s (проблема в назві дистрибутиву)" -#: cmdline/apt-get.cc:836 +#: apt-pkg/sourcelist.cc:95 #, c-format -msgid "Need to get %sB/%sB of archives.\n" -msgstr "Необхідно завантажити %sB/%sB архівів.\n" +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "Спотворена лінія %lu у переліку джерел %s (обробка URI)" -#: cmdline/apt-get.cc:839 +#: apt-pkg/sourcelist.cc:101 #, c-format -msgid "Need to get %sB of archives.\n" -msgstr "Необхідно завантажити %sB архівів.\n" +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "Спотворена лінія %lu у переліку джерел %s (absolute dist)" -#: cmdline/apt-get.cc:844 +#: apt-pkg/sourcelist.cc:108 #, c-format -msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Після розпакування об'єм зайнятого дискового простору зросте на %sB.\n" +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "Спотворена лінія %lu у переліку джерел %s (dist parse)" -#: cmdline/apt-get.cc:847 +#: apt-pkg/sourcelist.cc:199 #, c-format -msgid "After unpacking %sB disk space will be freed.\n" -msgstr "" -"Після розпакування об'єм зайнятого дискового простору зменшиться на %sB.\n" +msgid "Opening %s" +msgstr "Відкриття %s" -#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2188 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format -msgid "Couldn't determine free space in %s" -msgstr "Не вдалося визначити кількість вільного місця в %s" +msgid "Line %u too long in source list %s." +msgstr "Лінія %u занадто довга в переліку джерел %s." -#: cmdline/apt-get.cc:864 +#: apt-pkg/sourcelist.cc:236 #, c-format -msgid "You don't have enough free space in %s." -msgstr "Недостатньо вільного місця в %s." +msgid "Malformed line %u in source list %s (type)" +msgstr "Спотворена лінія %u у переліку джерел %s (тип)" -#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 -msgid "Trivial Only specified but this is not a trivial operation." -msgstr "" -"Запитане виконання тільки тривіальних операцій, але це не тривіальна " -"операція." +#: apt-pkg/sourcelist.cc:240 +#, c-format +msgid "Type '%s' is not known on line %u in source list %s" +msgstr "Невідомий тип '%s' в лінії %u в переліку джерел %s" -#: cmdline/apt-get.cc:881 -msgid "Yes, do as I say!" -msgstr "Так, робити, як я скажу!" +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 +#, c-format +msgid "Malformed line %u in source list %s (vendor id)" +msgstr "Спотворена лінія %u у переліку джерел %s (vendor id)" -#: cmdline/apt-get.cc:883 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -"Те, що ви хочете зробити, може мати небажані наслідки.\n" -"Щоб продовжити, введіть фразу: '%s'\n" -" ?] " - -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 -msgid "Abort." -msgstr "Перервано." +"Для виконання даного встановлення потрібне тимчасове видалення важливого " +"пакету %s через конфлікти/петлеві пре-залежності (Pre-Depends loop). Це " +"погано, але якщо Ви дійсно бажаєте зробити це, активуйте параметр APT::Force-" +"LoopBreak." -#: cmdline/apt-get.cc:904 -msgid "Do you want to continue [Y/n]? " -msgstr "Бажаєте продовжити [Т/н]? " +#: apt-pkg/pkgrecords.cc:32 +#, c-format +msgid "Index file type '%s' is not supported" +msgstr "Тип '%s' індексного файлу не підтримується" -#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2231 +#: apt-pkg/algorithms.cc:247 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Не вдалося завантажити %s %s\n" +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"Пакунок %s повинен бути перевстановленим, але я не можу знайти архіву для " +"нього." -#: cmdline/apt-get.cc:994 -msgid "Some files failed to download" -msgstr "Деякі файли не вдалося завантажити" +#: apt-pkg/algorithms.cc:1105 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Помилка, pkgProblemResolver::Resolve згенерував зупинку, це може бути " +"пов'язано з зафіксованими пакунками." -#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2240 -msgid "Download complete and in download only mode" -msgstr "Вказано режим \"тільки завантаження\", і завантаження завершено" +#: apt-pkg/algorithms.cc:1107 +msgid "Unable to correct problems, you have held broken packages." +msgstr "Неможливо усунути проблеми, Ви маєте поламані зафіксовані пакунки." -#: cmdline/apt-get.cc:1001 +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." msgstr "" -"Неможливо завантажити деякі архіви, імовірно треба виконати apt-get update " -"або спробувати повторити запуск з ключем --fix-missing?" +"Деякі індексні файли не завантажилися, вони були зігноровані або замість них " +"були використані старі версії." -#: cmdline/apt-get.cc:1005 -msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing і зміна носія в даний момент не підтримується" +#: apt-pkg/acquire.cc:59 +#, c-format +msgid "Lists directory %spartial is missing." +msgstr "Lists тека %spartial відсутня." -#: cmdline/apt-get.cc:1010 -msgid "Unable to correct missing packages." -msgstr "Неможливо виправити втрачені пакунки." +#: apt-pkg/acquire.cc:63 +#, c-format +msgid "Archive directory %spartial is missing." +msgstr "Архівна тека %spartial відсутня." -#: cmdline/apt-get.cc:1011 -msgid "Aborting install." -msgstr "Переривається встановлення." +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:827 +#, fuzzy, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Завантажується файл %li з %li (%s залишилось)" + +#: apt-pkg/acquire.cc:829 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "Завантажується файл %li з %li" -#: cmdline/apt-get.cc:1045 +#: apt-pkg/acquire-worker.cc:110 #, c-format -msgid "Note, selecting %s instead of %s\n" -msgstr "Помітьте, замість %2$s вибирається %1$s\n" +msgid "The method driver %s could not be found." +msgstr "Драйвер для метода %s не знайдено." -#: cmdline/apt-get.cc:1055 +#: apt-pkg/acquire-worker.cc:159 #, c-format -msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgid "Method %s did not start correctly" +msgstr "Метод %s не стартував коректно" + +#: apt-pkg/acquire-worker.cc:399 +#, c-format +msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -"Пропускається %s - пакунок вже встановлений, і опція upgrade не " -"встановлена.\n" +"Будь-ласка, вставте диск з поміткою: '%s' в CD привід '%s' і натисніть Enter." -#: cmdline/apt-get.cc:1073 +#: apt-pkg/init.cc:125 #, c-format -msgid "Package %s is not installed, so not removed\n" -msgstr "Пакунок %s не встановлений, тому не може бути видалений\n" +msgid "Packaging system '%s' is not supported" +msgstr "Система пакування '%s' не підтримується" + +#: apt-pkg/init.cc:141 +msgid "Unable to determine a suitable packaging system type" +msgstr "Неможливо визначити тип необхідної системи пакування " -#: cmdline/apt-get.cc:1084 +#: apt-pkg/clean.cc:57 #, c-format -msgid "Package %s is a virtual package provided by:\n" -msgstr "Пакунок %s - віртуальний, його функції надаються пакунками:\n" +msgid "Unable to stat %s." +msgstr "Неможливо прочитати атрибути %s." -#: cmdline/apt-get.cc:1096 -msgid " [Installed]" -msgstr " [Встановлено]" +#: apt-pkg/srcrecords.cc:44 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "Ви повинні записати певні 'source' посилання в твій sources.list" -#: cmdline/apt-get.cc:1101 -msgid "You should explicitly select one to install." -msgstr "Ви повинні явно вказати, який саме ви хочете встановити." +#: apt-pkg/cachefile.cc:71 +msgid "The package lists or status file could not be parsed or opened." +msgstr "Не можу обробити чи відкрити перелік пакунків чи status файл." -#: cmdline/apt-get.cc:1106 +#: apt-pkg/cachefile.cc:75 +msgid "You may want to run apt-get update to correct these problems" +msgstr "Можливо, для виправлення цих помилок Ви захочете запустити apt-get" + +#: apt-pkg/policy.cc:267 +msgid "Invalid record in the preferences file, no Package header" +msgstr "Невірний запис в preferences файлі, відсутній заголовок Package" + +#: apt-pkg/policy.cc:289 #, c-format -msgid "" -"Package %s is not available, but is referred to by another package.\n" -"This may mean that the package is missing, has been obsoleted, or\n" -"is only available from another source\n" -msgstr "" -"Пакунок %s недоступний, але згадується у переліку залежностей іншого " -"пакунка.\n" -"Це може означати, що пакунок відсутній, застарів, або доступний з джерел, не " -"згаданих в sources.list\n" +msgid "Did not understand pin type %s" +msgstr "Не зрозумів тип %s для pin" -#: cmdline/apt-get.cc:1125 -msgid "However the following packages replace it:" -msgstr "Однак наступні пакунки можуть його замінити:" +#: apt-pkg/policy.cc:297 +msgid "No priority (or zero) specified for pin" +msgstr "Не встановлено пріоритету (або встановлено 0) для pin" -#: cmdline/apt-get.cc:1128 +#: apt-pkg/pkgcachegen.cc:72 +msgid "Cache has an incompatible versioning system" +msgstr "Кеш має несумісну систему призначення версій" + +#: apt-pkg/pkgcachegen.cc:115 #, c-format -msgid "Package %s has no installation candidate" -msgstr "Для пакунка %s не знайдені кандидати на встановлення" +msgid "Error occurred while processing %s (NewPackage)" +msgstr "Помилка, яка була викликана внаслідок обробки %s (NewPackage)" -#: cmdline/apt-get.cc:1148 +#: apt-pkg/pkgcachegen.cc:130 #, c-format -msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "Перевстановлення %s неможливе, бо він не може бути завантаженим.\n" +msgid "Error occurred while processing %s (UsePackage1)" +msgstr "Помилка, яка була викликана внаслідок обробки %s (UsePackage1)" + +#: apt-pkg/pkgcachegen.cc:153 +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Помилка, яка була викликана внаслідок обробки %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:178 +#, c-format +msgid "Error occurred while processing %s (UsePackage2)" +msgstr "Помилка, яка була викликана внаслідок обробки %s (UsePackage2)" -#: cmdline/apt-get.cc:1156 +#: apt-pkg/pkgcachegen.cc:182 #, c-format -msgid "%s is already the newest version.\n" -msgstr "Вже встановлена найновіша версія %s.\n" +msgid "Error occurred while processing %s (NewFileVer1)" +msgstr "Помилка, яка була викликана внаслідок обробки %s (NewFileVer1)" -#: cmdline/apt-get.cc:1185 +#: apt-pkg/pkgcachegen.cc:213 #, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Реліз '%s' для '%s' не знайдений" +msgid "Error occurred while processing %s (NewVersion1)" +msgstr "Помилка, яка була викликана внаслідок обробки %s (NewVersion1)" -#: cmdline/apt-get.cc:1187 +#: apt-pkg/pkgcachegen.cc:217 #, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Версія '%s' для '%s' не знайдена" +msgid "Error occurred while processing %s (UsePackage3)" +msgstr "Помилка, яка була викликана внаслідок обробки %s (UsePackage3)" -#: cmdline/apt-get.cc:1193 +#: apt-pkg/pkgcachegen.cc:221 #, c-format -msgid "Selected version %s (%s) for %s\n" -msgstr "Обрана версія %s (%s) для %s\n" - -#: cmdline/apt-get.cc:1330 -msgid "The update command takes no arguments" -msgstr "Команді update не потрібні аргументи" +msgid "Error occurred while processing %s (NewVersion2)" +msgstr "Помилка, яка була викликана внаслідок обробки %s (NewVersion2)" -#: cmdline/apt-get.cc:1343 -msgid "Unable to lock the list directory" -msgstr "Неможливо заблокувати теку з переліками пакунків" +#: apt-pkg/pkgcachegen.cc:245 +#, fuzzy, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "Помилка, яка була викликана внаслідок обробки %s (NewFileVer1)" -#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"Деякі індексні файли не завантажилися, вони були зігноровані або замість них " -"були використані старі версії." +#: apt-pkg/pkgcachegen.cc:251 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "Ви перевищили кількість імен пакунків, які APT може обробити." -#: cmdline/apt-get.cc:1433 -msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "" +#: apt-pkg/pkgcachegen.cc:254 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "Ви перевищили кількість версій, які APT може обробити." -#: cmdline/apt-get.cc:1465 +#: apt-pkg/pkgcachegen.cc:257 #, fuzzy -msgid "" -"The following packages were automatically installed and are no longer " -"required:" -msgstr "НОВІ пакунки, які будуть встановлені:" +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Ви перевищили кількість версій, які APT може обробити." -#: cmdline/apt-get.cc:1467 -msgid "Use 'apt-get autoremove' to remove them." -msgstr "" +#: apt-pkg/pkgcachegen.cc:260 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "Ви перевищили кількість залежностей які APT може обробити." -#: cmdline/apt-get.cc:1472 -msgid "" -"Hmm, seems like the AutoRemover destroyed something which really\n" -"shouldn't happen. Please file a bug report against apt." -msgstr "" +#: apt-pkg/pkgcachegen.cc:288 +#, c-format +msgid "Error occurred while processing %s (FindPkg)" +msgstr "Помилка, яка була викликана внаслідок обробки %s (FindPkg)" -#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1755 -msgid "The following information may help to resolve the situation:" -msgstr "Наступна інформація можливо допоможе Вам:" +#: apt-pkg/pkgcachegen.cc:301 +#, c-format +msgid "Error occurred while processing %s (CollectFileProvides)" +msgstr "Помилка, яка була викликана внаслідок обробки %s (CollectFileProvides)" -#: cmdline/apt-get.cc:1479 -#, fuzzy -msgid "Internal Error, AutoRemover broke stuff" -msgstr "Внутрішня помилка, вирішувач проблем все поламав" +#: apt-pkg/pkgcachegen.cc:307 +#, c-format +msgid "Package %s %s was not found while processing file dependencies" +msgstr "Пакунок %s %s не був знайдений під час обробки залежностей файла" -#: cmdline/apt-get.cc:1498 -msgid "Internal error, AllUpgrade broke stuff" -msgstr "Внутрішня помилка, AllUpgrade все поламав" +#: apt-pkg/pkgcachegen.cc:678 +#, c-format +msgid "Couldn't stat source package list %s" +msgstr "Не вдалося прочитати атрибути переліку вихідних текстів%s" -#: cmdline/apt-get.cc:1545 -#, fuzzy, c-format -msgid "Couldn't find task %s" -msgstr "Не можу знайти пакунок %s" +#: apt-pkg/pkgcachegen.cc:763 +#, fuzzy +msgid "Collecting File Provides" +msgstr "Збирання інформації про файлів " -#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696 -#, c-format -msgid "Couldn't find package %s" -msgstr "Не можу знайти пакунок %s" +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 +msgid "IO Error saving source cache" +msgstr "Помилка IO під час збереження джерельного кешу" -#: cmdline/apt-get.cc:1683 +#: apt-pkg/acquire-item.cc:134 #, c-format -msgid "Note, selecting %s for regex '%s'\n" -msgstr "Помітьте, регулярний вираз %2$s призводить до вибору %1$s\n" +msgid "rename failed, %s (%s -> %s)." +msgstr "Не вдалося перейменувати, %s (%s -> %s)." -#: cmdline/apt-get.cc:1714 -#, fuzzy, c-format -msgid "%s set to manual installed.\n" -msgstr "але %s буде встановлений" +#: apt-pkg/acquire-item.cc:451 +msgid "MD5Sum mismatch" +msgstr "Невідповідність MD5Sum" -#: cmdline/apt-get.cc:1727 -msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "" -"Можливо, для виправлення цих помилок Ви захочете скористатися 'apt-get -f " -"install':" +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 +#, fuzzy +msgid "Hash Sum mismatch" +msgstr "Невідповідність MD5Sum" + +#: apt-pkg/acquire-item.cc:1150 +#, fuzzy +msgid "There is no public key available for the following key IDs:\n" +msgstr "Відсутній публічний ключ для заданих ID ключа:\n" -#: cmdline/apt-get.cc:1730 +#: apt-pkg/acquire-item.cc:1264 +#, c-format msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." +"I wasn't able to locate a file for the %s package. This might mean you need " +"to manually fix this package. (due to missing arch)" msgstr "" -"Незадоволені залежності. Спробуйте виконати 'apt-get -f install', не " -"вказуючи імені пакунка (або знайдіть інше рішення)." +"Я не можу знайти файл для пакунку %s. Можливо, Ви захочете власноруч " +"виправити цей пакунок. (due to missing arch)" -#: cmdline/apt-get.cc:1742 +#: apt-pkg/acquire-item.cc:1323 +#, c-format msgid "" -"Some packages could not be installed. This may mean that you have\n" -"requested an impossible situation or if you are using the unstable\n" -"distribution that some required packages have not yet been created\n" -"or been moved out of Incoming." +"I wasn't able to locate file for the %s package. This might mean you need to " +"manually fix this package." msgstr "" -"Деякі пакунки неможливо встановити. Можливо, Ви просите неможливого,\n" -"або ж використаєте нестабільний дистрибутив, і запитані Вами пакунки\n" -"ще не створені або були вилучені з Incoming." +"Я не можу знайти файл для пакунку %s. Можливо, Ви захочете власноруч " +"виправити цей пакунок." -#: cmdline/apt-get.cc:1750 +#: apt-pkg/acquire-item.cc:1364 +#, c-format msgid "" -"Since you only requested a single operation it is extremely likely that\n" -"the package is simply not installable and a bug report against\n" -"that package should be filed." +"The package index files are corrupted. No Filename: field for package %s." msgstr "" -"Так як Ви просили виконати тільки одну операцію, те найімовірніше, що\n" -"пакунок просто не може бути встановлений через помилки в самому пакунку.\n" -"Необхідно відіслати звіт про цю помилку." - -#: cmdline/apt-get.cc:1758 -msgid "Broken packages" -msgstr "Зламані пакунки" - -#: cmdline/apt-get.cc:1787 -msgid "The following extra packages will be installed:" -msgstr "Будуть встановлені наступні додаткові пакунки:" - -#: cmdline/apt-get.cc:1876 -msgid "Suggested packages:" -msgstr "Пропоновані пакунки:" - -#: cmdline/apt-get.cc:1877 -msgid "Recommended packages:" -msgstr "Рекомендовані пакунки:" - -#: cmdline/apt-get.cc:1905 -msgid "Calculating upgrade... " -msgstr "Обчислення оновлень... " +"Індексні файли пакунків пошкоджені. Немає поля Filename для пакунку %s." -#: cmdline/apt-get.cc:1913 -msgid "Done" -msgstr "Виконано" +#: apt-pkg/acquire-item.cc:1451 +msgid "Size mismatch" +msgstr "Невідповідність розміру" -#: cmdline/apt-get.cc:1980 cmdline/apt-get.cc:1988 -msgid "Internal error, problem resolver broke stuff" -msgstr "Внутрішня помилка, вирішувач проблем все поламав" +#: apt-pkg/vendorlist.cc:66 +#, c-format +msgid "Vendor block %s contains no fingerprint" +msgstr "Блок постачальника %s не містить відбитку (fingerprint)" -#: cmdline/apt-get.cc:2088 -msgid "Must specify at least one package to fetch source for" +#: apt-pkg/cdrom.cc:529 +#, c-format +msgid "" +"Using CD-ROM mount point %s\n" +"Mounting CD-ROM\n" msgstr "" -"Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні " -"тексти" +"Використовується точка монтування CDROM: %s\n" +"Монтування CD-ROM\n" -#: cmdline/apt-get.cc:2118 cmdline/apt-get.cc:2352 -#, c-format -msgid "Unable to find a source package for %s" -msgstr "Неможливо знайти пакунок з вихідними текстами для %s" +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 +msgid "Identifying.. " +msgstr "Ідентифікація.. " -#: cmdline/apt-get.cc:2167 +#: apt-pkg/cdrom.cc:563 #, c-format -msgid "Skipping already downloaded file '%s'\n" -msgstr "Пропускаємо вже завантажений файл '%s'\n" +msgid "Stored label: %s\n" +msgstr "Записано мітку: %s \n" -#: cmdline/apt-get.cc:2191 -#, c-format -msgid "You don't have enough free space in %s" -msgstr "Недостатньо місця в %s" +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "Демонтується CD-ROM..." -#: cmdline/apt-get.cc:2196 +#: apt-pkg/cdrom.cc:590 #, c-format -msgid "Need to get %sB/%sB of source archives.\n" -msgstr "Необхідно завантажити %sB/%sB з архівів вихідних текстів.\n" +msgid "Using CD-ROM mount point %s\n" +msgstr "Використовується точка монтування CDROM: %s\n" -#: cmdline/apt-get.cc:2199 -#, c-format -msgid "Need to get %sB of source archives.\n" -msgstr "Потрібно завантажити %sB архівів з вихідними текстами.\n" +#: apt-pkg/cdrom.cc:608 +msgid "Unmounting CD-ROM\n" +msgstr "Демонтується CD-ROM\n" -#: cmdline/apt-get.cc:2205 -#, c-format -msgid "Fetch source %s\n" -msgstr "Завантаження вихідних текстів %s\n" +#: apt-pkg/cdrom.cc:612 +msgid "Waiting for disc...\n" +msgstr "Чекаю на диск...\n" -#: cmdline/apt-get.cc:2236 -msgid "Failed to fetch some archives." -msgstr "Деякі архіви не вдалося завантажити." +#. Mount the new CDROM +#: apt-pkg/cdrom.cc:620 +msgid "Mounting CD-ROM...\n" +msgstr "Монтується CD-ROM...\n" -#: cmdline/apt-get.cc:2264 -#, c-format -msgid "Skipping unpack of already unpacked source in %s\n" -msgstr "" -"Розпакування вихідних текстів пропущено, тому що в %s вже перебувають " -"розпаковані вихідні тексти\n" +#: apt-pkg/cdrom.cc:638 +msgid "Scanning disc for index files..\n" +msgstr "Диск сканується на індексні файли..\n" -#: cmdline/apt-get.cc:2276 -#, c-format -msgid "Unpack command '%s' failed.\n" -msgstr "Команда розпакування '%s' завершилася невдало.\n" +#: apt-pkg/cdrom.cc:678 +#, fuzzy, c-format +msgid "" +"Found %u package indexes, %u source indexes, %u translation indexes and %u " +"signatures\n" +msgstr "Знайдено %i індексів пакунків, %i індексів джерел і %i підписів\n" -#: cmdline/apt-get.cc:2277 -#, c-format -msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n" +#: apt-pkg/cdrom.cc:715 +#, fuzzy, c-format +msgid "Found label '%s'\n" +msgstr "Записано мітку: %s \n" + +#: apt-pkg/cdrom.cc:744 +msgid "That is not a valid name, try again.\n" +msgstr "Не є вірною назвою, спробуйте ще.\n" -#: cmdline/apt-get.cc:2294 +#: apt-pkg/cdrom.cc:760 #, c-format -msgid "Build command '%s' failed.\n" -msgstr "Команда побудови '%s' закінчилася невдало.\n" +msgid "" +"This disc is called: \n" +"'%s'\n" +msgstr "" +"Цей диск зветься: \n" +"'%s'\n" + +#: apt-pkg/cdrom.cc:764 +msgid "Copying package lists..." +msgstr "Копіюються переліки пакунків..." -#: cmdline/apt-get.cc:2313 -msgid "Child process failed" -msgstr "Породжений процес завершився невдало" +#: apt-pkg/cdrom.cc:790 +msgid "Writing new source list\n" +msgstr "Записується новий перелік джерел\n" -#: cmdline/apt-get.cc:2329 -msgid "Must specify at least one package to check builddeps for" -msgstr "" -"Для перевірки залежностей для побудови необхідно вказати як мінімум один " -"пакунок" +#: apt-pkg/cdrom.cc:799 +msgid "Source list entries for this disc are:\n" +msgstr "Перелік джерел для цього диску:\n" -#: cmdline/apt-get.cc:2357 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format -msgid "Unable to get build-dependency information for %s" -msgstr "Неможливо одержати інформацію про залежності для побудови %s" +msgid "Wrote %i records.\n" +msgstr "Записано %i записів.\n" -#: cmdline/apt-get.cc:2377 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format -msgid "%s has no build depends.\n" -msgstr "%s не має залежностей для побудови.\n" +msgid "Wrote %i records with %i missing files.\n" +msgstr "Записано %i записів з %i відсутніми файлами.\n" -#: cmdline/apt-get.cc:2429 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format -msgid "" -"%s dependency for %s cannot be satisfied because the package %s cannot be " -"found" -msgstr "" -"Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено" +msgid "Wrote %i records with %i mismatched files\n" +msgstr "Записано %i записів з %i невідповідними файлам\n" -#: cmdline/apt-get.cc:2482 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831 #, c-format -msgid "" -"%s dependency for %s cannot be satisfied because no available versions of " -"package %s can satisfy version requirements" -msgstr "" -"Залежність типу %s для %s не може бути задоволена, бо ні одна з версій " -"пакунка %s не задовольняє умови" +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "Записано %i записів з %i відсутніми і %i невідповідними файлами\n" -#: cmdline/apt-get.cc:2518 -#, c-format -msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" -msgstr "" -"Не вдалося задовольнити залежність типу %s для пакунка %s: Встановлений " -"пакунок %s новіше, аніж треба" +#: apt-pkg/deb/dpkgpm.cc:454 +#, fuzzy, c-format +msgid "Directory '%s' missing" +msgstr "Lists тека %spartial відсутня." -#: cmdline/apt-get.cc:2543 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format -msgid "Failed to satisfy %s dependency for %s: %s" -msgstr "Неможливо задовольнити залежність типу %s для пакунка %s: %s" +msgid "Preparing %s" +msgstr "Підготовка %s" -#: cmdline/apt-get.cc:2557 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format -msgid "Build-dependencies for %s could not be satisfied." -msgstr "Залежності для побудови %s не можуть бути задоволені." - -#: cmdline/apt-get.cc:2561 -msgid "Failed to process build dependencies" -msgstr "Обробка залежностей для побудови закінчилася невдало" - -#: cmdline/apt-get.cc:2593 -msgid "Supported modules:" -msgstr "Підтримувані модулі:" +msgid "Unpacking %s" +msgstr "Розпакування %s" -#: cmdline/apt-get.cc:2634 -#, fuzzy -msgid "" -"Usage: apt-get [options] command\n" -" apt-get [options] install|remove pkg1 [pkg2 ...]\n" -" apt-get [options] source pkg1 [pkg2 ...]\n" -"\n" -"apt-get is a simple command line interface for downloading and\n" -"installing packages. The most frequently used commands are update\n" -"and install.\n" -"\n" -"Commands:\n" -" update - Retrieve new lists of packages\n" -" upgrade - Perform an upgrade\n" -" install - Install new packages (pkg is libc6 not libc6.deb)\n" -" remove - Remove packages\n" -" autoremove - Remove all automatic unused packages\n" -" purge - Remove and purge packages\n" -" source - Download source archives\n" -" build-dep - Configure build-dependencies for source packages\n" -" dist-upgrade - Distribution upgrade, see apt-get(8)\n" -" dselect-upgrade - Follow dselect selections\n" -" clean - Erase downloaded archive files\n" -" autoclean - Erase old downloaded archive files\n" -" check - Verify that there are no broken dependencies\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -qq No output except for errors\n" -" -d Download only - do NOT install or unpack archives\n" -" -s No-act. Perform ordering simulation\n" -" -y Assume Yes to all queries and do not prompt\n" -" -f Attempt to continue if the integrity check fails\n" -" -m Attempt to continue if archives are unlocatable\n" -" -u Show a list of upgraded packages as well\n" -" -b Build the source package after fetching it\n" -" -V Show verbose version numbers\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n" -"pages for more information and options.\n" -" This APT has Super Cow Powers.\n" -msgstr "" -"Використання: apt-get [options] command\n" -" apt-get [options] install|remove pkg1 [pkg2 ...]\n" -" apt-get [options] source pkg1 [pkg2 ...]\n" -"\n" -"apt-get - простий інтерфейс командного рядка для завантаження й\n" -"встановлення пакунків. Найбільш часто використовувані команди - update \n" -"і install.\n" -"\n" -"Команди:\n" -" update - завантажити нові переліки пакунків\n" -" upgrade - виконати оновлення пакунків\n" -" install - встановити нові пакунки (назва пакунка вказується\n" -" як libc6, а не libc6.deb)\n" -" remove - видалити пакунок\n" -" source - завантажити архіви з вихідними текстами\n" -" build-dep - завантажити все необхідне для побудови зазначеного\n" -" пакунку з вихідних текстів\n" -" dist-upgrade - оновити всю систему, докладніше - в apt-get(8)\n" -" dselect-upgrade - керуватися вибором, зробленим в dselect'і\n" -" clean - видалити завантажені архіви\n" -" autoclean - видалити старі завантажені архіви\n" -" check - перевірити наявність порушених залежностей\n" -"\n" -"Опції:\n" -" -h Цей текст.\n" -" -q Виводити повідомлення, придатні для запису у файл журналу.\n" -" Не виводити індикатор прогресу\n" -" -qq Виводити тільки повідомлення про помилки\n" -" -d Тільки завантажити - не встановлювати й не розпаковувати архіви\n" -" -s Не виконувати дії насправді. Імітація роботи\n" -" -y Відповідати \"Так\" на всі питання. Самі питання при цьому не " -"виводяться\n" -" -f Продовжувати, навіть якщо перевірка цілісності не пройшла\n" -" -m Продовжувати, навіть якщо місце розташування архівів невідомо\n" -" -u Показувати список оновлюваних пакунків\n" -" -b Компілювати пакунок з вихідних текстів після їхнього завантаження\n" -" -V Показувати версії пакунків\n" -" -c=? Читати зазначений файл конфігурації\n" -" -o=? Встановити довільну опцію, наприклад, -o dir::cache=/tmp\n" -"Сторінки керівництва apt-get(8), sources.list(5) і apt.conf(5)\n" -"містять більше інформації.\n" -" This APT has Super Cow Powers.\n" +#: apt-pkg/deb/dpkgpm.cc:543 +#, c-format +msgid "Preparing to configure %s" +msgstr "Підготовка до конфігурації %s" -#: cmdline/acqprogress.cc:55 -msgid "Hit " -msgstr "В кеші " +#: apt-pkg/deb/dpkgpm.cc:544 +#, c-format +msgid "Configuring %s" +msgstr "Конфігурація %s" -#: cmdline/acqprogress.cc:79 -msgid "Get:" -msgstr "Отр:" +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 +#, fuzzy, c-format +msgid "Processing triggers for %s" +msgstr "Помилка обробки течи %s" -#: cmdline/acqprogress.cc:110 -msgid "Ign " -msgstr "Ігн " +#: apt-pkg/deb/dpkgpm.cc:549 +#, c-format +msgid "Installed %s" +msgstr "Встановлено %s" -#: cmdline/acqprogress.cc:114 -msgid "Err " -msgstr "Пом " +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 +#, c-format +msgid "Preparing for removal of %s" +msgstr "Підготовка до видалення %s" -#: cmdline/acqprogress.cc:135 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Отримано %sB за %sB (%sB/s)\n" +msgid "Removing %s" +msgstr "Видаляється %s" -#: cmdline/acqprogress.cc:225 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format -msgid " [Working]" -msgstr " [Йде робота]" +msgid "Removed %s" +msgstr "Видалено %s" -#: cmdline/acqprogress.cc:271 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Зміна носія: вставте диск з міткою '%s' у пристрій '%s' і натисніть Ввід\n" +msgid "Preparing to completely remove %s" +msgstr "Підготовка до повного видалення %s" -#: cmdline/apt-sortpkgs.cc:86 -msgid "Unknown package record!" -msgstr "Запис про невідомий пакунок!" +#: apt-pkg/deb/dpkgpm.cc:566 +#, c-format +msgid "Completely removed %s" +msgstr "Повністю видалено %s" -#: cmdline/apt-sortpkgs.cc:150 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: apt-pkg/deb/dpkgpm.cc:716 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -"Використання: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs - простий інструмент для сортування переліків пакунків. Опція -" -"s\n" -"використається, щоб вказати тип списку.\n" -"\n" -"Опції:\n" -" -h цей текст\n" -" -s сортувати список файлів з вихідними текстами\n" -" -c=? читати зазначений файл конфігурації\n" -" -o=? встановити довільну опцію, наприклад, -o dir::cache=/tmp\n" - -#: dselect/install:32 -msgid "Bad default setting!" -msgstr "Неправильне значення по замовчуванню!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 -msgid "Press enter to continue." -msgstr "Для продовження натисніть Ввід." - -#: dselect/install:100 -msgid "Some errors occurred while unpacking. I'm going to configure the" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " msgstr "" -"Під час розпакування виникли помилки. Буде продовжено процес налаштування" - -#: dselect/install:101 -msgid "packages that were installed. This may result in duplicate errors" -msgstr "встановлених пакунків. Це може призвести до повторення помилок або" - -#: dselect/install:102 -msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "виникненню нових через незадоволені залежності. Це нормально," -#: dselect/install:103 -msgid "" -"above this message are important. Please fix them and run [I]nstall again" -msgstr "" -"важливі тільки помилки, зазначені вище. Виправте їх і виконаєте установку ще " -"раз" +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "Неможливо накласти латку на файл" -#: dselect/update:30 -msgid "Merging available information" -msgstr "Об'єднання інформації про доступні пакунки" +#: methods/rsh.cc:330 +msgid "Connection closed prematurely" +msgstr "З'єднання завершено передчасно" #, fuzzy #~ msgid "openpty failed\n" diff --git a/po/vi.po b/po/vi.po index 9854ece9f..20b21d7a7 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2007-12-01 15:37+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -160,7 +160,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s cho %s được biên dịch vào %s %s\n" @@ -684,7 +684,7 @@ msgstr "Việc đổi tên %s thành %s bị lỗi" msgid "Y" msgstr "C" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "Lỗi biên dich biểu thức chính quy - %s" @@ -847,12 +847,12 @@ msgstr "Cần phải gỡ bỏ một số gói, nhưng mà khả năng Gỡ bỏ msgid "Internal error, Ordering didn't finish" msgstr "Gặp lỗi nội bộ: tiến trình Sắp xếp chưa xong" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "Không thể khóa thư mục tải về" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Không thể đọc danh sách nguồn." @@ -881,7 +881,7 @@ msgstr "Sau khi đã giải nén, sẻ chiếm %sB sức chứa đĩa thêm.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Sau khi đã giải nén, sẽ giải phóng %sB sức chữa đĩa thêm.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "Không thể quyết định chỗ rảnh trong %s" @@ -919,7 +919,7 @@ msgstr "Hủy bỏ." msgid "Do you want to continue [Y/n]? " msgstr "Bạn có muốn tiếp tục không? [Y/n] [C/k] " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Việc gói %s bị lỗi %s\n" @@ -928,7 +928,7 @@ msgstr "Việc gói %s bị lỗi %s\n" msgid "Some files failed to download" msgstr "Một số tập tin không tải về được" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "Mới tải về xong và trong chế độ chỉ tải về" @@ -1035,30 +1035,22 @@ msgstr "Lệnh cập nhật không chấp nhật đối số" msgid "Unable to lock the list directory" msgstr "Không thể khóa thư mục danh sách" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"Một số tập tin chỉ mục không tải về được, đã bỏ qua chúng, hoặc điều cũ được " -"dùng thay thế." - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Không nên xoá gì thì không thể khởi chạy Bộ Gỡ bỏ Tự động" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" "Theo đây có những gói đã được cài đặt tự động nên không còn cần thiết lại:" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "Hãy sử dụng lệnh « apt-get autoremove » để gỡ bỏ chúng." -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1066,43 +1058,43 @@ msgstr "" "Ừm, có vẻ là Bộ Gỡ bỏ Tự động đã hủy cái gì, một trường hợp thực sự không " "nên xảy ra. Hãy thông báo lỗi về apt." -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ quyết định trường hợp:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 msgid "Internal Error, AutoRemover broke stuff" msgstr "Lỗi nội bộ : Bộ Gỡ bỏ Tự động đã làm hư gì." -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã ngắt gì" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, c-format msgid "Couldn't find task %s" msgstr "Không tìm thấy tác vụ %s" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "Không tìm thấy gói %s" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Ghi chú : đang chọn %s cho biểu thức chính quy « %s »\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "%s được đặt thành « được cài đặt thủ công ».\n" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Có lẽ bạn hãy chạy lênh « apt-get -f install » để sửa hết:" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1110,7 +1102,7 @@ msgstr "" "Gói còn phụ thuộc vào phần mềm chưa có. Hãy cố chạy lệnh « apt-get -f install " "» mà không có gói nào (hoặc ghi rõ cách quyết định)." -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1122,7 +1114,7 @@ msgstr "" "bất định, có lẽ chưa tạo một số gói cần thiết,\n" "hoặc chưa di chuyển chúng ra phần Incoming (Đến)." -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1132,123 +1124,138 @@ msgstr "" "gói này đơn giản không có khả năng cài đặt, thì bạn hay\n" "thông báo lỗi về gói này." -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "Gói bị ngắt" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "Những gói thêm theo đây sẽ được cài đặt:" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "Gói được đệ nghị:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "Gói được khuyên:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "Đang tính nâng cấp... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "Bị lỗi" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "Xong" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "Phải ghi rõ ít nhất một gói cần lấy nguồn cho nó" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "Không tìm thấy gói nguồn cho %s" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Đang bỏ qua tập tin đã được tải về « %s »\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "Không đủ sức chứa còn rảnh trong %s" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Cần phải lấy %sB/%sB kho nguồn.\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Cần phải lấy %sB kho nguồn.\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "Lấy nguồn %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "Việc lấy một số kho bị lỗi." -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Đang bỏ qua giải nén nguồn đã giải nén trong %s\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Lệnh giải nén « %s » bị lỗi.\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Hãy kiểm tra xem gói « dpkg-dev » có được cài đặt chưa.\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "Lệnh xây dụng « %s » bị lỗi.\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "Tiến trình con bị lỗi" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "" "Phải ghi rõ ít nhất một gói cần kiểm tra cách phụ thuộc khi xây dụng cho nó" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Không thể lấy thông tin về cách phụ thuộc khi xây dụng cho %s" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s không phụ thuộc vào gì khi xây dụng.\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "cách phụ thuộc %s cho %s không thể được thỏa vì không tìm thấy gọi %s" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1257,31 +1264,31 @@ msgstr "" "cách phụ thuộc %s cho %s không thể được thỏa vì không có phiên bản sẵn sàng " "của gói %s có thể thỏa điều kiện phiên bản." -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s quá mới" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi: %s." -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Không thể thỏa cách phụ thuộc khi xây dụng cho %s." -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "Việc xử lý cách phụ thuộc khi xây dụng bị lỗi" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "Mô-đun đã hỗ trợ :" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1604,7 +1611,7 @@ msgstr "Tập tin %s/%s ghi đè lên điều trong gói %s" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "Không thể đọc %s" @@ -1840,7 +1847,7 @@ msgstr "Thời hạn kết nối" msgid "Server closed the connection" msgstr "Máy phục vụ đã đóng kết nối" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "Lỗi đọc" @@ -1852,7 +1859,7 @@ msgstr "Một trả lời đã tràn bộ đệm." msgid "Protocol corruption" msgstr "Giao thức bị hỏng" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "Lỗi ghi" @@ -1906,7 +1913,7 @@ msgstr "Kết nối ổ cắm dữ liệu đã quá giờ" msgid "Unable to accept connection" msgstr "Không thể chấp nhận kết nối" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Gặp khó khăn băm tập tin" @@ -1933,39 +1940,39 @@ msgstr "Truy vấn" msgid "Unable to invoke " msgstr "Không thể gọi " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "Đang kết nối đến %s (%s)..." -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[Địa chỉ IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Không thể tạo ổ cắm cho %s (f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Không thể sở khởi kết nối đến %s:%s (%s)." -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Không thể kết nối đến %s:%s (%s), kết nối đã quá giờ" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Không thể kết nối đến %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Đang kết nối đến %s..." @@ -2039,80 +2046,80 @@ msgstr "Không thể mở ống dẫn cho %s" msgid "Read error from %s process" msgstr "Gặp lỗi đọc từ tiến trình %s" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "Đang đợi những phần đầu..." -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "Đã lấy một dòng đầu riêng lẻ chứa hơn %u ky tự" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "Dòng đầu sai" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Máy phục vụ HTTP đã gởi một dòng đầu trả lời không hợp lệ" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" "Máy phục vụ HTTP đã gởi một dòng đầu Content-Length (độ dài nội dụng) không " "hợp lệ" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" "Máy phục vụ HTTP đã gởi một dòng đầu Content-Range (phạm vị nội dụng) không " "hợp lệ" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "Máy phục vụ HTTP đã ngắt cách hỗ trợ phạm vị" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "Không biết dạng ngày" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Việc chọn bị lỗi" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "Kết nối đã quá giờ" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "Gặp lỗi khi ghi vào tập tin xuất" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "Gặp lỗi khi ghi vào tập tin" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "Gặp lỗi khi ghi vào tập tin đó" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "Gặp lỗi khi đọc từ máy phục vụ : cuối ở xa đã đóng kết nối" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "Gặp lỗi khi đọc từ máy phục vụ" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "Dữ liệu dòng đầu sai" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "Kết nối bị ngắt" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "Gặp lỗi nội bộ" @@ -2247,6 +2254,7 @@ msgid "Unable to stat the mount point %s" msgstr "Không thể lấy các thông tin cho điểm gắn kết %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "Không thể chuyển đổi sang %s" @@ -2255,70 +2263,70 @@ msgstr "Không thể chuyển đổi sang %s" msgid "Failed to stat the cdrom" msgstr "Việc lấy cac thông tin cho đĩa CD-ROM bị lỗi" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Không dùng khả năng khóa cho tập tin khóa chỉ đọc %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "Không thể mở tập tin khóa %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Không dùng khả năng khóa cho tập tin khóa đã lắp kiểu NFS %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "Không thể lấy khóa %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Đã đợi %s nhưng mà chưa gặp nó" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Tiến trình con %s đã nhận một lỗi chia ra từng đoạn." -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Tiến trình con %s đã trả lời mã lỗi (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Tiến trình con %s đã thoát bất ngờ" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "Không thể mở tập tin %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "đọc, còn cần đọc %lu nhưng mà không có điều còn lại" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "ghi, còn cần ghi %lu nhưng mà không thể" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "Gặp lỗi khi đóng tập tin đó" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "Gặp lỗi khi bỏ liên kết tập tin đó" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "Gặp lỗi khi đồng bộ hóa tập tin đó" @@ -2484,7 +2492,7 @@ msgstr "Không biết kiểu « %s » trên dòng %u trong danh sách nguồn %s msgid "Malformed line %u in source list %s (vendor id)" msgstr "Gặp dòng dạng sai %u trong danh sách nguồn %s (mã nhận biết nhà bán)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2519,6 +2527,14 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Không thể sửa vấn đề, bạn đã giữ lại một số gói bị ngắt." +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Một số tập tin chỉ mục không tải về được, đã bỏ qua chúng, hoặc điều cũ được " +"dùng thay thế." + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2551,17 +2567,17 @@ msgstr "Không tìm thấy trình điều khiển phương pháp %s." msgid "Method %s did not start correctly" msgstr "Phương pháp %s đã không bắt đầu cho đúng." -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Hãy nạp đĩa có nhãn « %s » vào ổ « %s » và bấm nút Enter." -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Không hỗ trợ hệ thống đóng gói « %s »" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "Không thể quyết định kiểu hệ thống đóng gói thích hợp" @@ -2576,11 +2592,11 @@ msgstr "" "Bạn phải để một số địa chỉ Mạng « nguồn » vào « sources.list » (danh sách " "nguồn)" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "Không thể phân tách hay mở danh sách gói hay tâp tin trạng thái." -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "" "Có lẽ bạn muốn chạy « apt-get update » (lấy cập nhật) để sửa các vấn đề này" @@ -2695,24 +2711,24 @@ msgstr "Đang tập hợp các trường hợp « tập tin miễn là »" msgid "IO Error saving source cache" msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "việc thay đổi tên bị lỗi, %s (%s → %s)." -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "MD5Sum (tổng kiểm) không khớp được" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 msgid "Hash Sum mismatch" msgstr "Sai khớp tổng băm (hash sum)" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "Không có khóa công sẵn sàng cho những ID khóa theo đây:\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2721,7 +2737,7 @@ msgstr "" "Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói " "này, do thiếu kiến trúc." -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2730,7 +2746,7 @@ msgstr "" "Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói " "này." -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2738,7 +2754,7 @@ msgstr "" "Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập " "tin:) cho gói %s." -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "Kích cỡ không khớp được" @@ -2851,71 +2867,78 @@ msgstr "" "Mới ghi %i mục ghi với %i tập tin còn thiếu và %i tập tin không khớp với " "nhau\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, c-format msgid "Directory '%s' missing" msgstr "Thiếu thư mục « %s »" -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "Đang chuẩn bị %s..." -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "Đang mở gói %s..." -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "Đang chuẩn bị cấu hình %s..." -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "Đang cấu hình %s..." -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, c-format msgid "Processing triggers for %s" msgstr "Đang xử lý các bộ gây nên cho %s" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "Đã cài đặt %s" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "Đang chuẩn bị gỡ bỏ %s..." -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "Đang gỡ bỏ %s..." -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "Đã gỡ bỏ %s" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s..." -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "Mới gỡ bỏ hoàn toàn %s" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "Không thể ghi lưu, openpty() bị lỗi (« /dev/pts » chưa lắp ?)\n" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "Không thể vá lỗi trong tập tin %s" diff --git a/po/zh_CN.po b/po/zh_CN.po index fe1f6bc04..fd85230d7 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.23\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2007-03-29 17:14+0800\n" "Last-Translator: Kov Chai \n" "Language-Team: Debian Chinese [GB] \n" @@ -158,7 +158,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s %s ，编译于 %s %s\n" @@ -652,7 +652,7 @@ msgstr "无法将 %s 重命名为 %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "编译正则表达式时出错 - %s" @@ -813,12 +813,12 @@ msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止 msgid "Internal error, Ordering didn't finish" msgstr "内部错误，Ordering 未能完成" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "无法对下载目录加锁" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "无法读取安装源列表。" @@ -846,7 +846,7 @@ msgstr "解压缩后会消耗掉 %sB 的额外空间。\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "解压缩后将会空出 %sB 的空间。\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "无法获知您在 %s 上的空余空间" @@ -883,7 +883,7 @@ msgstr "中止执行。" msgid "Do you want to continue [Y/n]? " msgstr "您希望继续执行吗？[Y/n]" -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" @@ -892,7 +892,7 @@ msgstr "无法下载 %s %s\n" msgid "Some files failed to download" msgstr "有一些文件下载失败" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "下载完毕，目前是“仅下载”模式" @@ -997,72 +997,65 @@ msgstr " update 命令是不需任何参数的" msgid "Unable to lock the list directory" msgstr "无法对状态列表目录加锁" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" -"有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。" - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "下列【新】软件包将被安装：" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "下列的信息可能会对解决问题有所帮助：" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "内部错误，problem resolver 坏事了" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "内部错误，AllUpgrade 坏事了" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "无法找到软件包 %s" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "无法找到软件包 %s" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "但是 %s 正要被安装" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "您可能需要运行“apt-get -f install”来纠正下列错误：" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1070,7 +1063,7 @@ msgstr "" "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可" "以指定一个解决办法)。" -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1081,7 +1074,7 @@ msgstr "" "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n" "包尚未被创建或是它们还在新到(incoming)目录中。" -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1090,122 +1083,137 @@ msgstr "" "您仅要求对单一软件包进行操作，这极有可能是因为该软件包安装不上，同时，\n" "您最好提交一个针对这个软件包的故障报告。" -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "无法安装的软件包" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "将会安装下列额外的软件包：" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "建议安装的软件包：" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "推荐安装的软件包：" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "正在筹划升级... " -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "失败" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "内部错误，problem resolver 坏事了" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "要下载源代码，必须指定至少一个对应的软件包" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "无法找到与 %s 对应的源代码包" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "忽略已下载过的文件“%s”\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "您在 %s 上没有足够的空余空间" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下载 %sB/%sB 的源代码包。\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下载 %sB 的源代码包。\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "下载源代码 %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "有一些包文件无法下载。" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "运行解包的命令“%s”出错。\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "请检查是否安装了“dpkg-dev”软件包。\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造软件包命令“%s”失败。\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "子进程出错" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr " %s 没有构建依赖关系信息。\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1214,30 +1222,30 @@ msgstr "" "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1" "$s 依赖关系" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新了" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "不能满足软件包 %s 所要求的构建依赖关系。" -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "无法处理构建依赖关系" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "被支持模块：" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1544,7 +1552,7 @@ msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "无法读取 %s" @@ -1774,7 +1782,7 @@ msgstr "连接超时" msgid "Server closed the connection" msgstr "服务器关闭了连接" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "读错误" @@ -1786,7 +1794,7 @@ msgstr "回应超出了缓存区大小。" msgid "Protocol corruption" msgstr "协议有误" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "写文件出错" @@ -1840,7 +1848,7 @@ msgstr "数据套接字连接超时" msgid "Unable to accept connection" msgstr "无法接受连接" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "把文件加入散列表时出错" @@ -1867,39 +1875,39 @@ msgstr "查询" msgid "Unable to invoke " msgstr "无法调用 " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "正在连接 %s (%s)" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "无法为 %s 创建套接字(f=%u t=%u p=%u)" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "无法发起与 %s:%s (%s) 的连接" -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "无法连接上 %s:%s (%s)，连接超时" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "无法连接上 %s:%s (%s)。" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "正在连接 %s" @@ -1971,76 +1979,76 @@ msgstr "无法为 %s 开启管道" msgid "Read error from %s process" msgstr "从 %s 进程读取数据出错" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "正在等待报头" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "受到了一行报头条目，它的长度超过了 %u 个字符" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "错误的报头条目" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "该 http 服务器发送了一个无效的应答报头" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "该 http 服务器发送了一个无效的 Content-Length 报头" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "该 http 服务器发送了一个无效的 Content-Range 报头" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "该 http 服务器的 range 支持不正常" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "无法识别的日期格式" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "select 调用出错" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "连接服务器超时" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "写输出文件时出错" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "写文件时出错" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "写文件时出错" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "从服务器读取数据时出错，对方关闭了连接" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "从服务器读取数据出错" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "错误的报头数据" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "连接失败" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "内部错误" @@ -2175,6 +2183,7 @@ msgid "Unable to stat the mount point %s" msgstr "无法读取文件系统挂载点 %s 的状态" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "无法切换工作目录到 %s" @@ -2183,70 +2192,70 @@ msgstr "无法切换工作目录到 %s" msgid "Failed to stat the cdrom" msgstr "无法读取光盘的状态" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "由于文件系统为只读，因而无法使用文件锁%s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "无法打开锁文件 %s" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "无法在 nfs 文件系统上使用文件锁 %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "无法获得锁 %s" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "等待子进程 %s 的退出，但是它并不存在" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "子进程 %s 发生了段错误" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "子进程 %s 返回了一个错误号 (%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "子进程 %s 异常退出了" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "无法打开文件 %s" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "读文件时出错，还剩 %lu 字节没有读出" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "写文件时出错，还剩 %lu 字节没有保存" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "关闭文件时出错" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "用 unlink 删除文件时出错" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "同步文件时出错" @@ -2410,7 +2419,7 @@ msgstr "无法识别在安装源列表 %3$s 里，第 %2$u 行中的软件包类 msgid "Malformed line %u in source list %s (vendor id)" msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (vendor id)" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2446,6 +2455,13 @@ msgstr "" "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关" "系。" +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。" + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2478,17 +2494,17 @@ msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。" msgid "Method %s did not start correctly" msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "请把标有 “%s” 的碟片插入驱动器“%s”再按回车键。" -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "不支持“%s”打包系统" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "无法确定适合的打包系统类型" @@ -2501,11 +2517,11 @@ msgstr "无法读取 %s 的状态。" msgid "You must put some 'source' URIs in your sources.list" msgstr "您必须在您的 sources.list 写入一些“软件包源”的 URI" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "无法解析或打开软件包的列表或是状态文件。" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "您可能需要运行 apt-get update 来解决这些问题" @@ -2616,25 +2632,25 @@ msgstr "正在收集文件所提供的软件包" msgid "IO Error saving source cache" msgstr "无法写入来源缓存文件" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "无法重命名文件，%s (%s -> %s)。" -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "MD5 校验和不符" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5 校验和不符" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "以下 key ID 没有可用的公钥：\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2643,7 +2659,7 @@ msgstr "" "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件" "包。(缘于架构缺失)" -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2651,13 +2667,13 @@ msgid "" msgstr "" "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。" -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。" -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "大小不符" @@ -2768,71 +2784,78 @@ msgstr "已写入 %i 条记录，并有 %i 个文件不吻合\n" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不吻合\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "软件包列表的目录 %spartial 不见了。" -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "正在准备 %s" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "正在解压缩 %s" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "正在准备配置 %s" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "正在配置 %s" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "处理目录 %s 时出错" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "已安装 %s" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "正在准备 %s 的删除操作" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "正在删除 %s" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "已删除 %s" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "正在准备完全删除 %s" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "完全删除了 %s" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "无法打开补丁文件" diff --git a/po/zh_TW.po b/po/zh_TW.po index 1f16960cd..c27693cd6 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-17 05:49+0100\n" +"POT-Creation-Date: 2008-01-07 19:11+0100\n" "PO-Revision-Date: 2006-10-21 16:58+0800\n" "Last-Translator: Asho Yeh \n" "Language-Team: Chinese/Traditional \n" @@ -159,7 +159,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2601 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s 是針對於 %s %s 並編譯在 %s %s\n" @@ -652,7 +652,7 @@ msgstr "無法將 %s 更名為 %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 #, c-format msgid "Regex compilation error - %s" msgstr "編譯正規表示法出錯 - %s" @@ -813,12 +813,12 @@ msgstr "有套件需要被移除,但移除動作被禁止。" msgid "Internal error, Ordering didn't finish" msgstr "內部錯誤，Ordering didn't finish" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 msgid "Unable to lock the download directory" msgstr "無法鎖定下載的目錄" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347 -#: apt-pkg/cachefile.cc:63 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "無法讀取來源單。" @@ -846,7 +846,7 @@ msgstr "解壓縮後將消耗 %sB 的空間。\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "解壓縮後將空出 %sB 的空間。\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2184 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s 無法足夠的空間。" @@ -883,7 +883,7 @@ msgstr "放棄執行。" msgid "Do you want to continue [Y/n]? " msgstr "繼續執行嗎？ 是按 [Y] 鍵，否按 [n] 鍵 " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 #, c-format msgid "Failed to fetch %s %s\n" msgstr "無法下載『%s』檔案。%s\n" @@ -892,7 +892,7 @@ msgstr "無法下載『%s』檔案。%s\n" msgid "Some files failed to download" msgstr "部份檔案無法下載" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 msgid "Download complete and in download only mode" msgstr "下載完畢,目前是“僅下載”模式" @@ -997,71 +997,65 @@ msgstr "update 指令不需任何參數" msgid "Unable to lock the list directory" msgstr "無法鎖定列表目錄" -#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "有一些索引檔案不能下載,它們可能被忽略了,也可能轉而使用了舊的索引檔案。" - -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1402 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1434 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "下列的【新】套件都將被安裝：" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1436 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1441 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 msgid "The following information may help to resolve the situation:" msgstr "底下的資訊有助於解決現在的情況:" -#: cmdline/apt-get.cc:1487 +#: cmdline/apt-get.cc:1448 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "內部錯誤，problem resolver 處理失敗" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1467 msgid "Internal error, AllUpgrade broke stuff" msgstr "內部錯誤,AllUpgrade 造成錯誤" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1514 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "無法找到 %s 套件。" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 #, c-format msgid "Couldn't find package %s" msgstr "無法找到 %s 套件。" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1652 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意,根據正規表示法“%2$s”選擇了 %1$s\n" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1683 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "但是『%s』卻將被安裝。" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1696 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "用『apt-get -f install』指令或許能修正這些問題。" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1699 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1069,7 +1063,7 @@ msgstr "" "無法滿足的相依關係。請嘗試不指定套件明成來執行“apt-get -f install”(或指>\n" "定一個解決辦法)。" -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1711 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1080,7 +1074,7 @@ msgstr "" "或是您使用不穩定(unstable)發行版而這些需要的套件尚未完成\n" "或從 Incoming 目錄移除。" -#: cmdline/apt-get.cc:1758 +#: cmdline/apt-get.cc:1719 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" @@ -1090,122 +1084,137 @@ msgstr "" "該套件無法安裝,您最好提交一個針對這個套件\n" "的臭蟲報告。" -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1727 msgid "Broken packages" msgstr "損毀的套件" -#: cmdline/apt-get.cc:1795 +#: cmdline/apt-get.cc:1756 msgid "The following extra packages will be installed:" msgstr "下列的【新】套件都將被安裝：" -#: cmdline/apt-get.cc:1884 +#: cmdline/apt-get.cc:1845 msgid "Suggested packages:" msgstr "建議(Suggested)的套件:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1846 msgid "Recommended packages:" msgstr "推薦(Recommended)的套件:" -#: cmdline/apt-get.cc:1913 +#: cmdline/apt-get.cc:1874 msgid "Calculating upgrade... " msgstr "籌畫升級套件中..." -#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 msgid "Failed" msgstr "失敗" -#: cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1882 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 msgid "Internal error, problem resolver broke stuff" msgstr "內部錯誤，problem resolver 處理失敗" -#: cmdline/apt-get.cc:2096 +#: cmdline/apt-get.cc:2057 msgid "Must specify at least one package to fetch source for" msgstr "必須指定至少一個對應的套件才能下載源碼" -#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2087 cmdline/apt-get.cc:2353 #, c-format msgid "Unable to find a source package for %s" msgstr "無法找到 %s 套件的源碼" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2103 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2108 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possible unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2163 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "略過已被下載的檔案“%s”\n" -#: cmdline/apt-get.cc:2203 +#: cmdline/apt-get.cc:2191 #, c-format msgid "You don't have enough free space in %s" msgstr "『%s』內沒有足夠的空間。" -#: cmdline/apt-get.cc:2209 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下載 %2$sB 中 %1$sB 的原始檔案。\n" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2200 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下載 %sB 的原始檔案。\n" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2206 #, c-format msgid "Fetch source %s\n" msgstr "下載源碼 %s\n" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2237 msgid "Failed to fetch some archives." msgstr "無法下載某些檔案。" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "略過已經被解開到 %s 目錄的源碼檔案\n" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "執行解開套件指令 '%s' 時失敗。\n" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "請檢查是否安裝了“dpkg-dev”套件。\n" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Build command '%s' failed.\n" msgstr "執行建立套件指令 '%s' 時失敗。\n" -#: cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:2314 msgid "Child process failed" msgstr "子程序失敗" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2330 msgid "Must specify at least one package to check builddeps for" msgstr "必須指定至少一個套件才能檢查其建立相依關係(builddeps)" -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "無法取得 %s 的建構相依關係。" -#: cmdline/apt-get.cc:2390 +#: cmdline/apt-get.cc:2378 #, c-format msgid "%s has no build depends.\n" msgstr "%s 無建立相依關係訊息。\n" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2430 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "由於無法找到套件 %3$s ,因此不能滿足 %2$s 所要求的 %1$s 相依關係" -#: cmdline/apt-get.cc:2495 +#: cmdline/apt-get.cc:2483 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1214,30 +1223,30 @@ msgstr "" "由於無法找到符合要求的套件 %3$s 的可用版本,因此不能滿足 %2$s 所要求的 %1$s 的" "相依關係" -#: cmdline/apt-get.cc:2531 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:已安裝的套件 %3$s 太新了" -#: cmdline/apt-get.cc:2556 +#: cmdline/apt-get.cc:2544 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:%3$s" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2558 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "無法滿足套件 %s 所要求的建構相依關係。" -#: cmdline/apt-get.cc:2574 +#: cmdline/apt-get.cc:2562 msgid "Failed to process build dependencies" msgstr "無法處理建構相依關係" -#: cmdline/apt-get.cc:2606 +#: cmdline/apt-get.cc:2594 msgid "Supported modules:" msgstr "支援模組:" -#: cmdline/apt-get.cc:2647 +#: cmdline/apt-get.cc:2635 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1546,7 +1555,7 @@ msgstr "檔案 %s/%s 複寫套件 %s 中的相同檔案" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "無法讀取『%s』。" @@ -1775,7 +1784,7 @@ msgstr "連線逾時" msgid "Server closed the connection" msgstr "伺服器關閉聯線。" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 msgid "Read error" msgstr "讀取失敗。" @@ -1787,7 +1796,7 @@ msgstr "答覆超過緩衝區長度。" msgid "Protocol corruption" msgstr "協定失敗。" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 msgid "Write error" msgstr "寫入失敗。" @@ -1841,7 +1850,7 @@ msgstr "Data socket 連線逾時" msgid "Unable to accept connection" msgstr "無法允許連線" -#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "問題雜湊表" @@ -1868,39 +1877,39 @@ msgstr "查詢" msgid "Unable to invoke " msgstr "無法讀取 " -#: methods/connect.cc:64 +#: methods/connect.cc:65 #, c-format msgid "Connecting to %s (%s)" msgstr "連絡『%s (%s)』中" -#: methods/connect.cc:71 +#: methods/connect.cc:72 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:80 +#: methods/connect.cc:79 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "無法建立到『%s』的 socket (族=%u 型=%u 協定=%u)。" -#: methods/connect.cc:86 +#: methods/connect.cc:85 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "無法聯絡到主機『%s:%s (%s)』。" -#: methods/connect.cc:93 +#: methods/connect.cc:92 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "無法聯絡到主機『%s:%s (%s)』。" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "無法聯絡到主機『%s:%s (%s)』。" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:135 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "聯絡主機『%s』中" @@ -1972,76 +1981,76 @@ msgstr "無法開啟管線給 %s 使用" msgid "Read error from %s process" msgstr "從 %s 進程讀取錯誤" -#: methods/http.cc:377 +#: methods/http.cc:376 msgid "Waiting for headers" msgstr "等待標頭" -#: methods/http.cc:523 +#: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" msgstr "取得一個單行超過 %u 字元的標頭" -#: methods/http.cc:531 +#: methods/http.cc:530 msgid "Bad header line" msgstr "壞的標頭" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "http 伺服器傳送一個無效的回覆標頭" -#: methods/http.cc:586 +#: methods/http.cc:585 msgid "The HTTP server sent an invalid Content-Length header" msgstr "http 伺服器傳送一個無效的 Content-Length 標頭" -#: methods/http.cc:601 +#: methods/http.cc:600 msgid "The HTTP server sent an invalid Content-Range header" msgstr "http 伺服器傳送一個無效的 Content-Range 標頭" -#: methods/http.cc:603 +#: methods/http.cc:602 msgid "This HTTP server has broken range support" msgstr "http 伺服器有損毀的範圍支援" -#: methods/http.cc:627 +#: methods/http.cc:626 msgid "Unknown date format" msgstr "未知的資料格式" -#: methods/http.cc:774 +#: methods/http.cc:773 msgid "Select failed" msgstr "Select 失敗" -#: methods/http.cc:779 +#: methods/http.cc:778 msgid "Connection timed out" msgstr "連線逾時" -#: methods/http.cc:802 +#: methods/http.cc:801 msgid "Error writing to output file" msgstr "寫入輸出檔時發生錯誤" -#: methods/http.cc:833 +#: methods/http.cc:832 msgid "Error writing to file" msgstr "寫入檔案時發生錯誤" -#: methods/http.cc:861 +#: methods/http.cc:860 msgid "Error writing to the file" msgstr "寫入檔案時發生錯誤" -#: methods/http.cc:875 +#: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" msgstr "從遠端主機讀取錯誤，關閉連線" -#: methods/http.cc:877 +#: methods/http.cc:876 msgid "Error reading from server" msgstr "從伺服器讀取發生錯誤" -#: methods/http.cc:1104 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "壞的標頭資料" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1123 methods/http.cc:1178 msgid "Connection failed" msgstr "連線失敗" -#: methods/http.cc:1228 +#: methods/http.cc:1230 msgid "Internal error" msgstr "內部錯誤" @@ -2176,6 +2185,7 @@ msgid "Unable to stat the mount point %s" msgstr "無法讀取掛載點 %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "無法進入『%s』目錄。" @@ -2184,70 +2194,70 @@ msgstr "無法進入『%s』目錄。" msgid "Failed to stat the cdrom" msgstr "CD-ROM 狀況讀取失敗" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:147 #, c-format msgid "Not using locking for read only lock file %s" msgstr "不使用檔案鎖定於唯獨檔案 %s" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:152 #, c-format msgid "Could not open lock file %s" msgstr "無法開啟『%s』鎖定檔。" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:170 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "不使用檔案鎖定於 nfs 掛載點上得檔案 %s" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Could not get lock %s" msgstr "無法取得『%s』鎖。" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:442 #, c-format msgid "Waited for %s but it wasn't there" msgstr "等待 %s 但是它不存在" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:452 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "子程序 %s 收到一個記憶體錯誤" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:455 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "子程序 %s 回傳錯誤碼(%u)" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "子程序 %s 不預期的結束" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:501 #, c-format msgid "Could not open file %s" msgstr "無法開啟『%s』檔案。" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:557 #, c-format msgid "read, still have %lu to read but none left" msgstr "讀取，仍有 %lu 未讀" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:587 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "寫入，仍有 %lu 待寫入但無法寫入" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:662 msgid "Problem closing the file" msgstr "程式關閉檔案" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:668 msgid "Problem unlinking the file" msgstr "程式刪除檔案" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:679 msgid "Problem syncing the file" msgstr "程式同步檔案" @@ -2411,7 +2421,7 @@ msgstr "未知的類別 %1$s 於來源檔 %3$s 第 %2$u 行" msgid "Malformed line %u in source list %s (vendor id)" msgstr "來源檔『%2$s』第 %1$u 行有錯誤 (商家名稱)。" -#: apt-pkg/packagemanager.cc:399 +#: apt-pkg/packagemanager.cc:428 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2442,6 +2452,12 @@ msgstr "無法解決依存關係。可能原因是某些套件被押後。" msgid "Unable to correct problems, you have held broken packages." msgstr "無法解決問題，因為某些損毀的套件被押後。" +#: apt-pkg/algorithms.cc:1369 apt-pkg/algorithms.cc:1371 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "有一些索引檔案不能下載,它們可能被忽略了,也可能轉而使用了舊的索引檔案。" + #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." @@ -2474,17 +2490,17 @@ msgstr "找不到安裝方式『%s』的驅動程式。" msgid "Method %s did not start correctly" msgstr "安裝方式『%s』沒有正確啟動。" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "更換媒體：請把名為 '%s' 的光碟置入 '%s' 碟機,然後按 [Enter] 鍵。" -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "本軟體不支持『%s』包裝法。" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "無法明白系統類別。" @@ -2497,11 +2513,11 @@ msgstr "無法讀取『%s』的目錄資料。" msgid "You must put some 'source' URIs in your sources.list" msgstr "『sources.list』檔中必須有一些『source』指令。" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "無法讀取套件清單或狀況檔。" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "用『apt-get -f install』指令或許能修正這些問題。" @@ -2612,45 +2628,45 @@ msgstr "收集檔案供應" msgid "IO Error saving source cache" msgstr "無法寫入來源暫存檔。" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "檔名因『%s』更換失敗 (%s → %s)。" -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "MD5 檢查碼不符合。" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5 檢查碼不符合。" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "以下 key ID 沒有可用的公鑰：\n" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1264 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。" -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1323 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。" -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1364 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "套件『%s』索引檔損壞—缺少『Filename:』欄。" -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1451 msgid "Size mismatch" msgstr "檔案大小不符合。" @@ -2761,71 +2777,78 @@ msgstr "寫入 %i 筆 %i 個不匹配檔案的紀錄。\n" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "寫入 %i 筆遺失 %i 個檔案和 %i 個不匹配檔案的紀錄。\n" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:454 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "找不到『%spartial』清單目錄。" -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:537 #, c-format msgid "Preparing %s" msgstr "準備配置%s中" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:538 #, c-format msgid "Unpacking %s" msgstr "解開%s中" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:543 #, c-format msgid "Preparing to configure %s" msgstr "準備設定%s檔" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:544 #, c-format msgid "Configuring %s" msgstr "設定%s中" -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "處理目錄 %s 時錯誤" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:549 #, c-format msgid "Installed %s" msgstr "已安裝%s" -#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Preparing for removal of %s" msgstr "正在準備 %s 的刪除操作" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:559 #, c-format msgid "Removing %s" msgstr "移除%s中" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:560 #, c-format msgid "Removed %s" msgstr "已移除%s" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:565 #, c-format msgid "Preparing to completely remove %s" msgstr "準備完整移除 %s" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:566 #, c-format msgid "Completely removed %s" msgstr "已完整移除%s" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:716 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:170 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "無法開啟『%s』檔案。" -- cgit v1.2.3 From 151c51065527790cb8d8b781d2a38a76981b0a30 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 9 Jan 2008 22:34:05 +0000 Subject: adjust changelog trailer to match upload --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index bd9061734..842187833 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,7 +15,7 @@ apt (0.7.9ubuntu3) hardy; urgency=low for "apt-get update" like operations for the frontends and also provides hooks to run stuff in APT::Update::{Pre,Post}-Invoke - -- Michael Vogt Mon, 07 Jan 2008 17:23:32 +0100 + -- Michael Vogt Mon, 07 Jan 2008 19:02:11 +0100 apt (0.7.9ubuntu2) hardy; urgency=low -- cgit v1.2.3 From d4a805ff383438300e9c0475179e495f2b32c92a Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 9 Jan 2008 22:35:39 +0000 Subject: releasing version 0.7.9ubuntu4 --- configure.in | 2 +- debian/changelog | 4 ++-- po/apt-all.pot | 2 +- po/ar.po | 2 +- po/bg.po | 2 +- po/bs.po | 2 +- po/ca.po | 2 +- po/cs.po | 2 +- po/cy.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/dz.po | 2 +- po/el.po | 2 +- po/en_GB.po | 2 +- po/es.po | 2 +- po/eu.po | 2 +- po/fi.po | 2 +- po/fr.po | 2 +- po/gl.po | 2 +- po/he.po | 2 +- po/hu.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/km.po | 2 +- po/ko.po | 2 +- po/ku.po | 2 +- po/mr.po | 2 +- po/nb.po | 2 +- po/ne.po | 2 +- po/nl.po | 2 +- po/nn.po | 2 +- po/pl.po | 2 +- po/pt.po | 2 +- po/pt_BR.po | 2 +- po/ro.po | 2 +- po/ru.po | 2 +- po/sk.po | 2 +- po/sl.po | 2 +- po/sv.po | 2 +- po/th.po | 2 +- po/tl.po | 2 +- po/uk.po | 2 +- po/vi.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- 45 files changed, 46 insertions(+), 46 deletions(-) diff --git a/configure.in b/configure.in index ebde69922..932ea5014 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.9ubuntu2") +AC_DEFINE_UNQUOTED(VERSION,"0.7.9ubuntu4") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 842187833..a0bf1dda0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.7.9ubuntu4) UNRELEASED; urgency=low +apt (0.7.9ubuntu4) hardy; urgency=low * apt-pkg/algorithms.cc: - Since APT::Get::List-Cleanup and APT::List-Cleanup both default to @@ -7,7 +7,7 @@ apt (0.7.9ubuntu4) UNRELEASED; urgency=low installer. Instead, disable list cleanup if either of them is set to false. - -- Colin Watson Wed, 09 Jan 2008 22:22:39 +0000 + -- Colin Watson Wed, 09 Jan 2008 22:34:37 +0000 apt (0.7.9ubuntu3) hardy; urgency=low diff --git a/po/apt-all.pot b/po/apt-all.pot index f593fb372..bea72f4c3 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/ar.po b/po/ar.po index b4133953c..7d3ca028c 100644 --- a/po/ar.po +++ b/po/ar.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2006-10-20 21:28+0300\n" "Last-Translator: Ossama M. Khayat \n" "Language-Team: Arabic \n" diff --git a/po/bg.po b/po/bg.po index 55e96ae34..15647eec1 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2006-10-12 20:14+0300\n" "Last-Translator: Yavor Doganov \n" "Language-Team: Bulgarian \n" diff --git a/po/bs.po b/po/bs.po index fb47d8937..fc90feb4b 100644 --- a/po/bs.po +++ b/po/bs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Šećerović \n" "Language-Team: Bosnian \n" diff --git a/po/ca.po b/po/ca.po index f17bf7524..eed3a4efd 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2006-02-05 22:00+0100\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" diff --git a/po/cs.po b/po/cs.po index 938028949..0c520b547 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2006-10-04 18:53+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" diff --git a/po/cy.po b/po/cy.po index 5ac0610be..477b23909 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" diff --git a/po/da.po b/po/da.po index 6e5532813..acf75d0bc 100644 --- a/po/da.po +++ b/po/da.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-da\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2007-09-06 21:40+0200\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish\n" diff --git a/po/de.po b/po/de.po index 50b4a7fbc..5255e4b82 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6.46.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2006-10-24 11:45+0200\n" "Last-Translator: Michael Piefel \n" "Language-Team: \n" diff --git a/po/dz.po b/po/dz.po index dbd2f0014..b63133cb4 100644 --- a/po/dz.po +++ b/po/dz.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po.pot\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2006-09-19 09:49+0530\n" "Last-Translator: Kinley Tshering \n" "Language-Team: Dzongkha \n" diff --git a/po/el.po b/po/el.po index 4aa8899bc..661311196 100644 --- a/po/el.po +++ b/po/el.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_el_new\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2006-01-18 15:16+0200\n" "Last-Translator: Konstantinos Margaritis \n" "Language-Team: Greek \n" diff --git a/po/en_GB.po b/po/en_GB.po index 6ca863c47..473f67f51 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6.46.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2006-10-12 11:07+0100\n" "Last-Translator: Neil Williams \n" "Language-Team: en_GB \n" diff --git a/po/es.po b/po/es.po index 0c5c39268..08a6720c4 100644 --- a/po/es.po +++ b/po/es.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6.42.3exp1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2007-06-21 13:06+0200\n" "Last-Translator: Javier Fernandez-Sanguino \n" "Language-Team: Debian Spanish \n" diff --git a/po/eu.po b/po/eu.po index fd7e5b4fa..b5aa5d456 100644 --- a/po/eu.po +++ b/po/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_eu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2007-11-27 10:10+0000\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara \n" diff --git a/po/fi.po b/po/fi.po index 9ec8c25b2..bcdb38df8 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2006-09-29 16:06+0300\n" "Last-Translator: Tapio Lehtonen \n" "Language-Team: Finnish \n" diff --git a/po/fr.po b/po/fr.po index b55fcf440..4e1d06a86 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2007-12-17 10:42+0530\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" diff --git a/po/gl.po b/po/gl.po index 82a97d267..629f6dbbe 100644 --- a/po/gl.po +++ b/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2007-10-29 14:02+0000\n" "Last-Translator: Jacobo Tarrío \n" "Language-Team: Galician \n" diff --git a/po/he.po b/po/he.po index e81cec165..0b28ca829 100644 --- a/po/he.po +++ b/po/he.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.25\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2004-06-10 19:58+0300\n" "Last-Translator: Lior Kaplan \n" "Language-Team: Hebrew\n" diff --git a/po/hu.po b/po/hu.po index 3f311af0b..3196d6814 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2006-10-21 11:04+0100\n" "Last-Translator: SZERVÁC Attila \n" "Language-Team: Hungarian \n" diff --git a/po/it.po b/po/it.po index 915153202..973ccef71 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2006-10-12 09:27+0200\n" "Last-Translator: Samuele Giovanni Tonon \n" "Language-Team: Italian \n" diff --git a/po/ja.po b/po/ja.po index 890b7ff10..65d5aac0f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2007-12-18 21:13+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian Japanese List \n" diff --git a/po/km.po b/po/km.po index 57320d56f..95ff58fae 100644 --- a/po/km.po +++ b/po/km.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_km\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2006-10-10 09:48+0700\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer \n" diff --git a/po/ko.po b/po/ko.po index a875085ec..4b306d528 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2007-10-29 13:10-0400\n" "Last-Translator: Sunjae Park \n" "Language-Team: Korean \n" diff --git a/po/ku.po b/po/ku.po index 7de94e2e9..fe1e25ac4 100644 --- a/po/ku.po +++ b/po/ku.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2006-09-16 17:51+0100\n" "Last-Translator: Erdal Ronahi \n" "Language-Team: Kurdish \n" diff --git a/po/mr.po b/po/mr.po index 9f323038a..610e26f03 100644 --- a/po/mr.po +++ b/po/mr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2006-08-09 16:17+0200\n" "Last-Translator: Priti Patil \n" "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India " diff --git a/po/nb.po b/po/nb.po index af80359f8..0c19bfcd6 100644 --- a/po/nb.po +++ b/po/nb.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2006-10-16 00:35+0100\n" "Last-Translator: Hans Fredrik Nordhaug \n" "Language-Team: Norwegian Bokmal \n" diff --git a/po/ne.po b/po/ne.po index 7f14aa8ce..98f49117d 100644 --- a/po/ne.po +++ b/po/ne.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2006-06-12 14:35+0545\n" "Last-Translator: Shiva Pokharel \n" "Language-Team: Nepali \n" diff --git a/po/nl.po b/po/nl.po index a93cdbbf7..736c6ca18 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2006-10-17 22:35+0100\n" "Last-Translator: Bart Cornelis \n" "Language-Team: debian-l10n-dutch \n" diff --git a/po/nn.po b/po/nn.po index 6823f538b..60c841de3 100644 --- a/po/nn.po +++ b/po/nn.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_nn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" diff --git a/po/pl.po b/po/pl.po index f7141ddf7..f54c2ad04 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2006-01-23 15:32+0100\n" "Last-Translator: Bartosz Fenski \n" "Language-Team: Polish \n" diff --git a/po/pt.po b/po/pt.po index ef84c6769..81fb68615 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2007-05-09 22:14+0100\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" diff --git a/po/pt_BR.po b/po/pt_BR.po index e94150b13..5ef954e4e 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2006-08-21 00:40-0300\n" "Last-Translator: Felipe Augusto van de Wiel (faw) \n" "Language-Team: l10n portuguese \n" diff --git a/po/ro.po b/po/ro.po index d25f84918..6ac316174 100644 --- a/po/ro.po +++ b/po/ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_ro\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2006-09-19 01:35+0300\n" "Last-Translator: Sorin Batariuc \n" "Language-Team: Romanian \n" diff --git a/po/ru.po b/po/ru.po index 5ef668cea..3eaa0a940 100644 --- a/po/ru.po +++ b/po/ru.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.6.46.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2007-01-03 23:33+0300\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" diff --git a/po/sk.po b/po/sk.po index f3ab96ef6..88f9c13aa 100644 --- a/po/sk.po +++ b/po/sk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2006-09-10 18:50+0200\n" "Last-Translator: Peter Mann \n" "Language-Team: Slovak \n" diff --git a/po/sl.po b/po/sl.po index e18c1ec1e..006155222 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2005-02-16 22:18+0100\n" "Last-Translator: Jure Cuhalev \n" "Language-Team: Slovenian \n" diff --git a/po/sv.po b/po/sv.po index 48bfa4a36..8f7d25d38 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2007-10-30 10:31+0100\n" "Last-Translator: Peter Karlsson \n" "Language-Team: Swedish \n" diff --git a/po/th.po b/po/th.po index ac2b093e0..a616df037 100644 --- a/po/th.po +++ b/po/th.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2007-09-17 16:07+0700\n" "Last-Translator: Theppitak Karoonboonyanan \n" "Language-Team: Thai \n" diff --git a/po/tl.po b/po/tl.po index f3ef9ac23..6d4d58c2b 100644 --- a/po/tl.po +++ b/po/tl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" diff --git a/po/uk.po b/po/uk.po index 8592193be..96d3a969f 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-all\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2006-07-29 15:57+0300\n" "Last-Translator: Artem Bondarenko \n" "Language-Team: Українська \n" diff --git a/po/vi.po b/po/vi.po index 20b21d7a7..f263ed78c 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2007-12-01 15:37+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" diff --git a/po/zh_CN.po b/po/zh_CN.po index fd85230d7..b252ca709 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.23\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2007-03-29 17:14+0800\n" "Last-Translator: Kov Chai \n" "Language-Team: Debian Chinese [GB] \n" diff --git a/po/zh_TW.po b/po/zh_TW.po index c27693cd6..acaf0577d 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-07 19:11+0100\n" +"POT-Creation-Date: 2008-01-09 22:34+0000\n" "PO-Revision-Date: 2006-10-21 16:58+0800\n" "Last-Translator: Asho Yeh \n" "Language-Team: Chinese/Traditional \n" -- cgit v1.2.3 From 5273f1bf4da222c54e7abe9f3c6482496f8e09fd Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 1 Feb 2008 15:46:07 +0100 Subject: * apt-pkg/deb/dpkgpm.cc: - add APT::Apport::MaxReports to limit the maximum number of reports generated in a single run (default to 3) --- apt-pkg/deb/dpkgpm.cc | 5 ++--- debian/changelog | 8 ++++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 8123a7aba..5ed6482fa 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -906,9 +906,8 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) if (_config->FindB("Dpkg::ApportFailureReport",true) == false) return; - // only report the first error if we are in StopOnError=false mode - // to prevent bogus reports - if((_config->FindB("Dpkg::StopOnError",true) == false) && pkgFailures > 1) + // only report the first error + if(pkgFailures > _config->FindI("APT::Apport::MaxReports", 3)) return; // get the pkgname and reportfile diff --git a/debian/changelog b/debian/changelog index 5bd5222cc..12b3b5ddc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.9ubuntu6) hardy; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - add APT::Apport::MaxReports to limit the maximum number + of reports generated in a single run (default to 3) + + -- + apt (0.7.9ubuntu5) hardy; urgency=low * Merged apt-authentication-reliabilty branch. This means -- cgit v1.2.3 From 5d149bfc7f34bc39e0edf8d9d98786cadefeeedf Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 4 Feb 2008 14:15:17 +0100 Subject: add APT::Update::Auth-Failure script --- apt-pkg/acquire-item.cc | 1 + test/pre-upload-check.py | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index ad48adcff..a00b0b6d3 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1179,6 +1179,7 @@ void pkgAcqMetaIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) "GPG error: %s: %s\n"), Desc.Description.c_str(), LookupTag(Message,"Message").c_str()); + RunScripts("APT::Update::Auth-Failure"); return; } else { _error->Warning(_("GPG error: %s: %s"), diff --git a/test/pre-upload-check.py b/test/pre-upload-check.py index ca44ec726..de43122ce 100755 --- a/test/pre-upload-check.py +++ b/test/pre-upload-check.py @@ -25,7 +25,8 @@ class testAptAuthenticationReliability(unittest.TestCase): apt = "apt-get" def setUp(self): - pass + if os.path.exists("/tmp/autFailure"): + os.unlink("/tmp/authFailure"); def testRepositorySigFailure(self): """ test if a repository that used to be authenticated and fails on @@ -39,26 +40,33 @@ class testAptAuthenticationReliability(unittest.TestCase): os.utime("/var/lib/apt/lists/%s" % os.path.basename(f), (0,0)) res = call([self.apt, "update", - "-o","Dir::Etc::sourcelist=./authReliability/sources.list.failure" + "-o","Dir::Etc::sourcelist=./authReliability/sources.list.failure", + "-o",'APT::Update::Auth-Failure::=touch /tmp/authFailure', ] + apt_args, stdout=stdout, stderr=stderr) self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Release.gpg"), "The gpg file disappeared, this should not happen") self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Packages"), "The Packages file disappeared, this should not happen") + self.assert_(os.path.exists("/tmp/authFailure"), + "The APT::Update::Auth-Failure script did not run") + os.unlink("/tmp/authFailure"); # the same with i-m-s hit this time for f in glob.glob("./authReliability/lists/*"): shutil.copy(f,"/var/lib/apt/lists") os.utime("/var/lib/apt/lists/%s" % os.path.basename(f), (time.time(),time.time())) res = call([self.apt, "update", - "-o","Dir::Etc::sourcelist=./authReliability/sources.list.failure" + "-o","Dir::Etc::sourcelist=./authReliability/sources.list.failure", + "-o",'APT::Update::Auth-Failure::=touch /tmp/authFailure', ] + apt_args, stdout=stdout, stderr=stderr) self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Release.gpg"), "The gpg file disappeared, this should not happen") self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Packages"), "The Packages file disappeared, this should not happen") + self.assert_(os.path.exists("/tmp/authFailure"), + "The APT::Update::Auth-Failure script did not run") def testRepositorySigGood(self): """ test that a regular repository with good data stays good @@ -239,5 +247,5 @@ if __name__ == "__main__": stderr = sys.stderr # run only one for now - #unittest.main(defaultTest="testAptAuthenticationReliability") - unittest.main() + unittest.main(defaultTest="testAptAuthenticationReliability") + #unittest.main() -- cgit v1.2.3 From d54385388a0773fada9e44c5d1cf020488047884 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 8 Feb 2008 14:30:39 +0100 Subject: make the test-suit more reliable --- test/pre-upload-check.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/test/pre-upload-check.py b/test/pre-upload-check.py index de43122ce..9c2e1916c 100755 --- a/test/pre-upload-check.py +++ b/test/pre-upload-check.py @@ -27,6 +27,8 @@ class testAptAuthenticationReliability(unittest.TestCase): def setUp(self): if os.path.exists("/tmp/autFailure"): os.unlink("/tmp/authFailure"); + if os.path.exists("/tmp/autFailure2"): + os.unlink("/tmp/authFailure2"); def testRepositorySigFailure(self): """ test if a repository that used to be authenticated and fails on @@ -49,8 +51,7 @@ class testAptAuthenticationReliability(unittest.TestCase): self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Packages"), "The Packages file disappeared, this should not happen") self.assert_(os.path.exists("/tmp/authFailure"), - "The APT::Update::Auth-Failure script did not run") - os.unlink("/tmp/authFailure"); + "The APT::Update::Auth-Failure script did not run (1)") # the same with i-m-s hit this time for f in glob.glob("./authReliability/lists/*"): shutil.copy(f,"/var/lib/apt/lists") @@ -58,15 +59,15 @@ class testAptAuthenticationReliability(unittest.TestCase): res = call([self.apt, "update", "-o","Dir::Etc::sourcelist=./authReliability/sources.list.failure", - "-o",'APT::Update::Auth-Failure::=touch /tmp/authFailure', + "-o",'APT::Update::Auth-Failure::=touch /tmp/authFailure2', ] + apt_args, stdout=stdout, stderr=stderr) self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Release.gpg"), "The gpg file disappeared, this should not happen") self.assert_(os.path.exists("/var/lib/apt/lists/people.ubuntu.com_%7emvo_apt_auth-test-suit_gpg-package-broken_Packages"), "The Packages file disappeared, this should not happen") - self.assert_(os.path.exists("/tmp/authFailure"), - "The APT::Update::Auth-Failure script did not run") + self.assert_(os.path.exists("/tmp/authFailure2"), + "The APT::Update::Auth-Failure script did not run (2)") def testRepositorySigGood(self): """ test that a regular repository with good data stays good -- cgit v1.2.3 From 99a5ac4da1f64b233c3f66f32593231ce3066757 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 11 Feb 2008 14:05:12 +0100 Subject: * share/apt-auth-failure.note: - show update-notifier note if the nightly update fails with a authentication failure (apt-authentication-reliability spec) --- Makefile | 1 + debian/changelog | 8 ++++++++ debian/rules | 1 + share/apt-auth-failure.note | 11 +++++++++++ share/makefile | 12 ++++++++++++ 5 files changed, 33 insertions(+) create mode 100644 share/apt-auth-failure.note create mode 100644 share/makefile diff --git a/Makefile b/Makefile index 664caca41..8e3ed7e3c 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,7 @@ all headers library clean veryclean binary program doc dirs: $(MAKE) -C apt-inst $@ $(MAKE) -C methods $@ $(MAKE) -C cmdline $@ + $(MAKE) -C share $@ $(MAKE) -C ftparchive $@ $(MAKE) -C dselect $@ $(MAKE) -C doc $@ diff --git a/debian/changelog b/debian/changelog index f1c694de2..cbe97d1cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.9ubuntu8) hardy; urgency=low + + * share/apt-auth-failure.note: + - show update-notifier note if the nightly update fails with a + authentication failure (apt-authentication-reliability spec) + + -- Michael Vogt Mon, 11 Feb 2008 14:04:56 +0100 + apt (0.7.9ubuntu7) hardy; urgency=low * methods/connect.cc: diff --git a/debian/rules b/debian/rules index 7bf99f9ef..4f6d72e06 100755 --- a/debian/rules +++ b/debian/rules @@ -214,6 +214,7 @@ apt: build debian/shlibs.local cp debian/apt.logrotate debian/$@/etc/logrotate.d/apt cp share/ubuntu-archive.gpg debian/$@/usr/share/$@ + sed 's/^_//' share/apt-auth-failure.note > debian/$@/usr/share/$@/apt-auth-failure.note cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove cp debian/apt.conf.ubuntu debian/$@/etc/apt/apt.conf.d/01ubuntu # head -n 500 ChangeLog > debian/ChangeLog diff --git a/share/apt-auth-failure.note b/share/apt-auth-failure.note new file mode 100644 index 000000000..3e8a9e71d --- /dev/null +++ b/share/apt-auth-failure.note @@ -0,0 +1,11 @@ +_Name: Apt Authentication issue +Priority: High +Terminal: False +Command: gksu -- synaptic --non-interactive --update-at-startup --hide-main-window +GettextDomain: apt +_Description: Problem during package list update. + The package list update failed with a authentication failure. + This usually happens behind a network proxy server. Please try + to click on the "Run this action now" button to correct the problem or + update the list manually by running Update Manager and clicking + on "Check". diff --git a/share/makefile b/share/makefile new file mode 100644 index 000000000..e35376d98 --- /dev/null +++ b/share/makefile @@ -0,0 +1,12 @@ + +BASE=.. +SUBDIR=share + +# Bring in the default rules +include ../buildlib/defaults.mak + +binary: apt-auth-failure.note.h + +apt-auth-failure.note.h: apt-auth-failure.note + intltool-extract -t gettext/rfc822deb apt-auth-failure.note + echo "share/apt-auth-failure.note.h" >> $(BUILD)/po/domains/apt/apt-auth-failure.note.srclist -- cgit v1.2.3 From 50d09ab350ae3e1150c2bda9be90918620231d14 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 11 Feb 2008 14:22:45 +0100 Subject: add missing intltool build-dependency --- configure.in | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 8dac41bb8..890643a3e 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.9ubuntu7") +AC_DEFINE_UNQUOTED(VERSION,"0.7.9ubuntu8") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/control b/debian/control index a93f76510..a8bfed1f2 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ XSBC-Original-Maintainer: APT Development Team Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt , Otavio Salvador Standards-Version: 3.7.2.2 Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5) -Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) +Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1), intltool XS-Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/apt/ubuntu Package: apt -- cgit v1.2.3 From 5dbdb2e1b4ea4e390a5bd6335b1be15aee930839 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 11 Feb 2008 14:34:00 +0100 Subject: debian/apt.cron.daily: show apt-auth-failure.note on auth failure in the night cron job --- debian/apt.cron.daily | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index d1016dfc5..c4124981a 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -182,7 +182,7 @@ fi UPDATE_STAMP=/var/lib/apt/periodic/update-stamp if check_stamp $UPDATE_STAMP $UpdateInterval; then - if apt-get -qq update 2>/dev/null; then + if apt-get -qq update -o APT::Update::Auth-Failure::="cp /usr/share/apt/apt-auth-failure.note /var/lib/update-notifier/user.d/" 2>/dev/null; then # Could possible test access to '/var/run/dbus/system_bus_socket' has well, # but I'm not sure how stable the internal pipe location is defined as # being; so for the moment just 2>/dev/null . --sladen 2007-09-27 -- cgit v1.2.3 From 77e53c8c64ff840cd7780816fc591cf0fa9ba095 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 11 Feb 2008 16:05:54 +0100 Subject: * fix FTBFS due to incorrect intltool build-depends --- debian/changelog | 6 ++++++ debian/control | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index cbe97d1cd..50def78bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apt (0.7.9ubuntu9) hardy; urgency=low + + * fix FTBFS due to incorrect intltool build-depends + + -- Michael Vogt Mon, 11 Feb 2008 16:04:37 +0100 + apt (0.7.9ubuntu8) hardy; urgency=low * share/apt-auth-failure.note: diff --git a/debian/control b/debian/control index a8bfed1f2..3af811010 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,8 @@ Maintainer: Ubuntu Core Developers XSBC-Original-Maintainer: APT Development Team Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt , Otavio Salvador Standards-Version: 3.7.2.2 -Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5) -Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1), intltool +Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), intltool +Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) XS-Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/apt/ubuntu Package: apt -- cgit v1.2.3 From 2ce23a2ae5d85565603038cbeae59219d36b0aea Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 13 Feb 2008 15:50:24 +0100 Subject: * debian/apt.cron.daily: - add apt-key net-update to the nightly cron job --- debian/apt.cron.daily | 3 +++ debian/changelog | 2 ++ 2 files changed, 5 insertions(+) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index c4124981a..d1ee08a5c 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -182,6 +182,9 @@ fi UPDATE_STAMP=/var/lib/apt/periodic/update-stamp if check_stamp $UPDATE_STAMP $UpdateInterval; then + # check for a new archive signing key (against the master keyring) + apt-key net-update + # now run the update if apt-get -qq update -o APT::Update::Auth-Failure::="cp /usr/share/apt/apt-auth-failure.note /var/lib/update-notifier/user.d/" 2>/dev/null; then # Could possible test access to '/var/run/dbus/system_bus_socket' has well, # but I'm not sure how stable the internal pipe location is defined as diff --git a/debian/changelog b/debian/changelog index c71695fd1..12b6d6306 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ apt (0.7.9ubuntu10) hardy; urgency=low ubuntu-archive-keyring.gpg and add keys from it that are signed by the ubuntu-master-keyring.gpg (apt-archive-key-signatures spec) + * debian/apt.cron.daily: + - add apt-key net-update to the nightly cron job -- -- cgit v1.2.3 From fd9a8ca2ed30994a7946acbf54f25d27fe2b10cb Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 13 Feb 2008 19:52:12 +0100 Subject: cmdline/apt-key: import net_update key from the project/ directory for now --- cmdline/apt-key | 2 +- configure.in | 2 +- debian/changelog | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmdline/apt-key b/cmdline/apt-key index e0c4b5e48..7d6f9c589 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -12,7 +12,7 @@ GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg" MASTER_KEYRING=/usr/share/keyrings/ubuntu-master-keyring.gpg ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg -ARCHIVE_KEYRING_URI=http://archive.ubuntu.com/ubuntu/ubuntu-archive-keyring.gpg +ARCHIVE_KEYRING_URI=http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg add_keys_with_verify_against_master_keyring() { ADD_KEYRING=$1 diff --git a/configure.in b/configure.in index 890643a3e..2e3fa05e8 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.9ubuntu8") +AC_DEFINE_UNQUOTED(VERSION,"0.7.9ubuntu10") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 12b6d6306..1e3a71dd3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,7 @@ apt (0.7.9ubuntu10) hardy; urgency=low * debian/apt.cron.daily: - add apt-key net-update to the nightly cron job - -- + -- Michael Vogt Wed, 13 Feb 2008 15:50:28 +0100 apt (0.7.9ubuntu9) hardy; urgency=low -- cgit v1.2.3 From 1fdd4ac46faf85127aa923ef16220f8951f3f182 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 20 Feb 2008 22:05:24 +0100 Subject: * debian/apt.cron.daily: - use admin user proxy settings --- debian/apt.cron.daily | 10 ++++++++++ debian/changelog | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index d1ee08a5c..1b54cdf1c 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -179,6 +179,16 @@ if ! apt-get check -q -q 2>/dev/null; then exit 1 fi +# set the proxy based on the admin users gconf settings +admin_user=$(getent group admin|cut -d: -f4|cut -d, -f1) +if [ -n "$admin_user" ] && [ -x /usr/bin/sudo ] && [ -z "$http_proxy" ]; then + use=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/use_http_proxy) + host=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/host) + port=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/port) + if [ "$use" = "true" ] && [ -n "$host" ] && [ -n "$port" ]; then + export http_proxy="http://$host:$port/" + fi +fi UPDATE_STAMP=/var/lib/apt/periodic/update-stamp if check_stamp $UPDATE_STAMP $UpdateInterval; then diff --git a/debian/changelog b/debian/changelog index 1e3a71dd3..3822c6a4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.9ubuntu11) hardy; urgency=low + + * debian/apt.cron.daily: + - use admin user proxy settings + + -- + apt (0.7.9ubuntu10) hardy; urgency=low * cmdline/apt-key: -- cgit v1.2.3 From 604c9ee885ba964a4057a6e9ba1f54103afee83d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 25 Feb 2008 18:10:54 +0000 Subject: * debian/apt.cron.daily: - show update-notifier notification on authentication failure --- debian/apt.cron.daily | 27 +++++++++++++++++++++++++++ debian/changelog | 2 ++ 2 files changed, 29 insertions(+) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 1b54cdf1c..b0164a576 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -147,6 +147,25 @@ check_size_constraints() fi } +# sleep for a random intervall of time (default 30min) +# (some code taken from cron-apt, thanks) +random_sleep() +{ + RandomSleep=1800 + eval $(apt-config shell RandomSleep APT::Periodic::RandomSleep) + if [ $RandomSleep -eq 0 ]; then + return + fi + if [ -z "$RANDOM" ] ; then + # A fix for shells that do not have this bash feature. + RANDOM=$(dd if=/dev/urandom count=1 2> /dev/null | cksum | cut -c"1-5") + fi + TIME=$(($RANDOM % $RandomSleep)) + sleep $TIME +} + +# main + if ! which apt-config >/dev/null; then exit 0 fi @@ -190,6 +209,14 @@ if [ -n "$admin_user" ] && [ -x /usr/bin/sudo ] && [ -z "$http_proxy" ]; then fi fi +# sleep random amount of time +random_sleep + +# check again if we can access the cache +if ! apt-get check -q -q 2>/dev/null; then + exit 1 +fi + UPDATE_STAMP=/var/lib/apt/periodic/update-stamp if check_stamp $UPDATE_STAMP $UpdateInterval; then # check for a new archive signing key (against the master keyring) diff --git a/debian/changelog b/debian/changelog index dfde4686d..cb7755547 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ apt (0.7.9ubuntu12) hardy; urgency=low - use admin user proxy settings * cmdline/apt-get.cc: - fix task installation (thanks to Colin Watson) + * debian/apt.cron.daily: + - show update-notifier notification on authentication failure -- -- cgit v1.2.3 From d45c49fcef815431b5c1e84be89c5cc99eba52e9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 4 Mar 2008 14:23:22 +0100 Subject: * debian/apt.cron.daily: - only call gconftool if gcontool is installed (LP: #194281) --- configure.in | 2 +- debian/apt.cron.daily | 2 +- debian/changelog | 11 ++++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/configure.in b/configure.in index 252018e37..7b0bafb24 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.9ubuntu11") +AC_DEFINE_UNQUOTED(VERSION,"0.7.9ubuntu12") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index b0164a576..2f1a59744 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -200,7 +200,7 @@ fi # set the proxy based on the admin users gconf settings admin_user=$(getent group admin|cut -d: -f4|cut -d, -f1) -if [ -n "$admin_user" ] && [ -x /usr/bin/sudo ] && [ -z "$http_proxy" ]; then +if [ -n "$admin_user" ] && [ -x /usr/bin/sudo ] && [ -z "$http_proxy" ] && [ -x /usr/bin/gconftool ]; then use=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/use_http_proxy) host=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/host) port=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/port) diff --git a/debian/changelog b/debian/changelog index cb7755547..3cf47a9c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,18 @@ +apt (0.7.9ubuntu13) hardy; urgency=low + + * debian/apt.cron.daily: + - only call gconftool if gcontool is installed (LP: #194281) + + -- Lionel Porcheron Sat, 01 Mar 2008 11:38:41 +0100 + apt (0.7.9ubuntu12) hardy; urgency=low * debian/apt.cron.daily: - use admin user proxy settings * cmdline/apt-get.cc: - fix task installation (thanks to Colin Watson) - * debian/apt.cron.daily: - - show update-notifier notification on authentication failure - -- + -- Michael Vogt Thu, 21 Feb 2008 15:07:44 +0100 apt (0.7.9ubuntu11) hardy; urgency=low -- cgit v1.2.3 From f1fc56f1e1f36441043471736dca96f8b0f08dbf Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 4 Mar 2008 14:51:50 +0100 Subject: * doc/apt_preferences.5.xml: - fix typo (LP: #150900) --- debian/changelog | 7 ++++++- doc/apt_preferences.5.xml | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3cf47a9c7..664a86884 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ apt (0.7.9ubuntu13) hardy; urgency=low + [ Lionel Porcheron ] * debian/apt.cron.daily: - only call gconftool if gcontool is installed (LP: #194281) - -- Lionel Porcheron Sat, 01 Mar 2008 11:38:41 +0100 + [ Michael Vogt ] + * doc/apt_preferences.5.xml: + - fix typo (LP: #150900) + + -- apt (0.7.9ubuntu12) hardy; urgency=low diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index ab0107d36..175339f5a 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -184,7 +184,7 @@ belonging to any distribution whose Archive name is "unstable Package: * Pin: release a=unstable -Pin-Priority: 500 +Pin-Priority: 50 The following record assigns a high priority to all package versions -- cgit v1.2.3 From c0f9395216139ddecbcc62cee748a7aea016cbca Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 4 Mar 2008 15:09:22 +0100 Subject: * doc/example/sources.list: - updated for hardy (LP: #195879) --- debian/changelog | 2 ++ doc/examples/sources.list | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 664a86884..21d2b4f70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ apt (0.7.9ubuntu13) hardy; urgency=low [ Michael Vogt ] * doc/apt_preferences.5.xml: - fix typo (LP: #150900) + * doc/example/sources.list: + - updated for hardy (LP: #195879) -- diff --git a/doc/examples/sources.list b/doc/examples/sources.list index b93306724..cc0fd2b8d 100644 --- a/doc/examples/sources.list +++ b/doc/examples/sources.list @@ -1,11 +1,11 @@ # See sources.list(5) for more information, especialy # Remember that you can only use http, ftp or file URIs # CDROMs are managed through the apt-cdrom tool. -deb http://us.archive.ubuntu.com/ubuntu gutsy main restricted -deb-src http://us.archive.ubuntu.com/ubuntu gutsy main restricted +deb http://us.archive.ubuntu.com/ubuntu hardy main restricted +deb-src http://us.archive.ubuntu.com/ubuntu hardy main restricted -deb http://security.ubuntu.com/ubuntu gutsy-security main restricted -deb-src http://security.ubuntu.com/ubuntu gutsy-security main restricted +deb http://security.ubuntu.com/ubuntu hardy-security main restricted +deb-src http://security.ubuntu.com/ubuntu hardy-security main restricted -deb http://us.archive.ubuntu.com/ubuntu gutsy-updates main restricted -deb-src http://us.archive.ubuntu.com/ubuntu gutsy-updates main restricted +deb http://us.archive.ubuntu.com/ubuntu hardy-updates main restricted +deb-src http://us.archive.ubuntu.com/ubuntu hardy-updates main restricted -- cgit v1.2.3 From 6f320e7b0fe9e9f1e1ac4452ba7a4c1eca297842 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 11 Mar 2008 09:54:45 +0100 Subject: * cmdline/apt-get.cc: - fix incorrect help output for -f (LP: #57487) --- cmdline/apt-get.cc | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 8956332a3..c522d4f87 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2662,7 +2662,7 @@ bool ShowHelp(CommandLine &CmdL) " -d Download only - do NOT install or unpack archives\n" " -s No-act. Perform ordering simulation\n" " -y Assume Yes to all queries and do not prompt\n" - " -f Attempt to continue if the integrity check fails\n" + " -f Attempt to correct a system with broken dependencies in place\n" " -m Attempt to continue if archives are unlocatable\n" " -u Show a list of upgraded packages as well\n" " -b Build the source package after fetching it\n" diff --git a/debian/changelog b/debian/changelog index 21d2b4f70..e531be876 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ apt (0.7.9ubuntu13) hardy; urgency=low - fix typo (LP: #150900) * doc/example/sources.list: - updated for hardy (LP: #195879) + * cmdline/apt-get.cc: + - fix incorrect help output for -f (LP: #57487) -- -- cgit v1.2.3 From 484befd1518245e795ed92e6c97ad50786f3b4a2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 11 Mar 2008 09:59:32 +0100 Subject: * typo fixes (LP: #107960) --- apt-pkg/depcache.h | 4 ++-- debian/changelog | 1 + methods/http.cc | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 7adf6fe7f..f41ad17e9 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -92,7 +92,7 @@ class pkgDepCache : protected pkgCache::Namespace * \param rootFunc A callback that can be used to add extra * packages to the root set. * - * \return \b false if an error occured. + * \return \b false if an error occurred. */ bool MarkRequired(InRootSetFunc &rootFunc); @@ -103,7 +103,7 @@ class pkgDepCache : protected pkgCache::Namespace * are tested to see whether they are actually garbage. If so, * they are marked as such. * - * \return \b false if an error occured. + * \return \b false if an error occurred. */ bool Sweep(); diff --git a/debian/changelog b/debian/changelog index e531be876..6fe4e5ece 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ apt (0.7.9ubuntu13) hardy; urgency=low - updated for hardy (LP: #195879) * cmdline/apt-get.cc: - fix incorrect help output for -f (LP: #57487) + * typo fixes (LP: #107960) -- diff --git a/methods/http.cc b/methods/http.cc index 6aa4261ff..61321c850 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -367,8 +367,8 @@ bool ServerState::Close() /*}}}*/ // ServerState::RunHeaders - Get the headers before the data /*{{{*/ // --------------------------------------------------------------------- -/* Returns 0 if things are OK, 1 if an IO error occursed and 2 if a header - parse error occured */ +/* Returns 0 if things are OK, 1 if an IO error occurred and 2 if a header + parse error occurred */ int ServerState::RunHeaders() { State = Header; -- cgit v1.2.3 From 871e594a6a75f8eb23942e1e097cba458fca8c5e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 11 Mar 2008 13:34:17 +0100 Subject: correct changelog --- debian/changelog | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6fe4e5ece..6fd1b2746 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.9ubuntu14) hardy; urgency=low + + * cmdline/apt-get.cc: + - fix incorrect help output for -f (LP: #57487) + * typo fixes (LP: #107960) + + -- + apt (0.7.9ubuntu13) hardy; urgency=low [ Lionel Porcheron ] @@ -9,11 +17,8 @@ apt (0.7.9ubuntu13) hardy; urgency=low - fix typo (LP: #150900) * doc/example/sources.list: - updated for hardy (LP: #195879) - * cmdline/apt-get.cc: - - fix incorrect help output for -f (LP: #57487) - * typo fixes (LP: #107960) - -- + -- Michael Vogt Tue, 04 Mar 2008 15:35:09 +0100 apt (0.7.9ubuntu12) hardy; urgency=low -- cgit v1.2.3 From 95717122196eb888bc81f5c3e8daa74cad8db649 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 11 Mar 2008 17:41:55 +0100 Subject: - run the problemResolver after a task was installed so that it can correct any missing dependencies --- cmdline/apt-get.cc | 5 ++++- debian/changelog | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index c522d4f87..c8671447e 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1506,10 +1506,13 @@ bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix, buf[end-start] = 0x0; if (regexec(&Pattern,buf,0,0,0) != 0) continue; - res &= TryToInstall(Pkg,Cache,Fix,Remove,false,ExpectedInst); + res &= TryToInstall(Pkg,Cache,Fix,Remove,true,ExpectedInst); found = true; } + // now let the problem resolver deal with any issues + Fix.Resolve(true); + if(!found) _error->Error(_("Couldn't find task %s"),taskname); diff --git a/debian/changelog b/debian/changelog index 6fd1b2746..df23ed1b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ apt (0.7.9ubuntu14) hardy; urgency=low * cmdline/apt-get.cc: - fix incorrect help output for -f (LP: #57487) + - run the problemResolver after a task was installed + so that it can correct any missing dependencies * typo fixes (LP: #107960) -- -- cgit v1.2.3 From bf8324550d44031fdad32de172634c971bd26596 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 11 Mar 2008 21:49:41 +0100 Subject: upload as 0.7.9ubuntu14 --- configure.in | 2 +- debian/changelog | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 7b0bafb24..7a0f131db 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.9ubuntu12") +AC_DEFINE_UNQUOTED(VERSION,"0.7.9ubuntu14") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index df23ed1b2..01ad9511f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,7 @@ apt (0.7.9ubuntu14) hardy; urgency=low so that it can correct any missing dependencies * typo fixes (LP: #107960) - -- + -- Michael Vogt Tue, 11 Mar 2008 21:46:07 +0100 apt (0.7.9ubuntu13) hardy; urgency=low @@ -19,6 +19,9 @@ apt (0.7.9ubuntu13) hardy; urgency=low - fix typo (LP: #150900) * doc/example/sources.list: - updated for hardy (LP: #195879) + * debian/apt.cron.daily: + - sleep random amount of time (default within 0-30min) before + starting the upate to hit the mirrors less hard -- Michael Vogt Tue, 04 Mar 2008 15:35:09 +0100 -- cgit v1.2.3 From c22356d86150dfee4903ff146a64cd5ad63be827 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 13 Mar 2008 23:42:43 +0100 Subject: * cmdline/apt-get.cc: - do two passes when installing tasks, first ignoring dependencies, then resolving them and run the problemResolver at the end so that it can correct any missing dependencies. This should fix livecd building for kubuntu (thanks to Jonathan Riddell for reporting the problem) --- cmdline/apt-get.cc | 29 +++++++++++++++++------------ configure.in | 2 +- debian/changelog | 11 +++++++++++ 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index c8671447e..cabbde5cb 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1495,19 +1495,24 @@ bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix, bool found = false; bool res = true; - for (Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) + + // two runs, first ignore dependencies, second install any missing + for(int IgnoreBroken=1; IgnoreBroken >= 0; IgnoreBroken--) { - pkgCache::VerIterator ver = Cache[Pkg].CandidateVerIter(Cache); - if(ver.end()) - continue; - pkgRecords::Parser &parser = Recs.Lookup(ver.FileList()); - parser.GetRec(start,end); - strncpy(buf, start, end-start); - buf[end-start] = 0x0; - if (regexec(&Pattern,buf,0,0,0) != 0) - continue; - res &= TryToInstall(Pkg,Cache,Fix,Remove,true,ExpectedInst); - found = true; + for (Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) + { + pkgCache::VerIterator ver = Cache[Pkg].CandidateVerIter(Cache); + if(ver.end()) + continue; + pkgRecords::Parser &parser = Recs.Lookup(ver.FileList()); + parser.GetRec(start,end); + strncpy(buf, start, end-start); + buf[end-start] = 0x0; + if (regexec(&Pattern,buf,0,0,0) != 0) + continue; + res &= TryToInstall(Pkg,Cache,Fix,Remove,IgnoreBroken,ExpectedInst); + found = true; + } } // now let the problem resolver deal with any issues diff --git a/configure.in b/configure.in index 7a0f131db..f89333d42 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.9ubuntu14") +AC_DEFINE_UNQUOTED(VERSION,"0.7.9ubuntu15") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 01ad9511f..6bc4d01ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +apt (0.7.9ubuntu15) hardy; urgency=low + + * cmdline/apt-get.cc: + - do two passes when installing tasks, first ignoring dependencies, + then resolving them and run the problemResolver at the end + so that it can correct any missing dependencies. This should + fix livecd building for kubuntu (thanks to Jonathan Riddell + for reporting the problem) + + -- Michael Vogt Thu, 13 Mar 2008 23:25:45 +0100 + apt (0.7.9ubuntu14) hardy; urgency=low * cmdline/apt-get.cc: -- cgit v1.2.3 From 397d56f56b3ffaf38df57571c11f0699e2810902 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 8 Apr 2008 14:20:06 +0200 Subject: * cmdline/apt-key: - only check against master-keys in net-update to not break custom CDs (thanks to Colin Watson) --- cmdline/apt-key | 20 ++++++++++---------- debian/changelog | 8 ++++++++ 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/cmdline/apt-key b/cmdline/apt-key index 77a2a4623..de04d16da 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -29,9 +29,8 @@ add_keys_with_verify_against_master_keyring() { # when adding new keys, make sure that the archive-master-keyring # is honored. so: - # all keys that are exported and have the name - # "Ubuntu Archive Automatic Signing Key" must have a valid signature - # from a key in the ubuntu-master-keyring + # all keys that are exported must have a valid signature + # from a key in the $distro-master-keyring add_keys=`$GPG_CMD --keyring $ADD_KEYRING --with-colons --list-keys | grep ^pub | cut -d: -f5` master_keys=`$GPG_CMD --keyring $MASTER --with-colons --list-keys | grep ^pub | cut -d: -f5` for add_key in $add_keys; do @@ -81,13 +80,14 @@ update() { exit 1 fi - # add new keys, if no MASTER_KEYRING is used, use the traditional - # way - if [ -z "$MASTER_KEYRING" ]; then - $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --import - else - add_keys_with_verify_against_master_keyring $ARCHIVE_KEYRING $MASTER_KEYRING - fi + # add new keys from the package; + + # we do not use add_keys_with_verify_against_master_keyring here, + # because we "update" is run on regular package updates. A + # attacker might as well replace the master-archive-keyring file + # in the package and add his own keys. so this check wouldn't + # add any security. we *need* this check on net-update though + $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --import # remove no-longer supported/used keys keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys | grep ^pub | cut -d: -f5` diff --git a/debian/changelog b/debian/changelog index 6bc4d01ae..eaf33bf5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.9ubuntu16) hardy; urgency=low + + * cmdline/apt-key: + - only check against master-keys in net-update to not break + custom CDs (thanks to Colin Watson) + + -- Michael Vogt Tue, 08 Apr 2008 14:17:14 +0200 + apt (0.7.9ubuntu15) hardy; urgency=low * cmdline/apt-get.cc: -- cgit v1.2.3 From 7730e095a5be67ea86d012fc8c905449c0ae0b37 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 22 Apr 2008 15:32:14 +0200 Subject: apt-pkg/acquire-item.cc: fix breaking on unreachable networks --- apt-pkg/acquire-item.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index a00b0b6d3..aabc4b159 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -846,7 +846,7 @@ void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf) { Item::Failed(Message,Cnf); // move the sigfile back on transient network failures - if(FileExists(DestFile)) + if(FileExists(LastGoodSig)) Rename(LastGoodSig,Final); // set the status back to , Item::Failed likes to reset it -- cgit v1.2.3 From 5c92e3800d6ce8e9cde1e2816bd76c975d9342a7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 22 Apr 2008 16:40:03 +0200 Subject: uploaded to hardy-proposed --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3ea59d452..a4985768d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -apt (0.7.9ubuntu17) hardy; urgency=low +apt (0.7.9ubuntu17) hardy-proposed; urgency=low * apt-pkg/acquire-item.cc: - - fix signaure removal on transient network failures + - fix signaure removal on transient network failures LP: #220627 (thanks to Scott James Remnant) - -- Michael Vogt Tue, 22 Apr 2008 15:32:49 +0200 + -- Michael Vogt Tue, 22 Apr 2008 16:32:49 +0200 apt (0.7.9ubuntu16) hardy; urgency=low -- cgit v1.2.3 From d22d41ff6ffb978dcd0e867117617956bfe97274 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 5 May 2008 11:30:58 +0200 Subject: apt-pkg/depcache.cc: install recommends by default --- apt-pkg/depcache.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index d1bea4cf6..be768d0bf 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1183,7 +1183,7 @@ bool pkgDepCache::Policy::IsImportantDep(DepIterator Dep) return true; else if(Dep->Type == pkgCache::Dep::Recommends) { - if ( _config->FindB("APT::Install-Recommends", false)) + if ( _config->FindB("APT::Install-Recommends", true)) return true; // we suport a special mode to only install-recommends for certain // sections -- cgit v1.2.3 From 9bf036e28d4401f92a79f3486095ab1088d7ace5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 23 May 2008 09:21:34 +0200 Subject: * debian/control: - fix FTBFS by adding missing intltool dependency --- configure.in | 2 +- debian/changelog | 7 +++++++ debian/control | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index fbfb2fca2..f43f8cc23 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.14ubuntu1") +AC_DEFINE_UNQUOTED(VERSION,"0.7.14ubuntu2") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 8c48f5f90..c1bc31606 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.14ubuntu2) intrepid; urgency=low + + * debian/control: + - fix FTBFS by adding missing intltool dependency + + -- Michael Vogt Fri, 09 May 2008 13:50:22 +0200 + apt (0.7.14ubuntu1) intrepid; urgency=low [ Michael Vogt ] diff --git a/debian/control b/debian/control index a1c94ddd0..3df6226ff 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Ubuntu Core Developers XSBC-Original-Maintainer: APT Development Team Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt , Otavio Salvador Standards-Version: 3.7.2.2 -Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12-1), xsltproc, docbook-xsl, xmlto +Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12-1), xsltproc, docbook-xsl, xmlto, intltool Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/apt/ubuntu Package: apt -- cgit v1.2.3 From ff38d63b19c0be1fb4be9a692fed2702d935d5e5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 5 Aug 2008 10:09:42 +0200 Subject: * apt-pkg/deb/dpkgpm.cc: - fix uninitialized variable that caused no apport reports to be written sometimes (thanks to Matt Zimmerman) --- apt-pkg/deb/dpkgpm.cc | 8 +++++++- debian/changelog | 8 ++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 74f672dd9..ede1673bc 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -47,7 +47,7 @@ using namespace std; /* */ pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) : pkgPackageManager(Cache), dpkgbuf_pos(0), - term_out(NULL), PackagesDone(0), PackagesTotal(0) + term_out(NULL), PackagesDone(0), PackagesTotal(0), pkgFailures(0) { } /*}}}*/ @@ -946,11 +946,17 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) FILE *report; if (_config->FindB("Dpkg::ApportFailureReport",true) == false) + { + std::clog << "configured to not write apport reports" << std::endl; return; + } // only report the first error if(pkgFailures > _config->FindI("APT::Apport::MaxReports", 3)) + { + std::clog << _("No apport report written because MaxReports is reached already") << std::endl; return; + } // get the pkgname and reportfile pkgname = flNotDir(pkgpath); diff --git a/debian/changelog b/debian/changelog index e21260ffb..fb5fc9f77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.14ubuntu4) intrepid; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - fix uninitialized variable that caused no apport reports + to be written sometimes (thanks to Matt Zimmerman) + + -- + apt (0.7.14ubuntu3) intrepid; urgency=low [ Otavio Salvador ] -- cgit v1.2.3 From 00a4f00b44bc09cd62c7ecadf95b0a7825eb8192 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 7 Aug 2008 16:29:20 +0200 Subject: * debian/apt.conf.autoremove: - remove "linux-image" (and friends) from the auto-remove blacklist. we have the kernel fallback infrastructure now in intrepid (thanks to BenC) --- configure.in | 2 +- debian/apt.conf.autoremove | 7 ------- debian/changelog | 9 +++++++++ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/configure.in b/configure.in index cb229a68d..9e9582251 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.14ubuntu4") +AC_DEFINE_UNQUOTED(VERSION,"0.7.14ubuntu5") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove index 63b69d5f6..713dcdda6 100644 --- a/debian/apt.conf.autoremove +++ b/debian/apt.conf.autoremove @@ -1,12 +1,5 @@ APT { - NeverAutoRemove - { - "^linux-image.*"; - "^linux-restricted-modules.*"; - "^linux-ubuntu-modules-.*"; - }; - Never-MarkAuto-Sections { "metapackages"; diff --git a/debian/changelog b/debian/changelog index 44fcb96fe..e5669830d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +apt (0.7.14ubuntu6) UNRELEASED; urgency=low + + * debian/apt.conf.autoremove: + - remove "linux-image" (and friends) from the auto-remove + blacklist. we have the kernel fallback infrastructure now + in intrepid (thanks to BenC) + + -- Michael Vogt Thu, 07 Aug 2008 16:28:05 +0200 + apt (0.7.14ubuntu5) intrepid; urgency=low * fix various -Wall warnings -- cgit v1.2.3 From d6a4afcb1b937e07aaf186346f064833f65acfbd Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 11 Aug 2008 18:21:37 +0200 Subject: * apt-pkg/deb/dpkgpm.cc: - improve the filtering for duplicated apport reports (thanks to seb128 for pointing that problem out) --- apt-pkg/deb/dpkgpm.cc | 17 ++++++++++++++++- debian/changelog | 3 +++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index e1b3c6bc0..08291854f 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -387,6 +387,14 @@ void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line) if(strncmp(action,"error",strlen("error")) == 0) { + // urgs, sometime has ":" in its error string so that we + // end up with the error message split between list[3] + // and list[4], e.g. the message: + // failed in buffer_write(fd) (10, ret=-1): backend dpkg-deb ... + // concat them again + if( list[4] != NULL) + list[4][-1] = ':'; + status << "pmerror:" << list[1] << ":" << (PackagesDone/float(PackagesTotal)*100.0) << ":" << list[3] @@ -954,13 +962,20 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) return; } - // only report the first error + // only report the first errors if(pkgFailures > _config->FindI("APT::Apport::MaxReports", 3)) { std::clog << _("No apport report written because MaxReports is reached already") << std::endl; return; } + // check if its not a follow up error + const char *needle = dgettext("dpkg", "dependency problems - leaving unconfigured"); + if(strstr(errormsg, needle) != NULL) { + std::clog << _("No apport report written because the error message indicates its a followup error from a previous failure.") << std::endl; + return; + } + // get the pkgname and reportfile pkgname = flNotDir(pkgpath); pos = pkgname.find('_'); diff --git a/debian/changelog b/debian/changelog index 5df4cc26b..e7a3ea9ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ apt (0.7.14ubuntu6) UNRELEASED; urgency=low - support having CDs with no Packages file (just a Packages.gz) by not forcing a verification on non-existing files (LP: #255545) + * apt-pkg/deb/dpkgpm.cc: + - improve the filtering for duplicated apport reports (thanks + to seb128 for pointing that problem out) -- Michael Vogt Thu, 07 Aug 2008 16:28:05 +0200 -- cgit v1.2.3 From 5279f566ec5bba9f5003440ecc575dc4d32b756b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 11 Aug 2008 19:40:57 +0200 Subject: support a ":" in the dpkg error output --- apt-pkg/deb/dpkgpm.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 08291854f..8c353a9d9 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -341,7 +341,7 @@ void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line) 'processing: trigproc: trigger' */ - char* list[5]; + char* list[6]; // dpkg sends multiline error messages sometimes (see // #374195 for a example. we should support this by // either patching dpkg to not send multiline over the @@ -390,10 +390,10 @@ void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line) // urgs, sometime has ":" in its error string so that we // end up with the error message split between list[3] // and list[4], e.g. the message: - // failed in buffer_write(fd) (10, ret=-1): backend dpkg-deb ... + // "failed in buffer_write(fd) (10, ret=-1): backend dpkg-deb ..." // concat them again - if( list[4] != NULL) - list[4][-1] = ':'; + if( list[4] != NULL ) + list[3][strlen(list[3])] = ':'; status << "pmerror:" << list[1] << ":" << (PackagesDone/float(PackagesTotal)*100.0) -- cgit v1.2.3 From 2f0d5deabcd1d75400d302bdbb330184d4fe97ba Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 11 Aug 2008 19:44:23 +0200 Subject: do not report disk full errors from dpkg via apport --- apt-pkg/deb/dpkgpm.cc | 7 +++++++ debian/changelog | 1 + 2 files changed, 8 insertions(+) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 8c353a9d9..2e9dedefa 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -976,6 +977,12 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) return; } + // do not report disk-full failures + if(strstr(errormsg, strerror(ENOSPC)) != NULL) { + std::clog << _("No apport report written because the error message indicates a disk full error") << std::endl; + return; + } + // get the pkgname and reportfile pkgname = flNotDir(pkgpath); pos = pkgname.find('_'); diff --git a/debian/changelog b/debian/changelog index e7a3ea9ad..7c5ef5b0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ apt (0.7.14ubuntu6) UNRELEASED; urgency=low * apt-pkg/deb/dpkgpm.cc: - improve the filtering for duplicated apport reports (thanks to seb128 for pointing that problem out) + - do not report disk full errors from dpkg via apport -- Michael Vogt Thu, 07 Aug 2008 16:28:05 +0200 -- cgit v1.2.3 From cd88b9dac79404291d869e12a21d15cd7887c078 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 9 Sep 2008 21:28:48 +0200 Subject: uploaded as 0.7.14ubuntu6 --- configure.in | 2 +- debian/changelog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 9e9582251..679e601a3 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.14ubuntu5") +AC_DEFINE_UNQUOTED(VERSION,"0.7.14ubuntu6") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 7c5ef5b0e..6a91d68d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.7.14ubuntu6) UNRELEASED; urgency=low +apt (0.7.14ubuntu6) intrepid; urgency=low * debian/apt.conf.autoremove: - remove "linux-image" (and friends) from the auto-remove -- cgit v1.2.3 From 07dd557b6fd80ce2df235f1697189b6a8f190ff4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 24 Nov 2008 10:44:46 +0100 Subject: * apt-pkg/deb/dpkgpm.cc: - fix potential hang when in a backgroud process group --- apt-pkg/deb/dpkgpm.cc | 16 ++++++++++++---- configure.in | 2 +- debian/changelog | 7 ++++--- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 2e9dedefa..a88e23081 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -563,6 +563,11 @@ static int racy_pselect(int nfds, fd_set *readfds, fd_set *writefds, */ bool pkgDPkgPM::Go(int OutStatusFd) { + fd_set rfds; + struct timespec tv; + sigset_t sigmask; + sigset_t original_sigmask; + unsigned int MaxArgs = _config->FindI("Dpkg::MaxArgs",8*1024); unsigned int MaxArgBytes = _config->FindI("Dpkg::MaxArgBytes",32*1024); bool NoTriggers = _config->FindB("DPkg::NoTriggers",false); @@ -777,7 +782,14 @@ bool pkgDPkgPM::Go(int OutStatusFd) rtt = tt; cfmakeraw(&rtt); rtt.c_lflag &= ~ECHO; + // block SIGTTOU during tcsetattr to prevent a hang if + // the process is a member of the background process group + // http://www.opengroup.org/onlinepubs/000095399/functions/tcsetattr.html + sigemptyset(&sigmask); + sigaddset(&sigmask, SIGTTOU); + sigprocmask(SIG_BLOCK,&sigmask, &original_sigmask); tcsetattr(0, TCSAFLUSH, &rtt); + sigprocmask(SIG_SETMASK, &original_sigmask, 0); } // Fork dpkg @@ -844,10 +856,6 @@ bool pkgDPkgPM::Go(int OutStatusFd) close(slave); // setups fds - fd_set rfds; - struct timespec tv; - sigset_t sigmask; - sigset_t original_sigmask; sigemptyset(&sigmask); sigprocmask(SIG_BLOCK,&sigmask,&original_sigmask); diff --git a/configure.in b/configure.in index 679e601a3..aaaa44f43 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.14ubuntu6") +AC_DEFINE_UNQUOTED(VERSION,"0.7.14ubuntu7") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 0c7e07c9b..042603ae6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,12 @@ -apt (0.7.14ubuntu7) intrepid; urgency=low +apt (0.7.14ubuntu7) jaunty; urgency=low * cmdline/apt-cache.cc: - remove the gettext from a string that consists entirely of variables (LP: #56792) - * + * apt-pkg/deb/dpkgpm.cc: + - fix potential hang when in a backgroud process group - -- + -- Michael Vogt Tue, 28 Oct 2008 21:09:12 +0100 apt (0.7.14ubuntu6) intrepid; urgency=low -- cgit v1.2.3 From 3024a85e0ce1b732338cdb23c86a2111a9846c38 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 26 Nov 2008 11:19:11 +0100 Subject: * apt-pkg/deb/dpkgpm.cc: - filter "ENOMEM" errors when creating apport reports --- apt-pkg/deb/dpkgpm.cc | 6 ++++++ debian/changelog | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index ae99e4324..a54c20330 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1027,6 +1027,12 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) return; } + // do not report out-of-memory failures + if(strstr(errormsg, strerror(ENOMEM)) != NULL) { + std::clog << _("No apport report written because the error message indicates a out of memory error") << std::endl; + return; + } + // get the pkgname and reportfile pkgname = flNotDir(pkgpath); pos = pkgname.find('_'); diff --git a/debian/changelog b/debian/changelog index acc413bea..0a8771b92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.19ubuntu2) jaunty; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - filter "ENOMEM" errors when creating apport reports + + -- + apt (0.7.19ubuntu1) jaunty; urgency=low * merge from debian -- cgit v1.2.3 From ed3524975b9e07d3555509294ba13b81bff3c187 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 26 Nov 2008 17:38:31 +0100 Subject: * /apt-pkg/deb/debsystem.cc: - add 'sudo' to the error message to "run 'dpkg --configure -a'" (LP: #52697) --- apt-pkg/deb/debsystem.cc | 2 +- debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc index 11a84f1c6..7fa98f29d 100644 --- a/apt-pkg/deb/debsystem.cc +++ b/apt-pkg/deb/debsystem.cc @@ -79,7 +79,7 @@ bool debSystem::Lock() close(LockFD); LockFD = -1; return _error->Error("dpkg was interrupted, you must manually " - "run 'dpkg --configure -a' to correct the problem. "); + "run 'sudo dpkg --configure -a' to correct the problem. "); } LockCount++; diff --git a/debian/changelog b/debian/changelog index 0a8771b92..384abf64e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ apt (0.7.19ubuntu2) jaunty; urgency=low + [ Michael Vogt ] * apt-pkg/deb/dpkgpm.cc: - filter "ENOMEM" errors when creating apport reports + [ Ian Weisser ] + * /apt-pkg/deb/debsystem.cc: + - add 'sudo' to the error message to "run 'dpkg --configure -a'" + (LP: #52697) + -- apt (0.7.19ubuntu1) jaunty; urgency=low -- cgit v1.2.3 From 12ede3486283262ee8c50506cf96dd2b266d713c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 26 Nov 2008 19:50:49 +0100 Subject: make dpkg string translatable --- apt-pkg/deb/debsystem.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc index 7fa98f29d..f2340a4ad 100644 --- a/apt-pkg/deb/debsystem.cc +++ b/apt-pkg/deb/debsystem.cc @@ -78,8 +78,8 @@ bool debSystem::Lock() { close(LockFD); LockFD = -1; - return _error->Error("dpkg was interrupted, you must manually " - "run 'sudo dpkg --configure -a' to correct the problem. "); + return _error->Error(_("dpkg was interrupted, you must manually " + "run 'sudo dpkg --configure -a' to correct the problem. ")); } LockCount++; -- cgit v1.2.3 From 9772f307fdf1f4cc94690b4ba3705a8f891033fe Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 8 Dec 2008 09:37:09 -0800 Subject: * cmdline/apt-get.cc: - fix "apt-get source pkg=ver" if binary name != source name (LP: #202219) * doc/makefile: - add examples/apt-https-method-example.conf --- cmdline/apt-get.cc | 6 +++--- debian/changelog | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index bd95e917b..ea7d45952 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1295,9 +1295,9 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, { string Ver = Parse->Version(); - // Skip name mismatches - if (IsMatch == true && Parse->Package() != Src) - continue; + // show name mismatches + if (IsMatch == true && Parse->Package() != Src) + ioprintf(c1out, _("No source package '%s' picking '%s' instead"), Parse->Package(), Src); if (VerTag.empty() == false) { diff --git a/debian/changelog b/debian/changelog index 384abf64e..8c69f4b34 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ apt (0.7.19ubuntu2) jaunty; urgency=low [ Michael Vogt ] * apt-pkg/deb/dpkgpm.cc: - filter "ENOMEM" errors when creating apport reports + * cmdline/apt-get.cc: + - fix "apt-get source pkg=ver" if binary name != source name + (LP: #202219) [ Ian Weisser ] * /apt-pkg/deb/debsystem.cc: @@ -35,6 +38,8 @@ apt (0.7.19) unstable; urgency=low [ Michael Vogt ] + * doc/makefile: + - add examples/apt-https-method-example.conf - fix SIGHUP handling (closes: #463030) [ Christian Perrier ] -- cgit v1.2.3 From bb3ac2f648764e7ee2a8cdc7739d56de6311c88f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 8 Dec 2008 10:50:59 -0800 Subject: apt-pkg/deb/debsystem.cc: add missing apti18n.h header --- apt-pkg/deb/debsystem.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc index f2340a4ad..e1aacdbdb 100644 --- a/apt-pkg/deb/debsystem.cc +++ b/apt-pkg/deb/debsystem.cc @@ -17,6 +17,7 @@ #include #include #include +#include #include #include -- cgit v1.2.3 From 616c8327a7b57dc4fedf5d1952a2b14559002fd8 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 16 Dec 2008 06:59:56 +0100 Subject: * apt-pkg/indexrecords.cc: - fix some i18n issues * apt-pkg/contrib/strutl.h: - add new strprintf() function to make i18n strings easier * apt-pkg/dev/debsystem.cc: - add missing apti18n.h header --- .bzr-builddeb/default.conf | 2 ++ apt-pkg/contrib/strutl.cc | 15 +++++++++++++++ apt-pkg/contrib/strutl.h | 1 + apt-pkg/indexrecords.cc | 6 +++--- configure.in | 2 +- debian/changelog | 8 +++++++- debian/copyright | 2 +- 7 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 .bzr-builddeb/default.conf diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf new file mode 100644 index 000000000..3a08d6070 --- /dev/null +++ b/.bzr-builddeb/default.conf @@ -0,0 +1,2 @@ +[BUILDDEB] +native = True diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index bd374fd1e..cdd88827b 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -1032,6 +1032,21 @@ void ioprintf(ostream &out,const char *format,...) out << S; } /*}}}*/ +// strprintf - C format string outputter to C++ strings /*{{{*/ +// --------------------------------------------------------------------- +/* This is used to make the internationalization strings easier to translate + and to allow reordering of parameters */ +void strprintf(string &out,const char *format,...) +{ + va_list args; + va_start(args,format); + + // sprintf the description + char S[1024]; + vsnprintf(S,sizeof(S),format,args); + out = string(S); +} + /*}}}*/ // safe_snprintf - Safer snprintf /*{{{*/ // --------------------------------------------------------------------- /* This is a snprintf that will never (ever) go past 'End' and returns a diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index 53146ced7..d9972abf4 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -59,6 +59,7 @@ bool Hex2Num(const string &Str,unsigned char *Num,unsigned int Length); bool TokSplitString(char Tok,char *Input,char **List, unsigned long ListMax); void ioprintf(ostream &out,const char *format,...) APT_FORMAT2; +void strprintf(string &out,const char *format,...) APT_FORMAT2; char *safe_snprintf(char *Buffer,char *End,const char *Format,...) APT_FORMAT3; bool CheckDomainList(const string &Host, const string &List); diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc index 502f454a8..ab208e246 100644 --- a/apt-pkg/indexrecords.cc +++ b/apt-pkg/indexrecords.cc @@ -37,14 +37,14 @@ bool indexRecords::Load(const string Filename) pkgTagFile TagFile(&Fd, Fd.Size() + 256); // XXX if (_error->PendingError() == true) { - ErrorText = _(("Unable to parse Release file " + Filename).c_str()); + strprintf(ErrorText, _("Unable to parse Release file %s"),Filename.c_str()); return false; } pkgTagSection Section; if (TagFile.Step(Section) == false) { - ErrorText = _(("No sections in Release file " + Filename).c_str()); + strprintf(ErrorText, _("No sections in Release file %s"), Filename.c_str()); return false; } @@ -78,7 +78,7 @@ bool indexRecords::Load(const string Filename) if(HashString::SupportedHashes()[i] == NULL) { - ErrorText = _(("No Hash entry in Release file " + Filename).c_str()); + strprintf(ErrorText, _("No Hash entry in Release file %s"), Filename.c_str()); return false; } diff --git a/configure.in b/configure.in index f3210d425..d8de01565 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.19ubuntu1") +AC_DEFINE_UNQUOTED(VERSION,"0.7.19ubuntu2") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 8c69f4b34..6abba0096 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,13 +6,19 @@ apt (0.7.19ubuntu2) jaunty; urgency=low * cmdline/apt-get.cc: - fix "apt-get source pkg=ver" if binary name != source name (LP: #202219) + * apt-pkg/indexrecords.cc: + - fix some i18n issues + * apt-pkg/contrib/strutl.h: + - add new strprintf() function to make i18n strings easier + * apt-pkg/dev/debsystem.cc: + - add missing apti18n.h header [ Ian Weisser ] * /apt-pkg/deb/debsystem.cc: - add 'sudo' to the error message to "run 'dpkg --configure -a'" (LP: #52697) - -- + -- Michael Vogt Tue, 16 Dec 2008 06:59:17 +0100 apt (0.7.19ubuntu1) jaunty; urgency=low diff --git a/debian/copyright b/debian/copyright index 9e277e57d..3baf9ac5a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Apt is copyright 1997, 1998, 1999 Jason Gunthorpe and others. -Apt is licened under the terms of the GNU General Public License (GPL), +Apt is licensed under the terms of the GNU General Public License (GPL), version 2.0 or later, as published by the Free Software Foundation. See the file COPYING.GPL [included], /usr/share/common-licenses/GPL, or for the terms of the latest version -- cgit v1.2.3 From 71da8af4dabe8680802ef291267c2f53d7942d18 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 16 Dec 2008 07:38:42 +0100 Subject: Clarify the --help for 'purge' (LP: #243948) --- cmdline/apt-get.cc | 2 +- debian/changelog | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index ea7d45952..d5869da43 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2659,7 +2659,7 @@ bool ShowHelp(CommandLine &CmdL) " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" " autoremove - Remove automatically all unused packages\n" - " purge - Remove and purge packages\n" + " purge - Remove packages and config files\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" diff --git a/debian/changelog b/debian/changelog index f15652d0b..15d5730f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,9 @@ apt (0.7.19ubuntu2) jaunty; urgency=low * apt-pkg/dev/debsystem.cc: - add missing apti18n.h header + [ Dereck Wonnacott ] + * Clarify the --help for 'purge' (LP: #243948) + [ Christian Perrier ] * Translations: - French corrected (remove awful use of first person) -- cgit v1.2.3 From 1cbc5ac38be0077742cd0e714737cfde0ca84412 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 8 Jan 2009 13:50:07 +0100 Subject: merge from the mvo branch --- apt-pkg/contrib/strutl.cc | 14 +++++++++----- debian/changelog | 7 +++++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index cdd88827b..fe9082f63 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -331,23 +331,27 @@ string TimeToStr(unsigned long Sec) { if (Sec > 60*60*24) { - sprintf(S,"%lid %lih%limin%lis",Sec/60/60/24,(Sec/60/60) % 24,(Sec/60) % 60,Sec % 60); + //d means days, h means hours, min means minutes, s means seconds + sprintf(S,_("%lid %lih %limin %lis"),Sec/60/60/24,(Sec/60/60) % 24,(Sec/60) % 60,Sec % 60); break; } if (Sec > 60*60) { - sprintf(S,"%lih%limin%lis",Sec/60/60,(Sec/60) % 60,Sec % 60); + //h means hours, min means minutes, s means seconds + sprintf(S,_("%lih %limin %lis"),Sec/60/60,(Sec/60) % 60,Sec % 60); break; } if (Sec > 60) { - sprintf(S,"%limin%lis",Sec/60,Sec % 60); + //min means minutes, s means seconds + sprintf(S,_("%limin %lis"),Sec/60,Sec % 60); break; } - - sprintf(S,"%lis",Sec); + + //s means seconds + sprintf(S,_("%lis"),Sec); break; } diff --git a/debian/changelog b/debian/changelog index 15d5730f4..8c7b62e18 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.19ubuntu3) jaunty; urgency=low + + * apt-pkg/contrib/strutl.cc: + - fix TimeToStr i18n (LP: #289807) + + -- + apt (0.7.19ubuntu2) jaunty; urgency=low [ Michael Vogt ] -- cgit v1.2.3 From 28dbfcdc3a00a5ad20cf0a0b17cea3c842aaf983 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 26 Jan 2009 14:14:58 +0100 Subject: readd "linux-image" (and friends) to the auto-remove blacklist --- debian/apt.conf.autoremove | 8 ++++++++ debian/changelog | 3 +++ 2 files changed, 11 insertions(+) diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove index 713dcdda6..42081014a 100644 --- a/debian/apt.conf.autoremove +++ b/debian/apt.conf.autoremove @@ -1,5 +1,13 @@ APT { + NeverAutoRemove + { + "^linux-firmware$"; + "^linux-image.*"; + "^linux-restricted-modules.*"; + "^linux-ubuntu-modules-.*"; + }; + Never-MarkAuto-Sections { "metapackages"; diff --git a/debian/changelog b/debian/changelog index 306110cd6..2c4802e3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ apt (0.7.19ubuntu3) jaunty; urgency=low * apt-inst/contrib/arfile.cc: - support members ending with '/' as well (thanks to Michal Cihr, closes: #500988) + * debian/apt.conf.autoremove: + - readd "linux-image" (and friends) to the auto-remove + blacklist [ Christian Perrier ] * Translations: -- cgit v1.2.3 From 236527f0fffe30fc8988e17d926778c23ac1f902 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 28 Jan 2009 17:39:37 +0100 Subject: LP: #263089 --- apt-pkg/deb/debsystem.cc | 10 +++++----- cmdline/apt-get.cc | 2 +- debian/changelog | 2 ++ methods/gpgv.cc | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc index e1aacdbdb..ee2039c75 100644 --- a/apt-pkg/deb/debsystem.cc +++ b/apt-pkg/deb/debsystem.cc @@ -18,7 +18,7 @@ #include #include #include - + #include #include #include @@ -67,11 +67,11 @@ bool debSystem::Lock() if (LockFD == -1) { if (errno == EACCES || errno == EAGAIN) - return _error->Error("Unable to lock the administration directory (%s), " - "is another process using it?",AdminDir.c_str()); + return _error->Error(_("Unable to lock the administration directory (%s), " + "is another process using it?"),AdminDir.c_str()); else - return _error->Error("Unable to lock the administration directory (%s), " - "are you root?",AdminDir.c_str()); + return _error->Error(_("Unable to lock the administration directory (%s), " + "are you root?"),AdminDir.c_str()); } // See if we need to abort with a dirty journal diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index d5869da43..38775f70d 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1297,7 +1297,7 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, // show name mismatches if (IsMatch == true && Parse->Package() != Src) - ioprintf(c1out, _("No source package '%s' picking '%s' instead"), Parse->Package(), Src); + ioprintf(c1out, _("No source package '%s' picking '%s' instead"), Parse->Package().c_str(), Src.c_str()); if (VerTag.empty() == false) { diff --git a/debian/changelog b/debian/changelog index 2c4802e3b..478638a63 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ apt (0.7.19ubuntu3) jaunty; urgency=low * debian/apt.conf.autoremove: - readd "linux-image" (and friends) to the auto-remove blacklist + * fix some i18n issues (thanks to Gabor Kelemen) + LP: #263089 [ Christian Perrier ] * Translations: diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 9f4683e6e..f3277b300 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -264,7 +264,7 @@ bool GPGVMethod::Fetch(FetchItem *Itm) // least one bad signature. good signatures and NoPubKey signatures // happen easily when a file is signed with multiple signatures if(GoodSigners.empty() or !BadSigners.empty()) - return _error->Error(errmsg.c_str()); + return _error->Error("%s", errmsg.c_str()); } // Just pass the raw output up, because passing it as a real data -- cgit v1.2.3 From d043faa8dfcfa4c432558f3f1b4ec149e33f9d8e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 28 Jan 2009 17:40:42 +0100 Subject: merged from the mvo branch --- apt-pkg/deb/debsystem.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc index ee2039c75..186918d25 100644 --- a/apt-pkg/deb/debsystem.cc +++ b/apt-pkg/deb/debsystem.cc @@ -97,7 +97,7 @@ bool debSystem::UnLock(bool NoErrors) return false; if (LockCount < 1) - return _error->Error("Not locked"); + return _error->Error(_("Not locked")); if (--LockCount == 0) { close(LockFD); -- cgit v1.2.3 From ebb461fdf02ee3e038d4b3a4ab1a0a60188edf9a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 2 Feb 2009 12:14:36 +0100 Subject: * [ABI break] merge support for http redirects, thanks to Jeff Licquia and Anthony Towns * [ABI break] use int for the package IDs (thanks to Steve Cotton) - Galician updated. Closes: #509151 - Catalan updated. Closes: #509375 - Vietnamese updated. Closes: #509422 - Traditional Chinese added. Closes: #510664 * COPYING: - Actualized. Removed obsolete Qt section, added GPLv2 clause. (Closes: #440049, #509337) * Clarify the --help for 'purge' (LP: #243948) --- apt-pkg/acquire-method.cc | 32 +++++++++++++++++++ apt-pkg/acquire-method.h | 2 ++ apt-pkg/acquire-worker.cc | 14 +++++++++ apt-pkg/makefile | 2 +- apt-pkg/pkgcache.h | 8 ++--- debian/changelog | 44 ++++++++++++-------------- methods/http.cc | 78 ++++++++++++++++++++++++++++++++++++++++++++++- methods/http.h | 3 ++ methods/makefile | 2 +- 9 files changed, 153 insertions(+), 32 deletions(-) diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc index 26f992bcf..150fbb77b 100644 --- a/apt-pkg/acquire-method.cc +++ b/apt-pkg/acquire-method.cc @@ -452,6 +452,38 @@ void pkgAcqMethod::Status(const char *Format,...) } /*}}}*/ +// AcqMethod::Redirect - Send a redirect message /*{{{*/ +// --------------------------------------------------------------------- +/* This method sends the redirect message and also manipulates the queue + to keep the pipeline synchronized. */ +void pkgAcqMethod::Redirect(const string &NewURI) +{ + string CurrentURI = ""; + if (Queue != 0) + CurrentURI = Queue->Uri; + + char S[1024]; + snprintf(S, sizeof(S)-50, "103 Redirect\nURI: %s\nNew-URI: %s\n\n", + CurrentURI.c_str(), NewURI.c_str()); + + if (write(STDOUT_FILENO,S,strlen(S)) != (ssize_t)strlen(S)) + exit(100); + + // Change the URI for the request. + Queue->Uri = NewURI; + + /* To keep the pipeline synchronized, move the current request to + the end of the queue, past the end of the current pipeline. */ + FetchItem *I; + for (I = Queue; I->Next != 0; I = I->Next) ; + I->Next = Queue; + Queue = Queue->Next; + I->Next->Next = 0; + if (QueueBack == 0) + QueueBack = I->Next; +} + /*}}}*/ + // AcqMethod::FetchResult::FetchResult - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h index 18c2cf009..99a4605b1 100644 --- a/apt-pkg/acquire-method.h +++ b/apt-pkg/acquire-method.h @@ -86,6 +86,8 @@ class pkgAcqMethod void Log(const char *Format,...); void Status(const char *Format,...); + void Redirect(const string &NewURI); + int Run(bool Single = false); inline void SetFailReason(string Msg) {FailReason = Msg;}; inline void SetIP(string aIP) {IP = aIP;}; diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index 1a754dae9..78c68737c 100644 --- a/apt-pkg/acquire-worker.cc +++ b/apt-pkg/acquire-worker.cc @@ -220,6 +220,20 @@ bool pkgAcquire::Worker::RunMessages() Status = LookupTag(Message,"Message"); break; + // 103 Redirect + case 103: + { + if (Itm == 0) + { + _error->Error("Method gave invalid 103 Redirect message"); + break; + } + + string NewURI = LookupTag(Message,"New-URI",URI.c_str()); + Itm->URI = NewURI; + break; + } + // 200 URI Start case 200: { diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 1b78c94f6..087f17740 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -13,7 +13,7 @@ include ../buildlib/defaults.mak # methods/makefile - FIXME LIBRARY=apt-pkg LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER) -MAJOR=4.6 +MAJOR=4.7 MINOR=0 SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil APT_DOMAIN:=libapt-pkg$(MAJOR) diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 59d5003bb..759e9a225 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -214,7 +214,7 @@ struct pkgCache::Package unsigned char InstState; // Flags unsigned char CurrentState; // State - unsigned short ID; + unsigned int ID; unsigned long Flags; }; @@ -235,7 +235,7 @@ struct pkgCache::PackageFile // Linked list map_ptrloc NextFile; // PackageFile - unsigned short ID; + unsigned int ID; time_t mtime; // Modification time for the file }; @@ -272,7 +272,7 @@ struct pkgCache::Version map_ptrloc Size; // These are the .deb size map_ptrloc InstalledSize; unsigned short Hash; - unsigned short ID; + unsigned int ID; unsigned char Priority; }; @@ -289,7 +289,7 @@ struct pkgCache::Description map_ptrloc NextDesc; // Description map_ptrloc ParentPkg; // Package - unsigned short ID; + unsigned int ID; }; struct pkgCache::Dependency diff --git a/debian/changelog b/debian/changelog index 478638a63..bfbe6be5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,29 +6,11 @@ apt (0.7.19ubuntu3) jaunty; urgency=low * apt-inst/contrib/arfile.cc: - support members ending with '/' as well (thanks to Michal Cihr, closes: #500988) - * debian/apt.conf.autoremove: - - readd "linux-image" (and friends) to the auto-remove + * debian/apt.conf.autoremove: + - readd "linux-image" (and friends) to the auto-remove blacklist - * fix some i18n issues (thanks to Gabor Kelemen) - LP: #263089 - - [ Christian Perrier ] - * Translations: - - Galician updated. Closes: #509151 - - Catalan updated. Closes: #509375 - - Vietnamese updated. Closes: #509422 - - Traditional Chinese added. Closes: #510664 - - [ Eugene V. Lyubimkin ] - * COPYING: - - Actualized. Removed obsolete Qt section, added GPLv2 clause. - (Closes: #440049, #509337) - - -- Michael Vogt Mon, 05 Jan 2009 08:59:20 +0100 - -apt (0.7.19ubuntu2) jaunty; urgency=low - - [ Michael Vogt ] + * fix some i18n issues (thanks to Gabor Kelemen) + LP: #263089 * apt-pkg/deb/dpkgpm.cc: - filter "ENOMEM" errors when creating apport reports * cmdline/apt-get.cc: @@ -40,15 +22,27 @@ apt (0.7.19ubuntu2) jaunty; urgency=low - add new strprintf() function to make i18n strings easier * apt-pkg/dev/debsystem.cc: - add missing apti18n.h header - - [ Dereck Wonnacott ] - * Clarify the --help for 'purge' (LP: #243948) + * [ABI break] merge support for http redirects, thanks to + Jeff Licquia and Anthony Towns + * [ABI break] use int for the package IDs (thanks to Steve Cotton) [ Christian Perrier ] * Translations: + - Galician updated. Closes: #509151 + - Catalan updated. Closes: #509375 + - Vietnamese updated. Closes: #509422 + - Traditional Chinese added. Closes: #510664 - French corrected (remove awful use of first person) - Finnish updated. Closes: #508449 + [ Eugene V. Lyubimkin ] + * COPYING: + - Actualized. Removed obsolete Qt section, added GPLv2 clause. + (Closes: #440049, #509337) + + [ Dereck Wonnacott ] + * Clarify the --help for 'purge' (LP: #243948) + [ Eugene V. Lyubimkin ] * doc/examples/sources.list: - Removed obsolete commented non-us deb-src entry, replaced it with diff --git a/methods/http.cc b/methods/http.cc index b0fb89fda..44274bd78 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -38,6 +38,7 @@ #include #include #include +#include #include // Internet stuff @@ -56,6 +57,7 @@ int HttpMethod::FailFd = -1; time_t HttpMethod::FailTime = 0; unsigned long PipelineDepth = 10; unsigned long TimeOut = 120; +bool AllowRedirect = false; bool Debug = false; URI Proxy; @@ -627,6 +629,12 @@ bool ServerState::HeaderLine(string Line) return true; } + if (stringcasecmp(Tag,"Location:") == 0) + { + Location = Val; + return true; + } + return true; } /*}}}*/ @@ -899,7 +907,9 @@ bool HttpMethod::ServerDie(ServerState *Srv) 1 - IMS hit 3 - Unrecoverable error 4 - Error with error content page - 5 - Unrecoverable non-server error (close the connection) */ + 5 - Unrecoverable non-server error (close the connection) + 6 - Try again with a new or changed URI + */ int HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv) { // Not Modified @@ -911,6 +921,27 @@ int HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv) return 1; } + /* Redirect + * + * Note that it is only OK for us to treat all redirection the same + * because we *always* use GET, not other HTTP methods. There are + * three redirection codes for which it is not appropriate that we + * redirect. Pass on those codes so the error handling kicks in. + */ + if (AllowRedirect + && (Srv->Result > 300 && Srv->Result < 400) + && (Srv->Result != 300 // Multiple Choices + && Srv->Result != 304 // Not Modified + && Srv->Result != 306)) // (Not part of HTTP/1.1, reserved) + { + if (!Srv->Location.empty()) + { + NextURI = Srv->Location; + return 6; + } + /* else pass through for error message */ + } + /* We have a reply we dont handle. This should indicate a perm server failure */ if (Srv->Result < 200 || Srv->Result >= 300) @@ -1028,6 +1059,7 @@ bool HttpMethod::Configuration(string Message) if (pkgAcqMethod::Configuration(Message) == false) return false; + AllowRedirect = _config->FindB("Acquire::http::AllowRedirect",true); TimeOut = _config->FindI("Acquire::http::Timeout",TimeOut); PipelineDepth = _config->FindI("Acquire::http::Pipeline-Depth", PipelineDepth); @@ -1041,6 +1073,10 @@ bool HttpMethod::Configuration(string Message) /* */ int HttpMethod::Loop() { + typedef vector StringVector; + typedef vector::iterator StringVectorIterator; + map Redirected; + signal(SIGTERM,SigTerm); signal(SIGINT,SigTerm); @@ -1227,6 +1263,46 @@ int HttpMethod::Loop() break; } + // Try again with a new URL + case 6: + { + // Clear rest of response if there is content + if (Server->HaveContent) + { + File = new FileFd("/dev/null",FileFd::WriteExists); + Server->RunData(); + delete File; + File = 0; + } + + /* Detect redirect loops. No more redirects are allowed + after the same URI is seen twice in a queue item. */ + StringVector &R = Redirected[Queue->DestFile]; + bool StopRedirects = false; + if (R.size() == 0) + R.push_back(Queue->Uri); + else if (R[0] == "STOP" || R.size() > 10) + StopRedirects = true; + else + { + for (StringVectorIterator I = R.begin(); I != R.end(); I++) + if (Queue->Uri == *I) + { + R[0] = "STOP"; + break; + } + + R.push_back(Queue->Uri); + } + + if (StopRedirects == false) + Redirect(NextURI); + else + Fail(); + + break; + } + default: Fail(_("Internal error")); break; diff --git a/methods/http.h b/methods/http.h index dec5cd80f..bc076e1f8 100644 --- a/methods/http.h +++ b/methods/http.h @@ -99,6 +99,7 @@ struct ServerState enum {Chunked,Stream,Closes} Encoding; enum {Header, Data} State; bool Persistent; + string Location; // This is a Persistent attribute of the server itself. bool Pipeline; @@ -145,6 +146,8 @@ class HttpMethod : public pkgAcqMethod protected: virtual bool Fetch(FetchItem *); + string NextURI; + public: friend class ServerState; diff --git a/methods/makefile b/methods/makefile index 5c4fa82bf..1d022be90 100644 --- a/methods/makefile +++ b/methods/makefile @@ -7,7 +7,7 @@ include ../buildlib/defaults.mak BIN := $(BIN)/methods # FIXME.. -LIB_APT_PKG_MAJOR = 4.6 +LIB_APT_PKG_MAJOR = 4.7 APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR) # The file method -- cgit v1.2.3 From 4bfb7a7756eed967c1edad63bc16a37b741cafaa Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 9 Feb 2009 14:34:50 +0100 Subject: * cmdline/apt-get.cc: - default to "false" for the "APT::Get::Build-Dep-Automatic" option (follow debian here) --- cmdline/apt-get.cc | 2 +- debian/changelog | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 38775f70d..2117a7f2a 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2542,7 +2542,7 @@ bool DoBuildDep(CommandLine &CmdL) { // We successfully installed something; skip remaining alternatives skipAlternatives = hasAlternatives; - if(_config->FindB("APT::Get::Build-Dep-Automatic", true) == true) + if(_config->FindB("APT::Get::Build-Dep-Automatic", false) == true) Cache->MarkAuto(Pkg, true); continue; } diff --git a/debian/changelog b/debian/changelog index a21c383e5..89848f31c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,9 @@ apt (0.7.20.2ubuntu1) jaunty; urgency=low - add new strprintf() function to make i18n strings easier * apt-pkg/dev/debsystem.cc: - add missing apti18n.h header + * cmdline/apt-get.cc: + - default to "false" for the "APT::Get::Build-Dep-Automatic" + option (follow debian here) [ Dereck Wonnacott ] * Clarify the --help for 'purge' (LP: #243948) -- cgit v1.2.3 From 8872c430df84660fa994db0ebfa67861239fe739 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 9 Feb 2009 14:36:36 +0100 Subject: * methods/https.cc: - add Acquire::https::AllowRedirect support --- debian/changelog | 2 ++ doc/examples/configure-index | 6 ++++-- methods/https.cc | 5 +++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 89848f31c..23a0514f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,8 @@ apt (0.7.20.2ubuntu1) jaunty; urgency=low * cmdline/apt-get.cc: - default to "false" for the "APT::Get::Build-Dep-Automatic" option (follow debian here) + * methods/https.cc: + - add Acquire::https::AllowRedirect support [ Dereck Wonnacott ] * Clarify the --help for 'purge' (LP: #243948) diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 5cc6187a8..a3ccdded8 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -136,7 +136,8 @@ Acquire Proxy::http.us.debian.org "DIRECT"; // Specific per-host setting Timeout "120"; Pipeline-Depth "5"; - + AllowRedirect "true"; + // Cache Control. Note these do not work with Squid 2.0.2 No-Cache "false"; Max-Age "86400"; // 1 Day age on index files @@ -153,7 +154,8 @@ Acquire Verify-Peer "false"; SslCert "/etc/apt/some.pem"; CaPath "/etc/ssl/certs"; - Verify-Host" "2"; + Verify-Host" "true"; + AllowRedirect "true"; }; ftp diff --git a/methods/https.cc b/methods/https.cc index 98dfeefa1..87de54589 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -208,6 +208,11 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout); curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, timeout); + // set redirect options and default to 10 redirects + bool AllowRedirect = _config->FindI("Acquire::https::AllowRedirect", true); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, AllowRedirect); + curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 10); + // debug if(_config->FindB("Debug::Acquire::https", false)) curl_easy_setopt(curl, CURLOPT_VERBOSE, true); -- cgit v1.2.3 From 7e522e9e0e4808202061e0a73345bd8b18eccde3 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 9 Feb 2009 14:38:11 +0100 Subject: * apt-pkg/pkgcache.cc: - do not run "dpkg --configure pkg" if pkg is in trigger-awaited state (LP: #322955) - do not unlink files in partial/ (thanks to robbiew) --- apt-pkg/pkgcache.cc | 8 ++++++-- debian/changelog | 4 ++++ methods/https.cc | 1 - 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 8eb62089a..4fbf42c4b 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -275,8 +275,12 @@ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const if (Pkg->CurrentState == pkgCache::State::UnPacked || Pkg->CurrentState == pkgCache::State::HalfConfigured || - Pkg->CurrentState == pkgCache::State::TriggersPending || - Pkg->CurrentState == pkgCache::State::TriggersAwaited) + //we don't need to care for triggers awaiting packages + //dpkg will deal with them automatically when the + //trigger pending action is run (those packages are usually + //in half-configured or triggers-pending state) + //Pkg->CurrentState == pkgCache::State::TriggersAwaited + Pkg->CurrentState == pkgCache::State::TriggersPending) return NeedsConfigure; if (Pkg->CurrentState == pkgCache::State::HalfInstalled || diff --git a/debian/changelog b/debian/changelog index 23a0514f6..0e2d3afe6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,8 +32,12 @@ apt (0.7.20.2ubuntu1) jaunty; urgency=low * cmdline/apt-get.cc: - default to "false" for the "APT::Get::Build-Dep-Automatic" option (follow debian here) + * apt-pkg/pkgcache.cc: + - do not run "dpkg --configure pkg" if pkg is in trigger-awaited + state (LP: #322955) * methods/https.cc: - add Acquire::https::AllowRedirect support + - do not unlink files in partial/ (thanks to robbiew) [ Dereck Wonnacott ] * Clarify the --help for 'purge' (LP: #243948) diff --git a/methods/https.cc b/methods/https.cc index 87de54589..8bf44b52a 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -253,7 +253,6 @@ bool HttpsMethod::Fetch(FetchItem *Itm) // cleanup if(success != 0) { - unlink(File->Name().c_str()); _error->Error("%s", curl_errorstr); Fail(); return true; -- cgit v1.2.3 From 733b8d47048cede17286c6cf21dbe225fbb7800d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 5 Mar 2009 11:51:35 +0100 Subject: fix changelog --- debian/changelog | 3 --- 1 file changed, 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0e2d3afe6..480b42bf0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,9 +47,6 @@ apt (0.7.20.2ubuntu1) jaunty; urgency=low - add 'sudo' to the error message to "run 'dpkg --configure -a'" (LP: #52697) - -- Michael Vogt Tue, 16 Dec 2008 06:59:17 +0100 - - -- Michael Vogt Mon, 09 Feb 2009 14:21:05 +0100 apt (0.7.20.2) unstable; urgency=medium -- cgit v1.2.3 From 494c293c524e66bdbed117954db9d0bff38c82b4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 6 Mar 2009 10:15:28 +0100 Subject: * apt-pkg/deb/dpkgpm.cc: - revert termios patch (LP: #338514) --- apt-pkg/deb/dpkgpm.cc | 4 +--- debian/changelog | 7 +++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index a54c20330..d8c38427f 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -793,16 +793,14 @@ bool pkgDPkgPM::Go(int OutStatusFd) sighandler_t old_SIGHUP = signal(SIGHUP,SIG_IGN); struct termios tt; - struct termios tt_out; struct winsize win; int master; int slave; // FIXME: setup sensible signal handling (*ick*) tcgetattr(0, &tt); - tcgetattr(1, &tt_out); ioctl(0, TIOCGWINSZ, (char *)&win); - if (openpty(&master, &slave, NULL, &tt_out, &win) < 0) + if (openpty(&master, &slave, NULL, &tt, &win) < 0) { const char *s = _("Can not write log, openpty() " "failed (/dev/pts not mounted?)\n"); diff --git a/debian/changelog b/debian/changelog index 480b42bf0..b485c36aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.20.2ubuntu2) UNRELEASED; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - revert termios patch (LP: #338514) + + -- Michael Vogt Fri, 06 Mar 2009 10:15:15 +0100 + apt (0.7.20.2ubuntu1) jaunty; urgency=low [ Christian Perrier ] -- cgit v1.2.3 From 5ef499349c609f5ef50bd633692faa2665f4f96f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 9 Mar 2009 16:33:39 +0100 Subject: * cmdline/apt-get.cc - fix "apt-get source pkg" if there is a binary package and a source package of the same name but from different packages (LP: #330103) --- cmdline/apt-get.cc | 21 ++++++++++++++------- debian/changelog | 8 ++++++-- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 2117a7f2a..0339afdf1 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1272,16 +1272,23 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, } } } - - // No source package name.. - if (Src.empty() == true) - Src = TmpSrc; - + // The best hit pkgSrcRecords::Parser *Last = 0; unsigned long Offset = 0; string Version; bool IsMatch = false; + bool MatchSrcOnly = false; + + // No source package name.. + if (Src.empty() == true) + Src = TmpSrc; + else + // if we have a source pkg name, make sure to only search + // for srcpkg names, otherwise apt gets confused if there + // is a binary package "pkg1" and a source package "pkg1" + // with the same name but that comes from different packages + MatchSrcOnly = true; // If we are matching by version then we need exact matches to be happy if (VerTag.empty() == false) @@ -1291,13 +1298,13 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, binary packages in the search */ pkgSrcRecords::Parser *Parse; SrcRecs.Restart(); - while ((Parse = SrcRecs.Find(Src.c_str(),false)) != 0) + while ((Parse = SrcRecs.Find(Src.c_str(), MatchSrcOnly)) != 0) { string Ver = Parse->Version(); // show name mismatches if (IsMatch == true && Parse->Package() != Src) - ioprintf(c1out, _("No source package '%s' picking '%s' instead"), Parse->Package().c_str(), Src.c_str()); + ioprintf(c1out, _("No source package '%s' picking '%s' instead\n"), Parse->Package().c_str(), Src.c_str()); if (VerTag.empty() == false) { diff --git a/debian/changelog b/debian/changelog index b485c36aa..bef5c3cad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ -apt (0.7.20.2ubuntu2) UNRELEASED; urgency=low +apt (0.7.20.2ubuntu2) jaunty; urgency=low * apt-pkg/deb/dpkgpm.cc: - revert termios patch (LP: #338514) + * cmdline/apt-get.cc + - fix "apt-get source pkg" if there is a binary package and + a source package of the same name but from different + packages (LP: #330103) - -- Michael Vogt Fri, 06 Mar 2009 10:15:15 +0100 + -- Michael Vogt Mon, 09 Mar 2009 16:33:28 +0100 apt (0.7.20.2ubuntu1) jaunty; urgency=low -- cgit v1.2.3 From 5dad4134da37576de12721f34165c1fe4d138b3c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 19 Mar 2009 15:42:25 +0100 Subject: * methods/mirror.cc: - when download the mirror file and the server is down, return a propper error message (LP: #278635) --- cmdline/apt-report-mirror-failure | 2 +- debian/changelog | 8 ++++++++ methods/mirror.cc | 18 ++++++++++++++++-- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/cmdline/apt-report-mirror-failure b/cmdline/apt-report-mirror-failure index 1567e78e3..ef77d4954 100755 --- a/cmdline/apt-report-mirror-failure +++ b/cmdline/apt-report-mirror-failure @@ -5,7 +5,7 @@ import urllib import apt_pkg apt_pkg.init() -url = apt_pkg.Config.Find("Acquire::Mirror::ReportFailures", None) +url = apt_pkg.Config.Find("Acquire::Mirror::ReportFailures", "") #"http://people.ubuntu.com:9000/mirror-failure") #"http://localhost:9000/mirror-failure") if not url: diff --git a/debian/changelog b/debian/changelog index bef5c3cad..5a764383e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.20.2ubuntu3) jaunty; urgency=low + + * methods/mirror.cc: + - when download the mirror file and the server is down, + return a propper error message (LP: #278635) + + -- Michael Vogt Thu, 19 Mar 2009 15:42:15 +0100 + apt (0.7.20.2ubuntu2) jaunty; urgency=low * apt-pkg/deb/dpkgpm.cc: diff --git a/methods/mirror.cc b/methods/mirror.cc index bdd783cc7..b3a956b95 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -123,6 +123,8 @@ bool MirrorMethod::Clean(string Dir) bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str) { + if(Debug) + clog << "MirrorMethod::DownloadMirrorFile(): " << endl; // check the file, if it is not older than RefreshInterval just use it // otherwise try to get a new one @@ -251,6 +253,9 @@ string MirrorMethod::GetMirrorFileName(string mirror_uri_str) depth. */ bool MirrorMethod::Fetch(FetchItem *Itm) { + if(Debug) + clog << "MirrorMethod::Fetch()" << endl; + // the http method uses Fetch(0) as a way to update the pipeline, // just let it do its work in this case - Fetch() with a valid // Itm will always run before the first Fetch(0) @@ -269,8 +274,17 @@ bool MirrorMethod::Fetch(FetchItem *Itm) DownloadMirrorFile(Itm->Uri); } - if(Mirror.empty()) - SelectMirror(); + if(Mirror.empty()) { + if(!SelectMirror()) { + // no valid mirror selected, something went wrong downloading + // from the master mirror site most likely and there is + // no old mirror file availalbe + return false; + } + } + if(Debug) + clog << "selected mirror: " << Mirror << endl; + for (FetchItem *I = Queue; I != 0; I = I->Next) { -- cgit v1.2.3 From 5426445ae86c87f9f7589573daaf273f2fe93c56 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 19 Mar 2009 16:04:03 +0100 Subject: merge from mvo --- .bzr-builddeb.moved/default.conf | 2 ++ .bzr-builddeb/default.conf | 5 ++++- .bzr-builddeb/default.conf.orig | 2 ++ pre-build.sh | 3 +++ 4 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 .bzr-builddeb.moved/default.conf create mode 100644 .bzr-builddeb/default.conf.orig create mode 100644 pre-build.sh diff --git a/.bzr-builddeb.moved/default.conf b/.bzr-builddeb.moved/default.conf new file mode 100644 index 000000000..3a08d6070 --- /dev/null +++ b/.bzr-builddeb.moved/default.conf @@ -0,0 +1,2 @@ +[BUILDDEB] +native = True diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf index 3a08d6070..f2c082569 100644 --- a/.bzr-builddeb/default.conf +++ b/.bzr-builddeb/default.conf @@ -1,2 +1,5 @@ [BUILDDEB] -native = True +native = true + +[HOOKS] +pre-build=./pre-build.sh diff --git a/.bzr-builddeb/default.conf.orig b/.bzr-builddeb/default.conf.orig new file mode 100644 index 000000000..9c55498ce --- /dev/null +++ b/.bzr-builddeb/default.conf.orig @@ -0,0 +1,2 @@ +[BUILDDEB] +native = true diff --git a/pre-build.sh b/pre-build.sh new file mode 100644 index 000000000..2c7d28c2c --- /dev/null +++ b/pre-build.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +make -f Makefile startup doc -- cgit v1.2.3 From 1e2acb1a23c8f3c3a78e36462bc469e6d9a039a7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 26 Mar 2009 13:44:09 +0100 Subject: * ftparchive/cachedb.cc: - when apt-ftparchive clean is used, compact the database at the end (thanks to cprov) --- debian/changelog | 8 ++++++++ ftparchive/cachedb.cc | 1 + 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5a764383e..d1f885795 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.20.2ubuntu4) jaunty; urgency=low + + * ftparchive/cachedb.cc: + - when apt-ftparchive clean is used, compact the database + at the end (thanks to cprov) + + -- Michael Vogt Thu, 26 Mar 2009 13:43:59 +0100 + apt (0.7.20.2ubuntu3) jaunty; urgency=low * methods/mirror.cc: diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc index 8de3a0b9e..ff9a92d32 100644 --- a/ftparchive/cachedb.cc +++ b/ftparchive/cachedb.cc @@ -463,6 +463,7 @@ bool CacheDB::Clean() Cursor->c_del(Cursor,0); } + Dbp->compact(Dbp, NULL, NULL, NULL, NULL, DB_FREE_SPACE, NULL); return true; } -- cgit v1.2.3 From 6b802e56f55a43e9967cd8d41148646fd95ea8e3 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 26 Mar 2009 23:52:26 +0000 Subject: * cmdline/acqprogress.cc: - Call pkgAcquireStatus::Pulse even if quiet, so that we still get dlstatus messages on the status-fd (LP: #290234). --- cmdline/acqprogress.cc | 4 ++-- debian/changelog | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/cmdline/acqprogress.cc b/cmdline/acqprogress.cc index a5fee1db5..b3ded4142 100644 --- a/cmdline/acqprogress.cc +++ b/cmdline/acqprogress.cc @@ -145,11 +145,11 @@ void AcqTextStatus::Stop() bandwidth and ETA indicator. */ bool AcqTextStatus::Pulse(pkgAcquire *Owner) { + pkgAcquireStatus::Pulse(Owner); + if (Quiet > 0) return true; - pkgAcquireStatus::Pulse(Owner); - enum {Long = 0,Medium,Short} Mode = Long; char Buffer[sizeof(BlankLine)]; diff --git a/debian/changelog b/debian/changelog index d1f885795..bce1fa462 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.20.2ubuntu5) UNRELEASED; urgency=low + + * cmdline/acqprogress.cc: + - Call pkgAcquireStatus::Pulse even if quiet, so that we still get + dlstatus messages on the status-fd (LP: #290234). + + -- Colin Watson Thu, 26 Mar 2009 23:50:56 +0000 + apt (0.7.20.2ubuntu4) jaunty; urgency=low * ftparchive/cachedb.cc: -- cgit v1.2.3 From 848f5c4e06b3a159b5605405aa21570257d11ece Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 27 Mar 2009 11:15:45 +0000 Subject: make pre-build.sh executable so that bzr builddeb works straight from bzr --- pre-build.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 pre-build.sh diff --git a/pre-build.sh b/pre-build.sh old mode 100644 new mode 100755 -- cgit v1.2.3 From 7df4fe4025b02b4420e7529a0489f506f7e9b55a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 27 Mar 2009 13:56:54 +0100 Subject: pre-build.sh: add +x --- pre-build.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 pre-build.sh diff --git a/pre-build.sh b/pre-build.sh old mode 100644 new mode 100755 -- cgit v1.2.3 From 20f6e22e3af58a073579af43691d316927e4a69d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 30 Mar 2009 13:26:35 +0200 Subject: * debian/apt.cron.daily: - do not clutter cron mail with bogus gconftool messages (LP: #223502) --- configure.in | 2 +- debian/apt.cron.daily | 6 +++--- debian/changelog | 10 ++++++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/configure.in b/configure.in index ed3109563..130fe065d 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.20.2ubuntu1") +AC_DEFINE_UNQUOTED(VERSION,"0.7.20.2ubuntu5") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index f4eb6117a..bb72780a5 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -210,9 +210,9 @@ fi # set the proxy based on the admin users gconf settings admin_user=$(getent group admin|cut -d: -f4|cut -d, -f1) if [ -n "$admin_user" ] && [ -x /usr/bin/sudo ] && [ -z "$http_proxy" ] && [ -x /usr/bin/gconftool ]; then - use=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/use_http_proxy) - host=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/host) - port=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/port) + use=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/use_http_proxy 2>/dev/null) + host=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/host 2>/dev/null) + port=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/port 2>/dev/null) if [ "$use" = "true" ] && [ -n "$host" ] && [ -n "$port" ]; then export http_proxy="http://$host:$port/" fi diff --git a/debian/changelog b/debian/changelog index bce1fa462..62ce48ed9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,16 @@ -apt (0.7.20.2ubuntu5) UNRELEASED; urgency=low +apt (0.7.20.2ubuntu5) jaunty; urgency=low + [ Colin Watson ] * cmdline/acqprogress.cc: - Call pkgAcquireStatus::Pulse even if quiet, so that we still get dlstatus messages on the status-fd (LP: #290234). + + [ Michael Vogt ] + * debian/apt.cron.daily: + - do not clutter cron mail with bogus gconftool messages + (LP: #223502) - -- Colin Watson Thu, 26 Mar 2009 23:50:56 +0000 + -- Michael Vogt Mon, 30 Mar 2009 13:22:28 +0200 apt (0.7.20.2ubuntu4) jaunty; urgency=low -- cgit v1.2.3 From 5f71505b4f885ecd045c6fe40598e22ef9f328b7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 30 Mar 2009 14:00:00 +0200 Subject: merge fix for cache locking from debian (closes: #459344) --- debian/apt.cron.daily | 37 ++++++++++++++++++------------------- debian/changelog | 1 + 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index bb72780a5..d980efd7d 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -175,10 +175,16 @@ DownloadUpgradeableInterval=0 eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists DownloadUpgradeableInterval APT::Periodic::Download-Upgradeable-Packages) AutocleanInterval=$DownloadUpgradeableInterval eval $(apt-config shell AutocleanInterval APT::Periodic::AutocleanInterval) - UnattendedUpgradeInterval=0 eval $(apt-config shell UnattendedUpgradeInterval APT::Periodic::Unattended-Upgrade) +# check if we actually have to do anything +if [ $UpdateInterval -eq 0 ] && + [ $DownloadUpgradeableInterval -eq 0 ] && + [ $UnattendedUpgradeInterval -eq 0 ] && + [ $AutocleanInterval -eq 0 ]; then + exit 0 +fi # laptop check, on_ac_power returns: # 0 (true) System is on mains power @@ -192,19 +198,20 @@ if which on_ac_power >/dev/null; then fi fi -# check if we can lock the cache and if the cache is clean -# There's a reasonable chance that someone is already running an apt -# frontend that has locked the cache, so exit quietly if it is locked. -if ! apt-get check -q -q 2>/dev/null; then - exit 0 -fi - -# sleep random amount of time +# sleep random amount of time to avoid hitting the +# mirrors at the same time random_sleep -# check again if we can access the cache +# check if we can access the cache if ! apt-get check -q -q 2>/dev/null; then - exit 1 + # wait random amount of time before retrying + random_sleep + # check again + if ! apt-get check -q -q 2>/dev/null; then + echo "$0: could not lock the APT cache while performing daily cron job. " + echo "Is another package manager working?" + exit 1 + fi fi # set the proxy based on the admin users gconf settings @@ -218,14 +225,6 @@ if [ -n "$admin_user" ] && [ -x /usr/bin/sudo ] && [ -z "$http_proxy" ] && [ -x fi fi -# sleep random amount of time -random_sleep - -# check again if we can access the cache -if ! apt-get check -q -q 2>/dev/null; then - exit 1 -fi - UPDATE_STAMP=/var/lib/apt/periodic/update-stamp if check_stamp $UPDATE_STAMP $UpdateInterval; then # check for a new archive signing key (against the master keyring) diff --git a/debian/changelog b/debian/changelog index 62ce48ed9..f03be0cd5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ apt (0.7.20.2ubuntu5) jaunty; urgency=low * debian/apt.cron.daily: - do not clutter cron mail with bogus gconftool messages (LP: #223502) + - merge fix for cache locking from debian (closes: #459344) -- Michael Vogt Mon, 30 Mar 2009 13:22:28 +0200 -- cgit v1.2.3 From c2d0fdd1abffa6701422f4b722b994ab3c43262b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 30 Mar 2009 15:16:00 +0200 Subject: run update-apt-xapian-index (with ionice) to ensure that the index is up-to-date when synaptic is run (LP: #288797) --- debian/apt.cron.daily | 5 +++++ debian/changelog | 2 ++ 2 files changed, 7 insertions(+) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index d980efd7d..954f0bfc9 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -237,6 +237,11 @@ if check_stamp $UPDATE_STAMP $UpdateInterval; then if which dbus-send >/dev/null; then dbus-send --system / app.apt.dbus.updated boolean:true 2>/dev/null || true fi + # now run apt-xapian-index if it is installed to ensure the index + # is up-to-date + if [ -x /usr/sbin/update-apt-xapian-index ]; then + ionice -c3 update-apt-xapian-index -q + fi update_stamp $UPDATE_STAMP fi fi diff --git a/debian/changelog b/debian/changelog index f03be0cd5..6a3d14ddc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ apt (0.7.20.2ubuntu5) jaunty; urgency=low - do not clutter cron mail with bogus gconftool messages (LP: #223502) - merge fix for cache locking from debian (closes: #459344) + - run update-apt-xapian-index (with ionice) to ensure that + the index is up-to-date when synaptic is run (LP: #288797) -- Michael Vogt Mon, 30 Mar 2009 13:22:28 +0200 -- cgit v1.2.3 From 9c2d35fa4715db757b728458cfdce5d748ae1476 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 8 Apr 2009 22:43:37 +0200 Subject: apt.cron.daily: catch invalid dates due to DST time changes in the stamp files --- debian/apt.cron.daily | 21 +++++++++++++++++++-- debian/changelog | 8 ++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 954f0bfc9..7f2978568 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -50,8 +50,25 @@ check_stamp() fi # compare midnight today to midnight the day the stamp was updated - stamp=$(date --date=$(date -r $stamp --iso-8601) +%s) - now=$(date --date=$(date --iso-8601) +%s) + stamp_file="$stamp" + stamp=$(date --date=$(date -r $stamp_file --iso-8601) +%s 2>/dev/null) + if [ "$?" != "0" ]; then + # Due to some timezones returning 'invalid date' for midnight on + # certain dates (eg America/Sao_Paulo), if date returns with error + # remove the stamp file and return 0. See coreutils bug: + # http://lists.gnu.org/archive/html/bug-coreutils/2007-09/msg00176.html + rm -f "$stamp_file" + return 0 + fi + + now=$(date --date=$(date --iso-8601) +%s 2>/dev/null) + if [ "$?" != "0" ]; then + # As above, due to some timezones returning 'invalid date' for midnight + # on certain dates (eg America/Sao_Paulo), if date returns with error + # return 0. + return 0 + fi + delta=$(($now-$stamp)) # intervall is in days, diff --git a/debian/changelog b/debian/changelog index 6a3d14ddc..43827dada 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.20.2ubuntu6) jaunty; urgency=low + + [ Jamie Strandboge ] + * apt.cron.daily: catch invalid dates due to DST time changes + in the stamp files + + -- Michael Vogt Wed, 08 Apr 2009 22:39:50 +0200 + apt (0.7.20.2ubuntu5) jaunty; urgency=low [ Colin Watson ] -- cgit v1.2.3 From 0b77f4775db7bc45964e0337b8978a170b3f0483 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 8 Apr 2009 22:52:11 +0200 Subject: * methods/gpgv.cc: - properly check for expired and revoked keys (closes: #433091) LP: #356012 --- debian/changelog | 5 +++++ methods/gpgv.cc | 40 ++++++++++++++++++++++++++++++++++------ 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 43827dada..9618cc1c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,11 @@ apt (0.7.20.2ubuntu6) jaunty; urgency=low * apt.cron.daily: catch invalid dates due to DST time changes in the stamp files + [ Michael Vogt ] + * methods/gpgv.cc: + - properly check for expired and revoked keys (closes: #433091) + LP: #356012 + -- Michael Vogt Wed, 08 Apr 2009 22:39:50 +0200 apt (0.7.20.2ubuntu5) jaunty; urgency=low diff --git a/methods/gpgv.cc b/methods/gpgv.cc index f3277b300..150c1d315 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -17,13 +17,18 @@ #define GNUPGBADSIG "[GNUPG:] BADSIG" #define GNUPGNOPUBKEY "[GNUPG:] NO_PUBKEY" #define GNUPGVALIDSIG "[GNUPG:] VALIDSIG" +#define GNUPGGOODSIG "[GNUPG:] GOODSIG" +#define GNUPGKEYEXPIRED "[GNUPG:] KEYEXPIRED" +#define GNUPGREVKEYSIG "[GNUPG:] REVKEYSIG" #define GNUPGNODATA "[GNUPG:] NODATA" class GPGVMethod : public pkgAcqMethod { private: string VerifyGetSigners(const char *file, const char *outfile, - vector &GoodSigners, vector &BadSigners, + vector &GoodSigners, + vector &BadSigners, + vector &WorthlessSigners, vector &NoPubKeySigners); protected: @@ -37,6 +42,7 @@ class GPGVMethod : public pkgAcqMethod string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, vector &GoodSigners, vector &BadSigners, + vector &WorthlessSigners, vector &NoPubKeySigners) { // setup a (empty) stringstream for formating the return value @@ -179,15 +185,27 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, std::cerr << "Got NODATA! " << std::endl; BadSigners.push_back(string(buffer+sizeof(GNUPGPREFIX))); } - if (strncmp(buffer, GNUPGVALIDSIG, sizeof(GNUPGVALIDSIG)-1) == 0) + if (strncmp(buffer, GNUPGKEYEXPIRED, sizeof(GNUPGKEYEXPIRED)-1) == 0) + { + if (_config->FindB("Debug::Acquire::gpgv", false)) + std::cerr << "Got KEYEXPIRED! " << std::endl; + WorthlessSigners.push_back(string(buffer+sizeof(GNUPGPREFIX))); + } + if (strncmp(buffer, GNUPGREVKEYSIG, sizeof(GNUPGREVKEYSIG)-1) == 0) + { + if (_config->FindB("Debug::Acquire::gpgv", false)) + std::cerr << "Got REVKEYSIG! " << std::endl; + WorthlessSigners.push_back(string(buffer+sizeof(GNUPGPREFIX))); + } + if (strncmp(buffer, GNUPGGOODSIG, sizeof(GNUPGGOODSIG)-1) == 0) { char *sig = buffer + sizeof(GNUPGPREFIX); - char *p = sig + sizeof("VALIDSIG"); + char *p = sig + sizeof("GOODSIG"); while (*p && isxdigit(*p)) p++; *p = 0; if (_config->FindB("Debug::Acquire::gpgv", false)) - std::cerr << "Got VALIDSIG, key ID:" << sig << std::endl; + std::cerr << "Got GOODSIG, key ID:" << sig << std::endl; GoodSigners.push_back(string(sig)); } } @@ -227,6 +245,8 @@ bool GPGVMethod::Fetch(FetchItem *Itm) string keyID; vector GoodSigners; vector BadSigners; + // a worthless signature is a expired or revoked one + vector WorthlessSigners; vector NoPubKeySigners; FetchResult Res; @@ -235,13 +255,14 @@ bool GPGVMethod::Fetch(FetchItem *Itm) // Run gpgv on file, extract contents and get the key ID of the signer string msg = VerifyGetSigners(Path.c_str(), Itm->DestFile.c_str(), - GoodSigners, BadSigners, NoPubKeySigners); + GoodSigners, BadSigners, WorthlessSigners, + NoPubKeySigners); if (GoodSigners.empty() || !BadSigners.empty() || !NoPubKeySigners.empty()) { string errmsg; // In this case, something bad probably happened, so we just go // with what the other method gave us for an error message. - if (BadSigners.empty() && NoPubKeySigners.empty()) + if (BadSigners.empty() && WorthlessSigners.empty() && NoPubKeySigners.empty()) errmsg = msg; else { @@ -252,6 +273,13 @@ bool GPGVMethod::Fetch(FetchItem *Itm) I != BadSigners.end(); I++) errmsg += (*I + "\n"); } + if (!WorthlessSigners.empty()) + { + errmsg += _("The following signatures were invalid:\n"); + for (vector::iterator I = WorthlessSigners.begin(); + I != WorthlessSigners.end(); I++) + errmsg += (*I + "\n"); + } if (!NoPubKeySigners.empty()) { errmsg += _("The following signatures couldn't be verified because the public key is not available:\n"); -- cgit v1.2.3 From 3a41eec0084219731dc48d5cf7ecd803ea6d5483 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 8 Apr 2009 22:50:41 +0200 Subject: debian/changelog: add bugnumber --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9618cc1c6..07e25051e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ apt (0.7.20.2ubuntu6) jaunty; urgency=low [ Jamie Strandboge ] * apt.cron.daily: catch invalid dates due to DST time changes - in the stamp files + in the stamp files (LP: #354793) [ Michael Vogt ] * methods/gpgv.cc: -- cgit v1.2.3 From 76dbdfc7f02096758f63bcb6d306b54d5a2d0d02 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 24 Apr 2009 19:53:19 +0200 Subject: * fix problematic use of tolower() when calculating the version hash by using locale independant tolower_ascii() function. Thanks to M. Vefa Bicakci (LP: #80248) * build fixes for g++-4.4 * include dmesg output in apport package failures --- apt-pkg/acquire.cc | 3 +- apt-pkg/contrib/sha256.h | 1 + apt-pkg/contrib/strutl.cc | 11 + apt-pkg/contrib/strutl.h | 1 + apt-pkg/deb/deblistparser.cc | 2 +- apt-pkg/deb/dpkgpm.cc | 17 + apt-pkg/pkgcache.cc | 4 +- debian/changelog | 10 + po/apt-all.pot | 388 ++++++++++++----- po/ar.po | 994 ++++++++++++++++++++++++------------------- 10 files changed, 885 insertions(+), 546 deletions(-) diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 38944bbac..2e6bd3401 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -24,7 +24,8 @@ #include #include - +#include + #include #include #include diff --git a/apt-pkg/contrib/sha256.h b/apt-pkg/contrib/sha256.h index 1951f053b..5934b5641 100644 --- a/apt-pkg/contrib/sha256.h +++ b/apt-pkg/contrib/sha256.h @@ -17,6 +17,7 @@ #include #include #include +#include using std::string; using std::min; diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index fe9082f63..3b7a67db0 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -1074,6 +1074,17 @@ char *safe_snprintf(char *Buffer,char *End,const char *Format,...) } /*}}}*/ +// tolower_ascii - tolower() function that ignores the locale /*{{{*/ +// --------------------------------------------------------------------- +/* */ +int tolower_ascii(int c) +{ + if (c >= 'A' and c <= 'Z') + return c + 32; + return c; +} + /*}}}*/ + // CheckDomainList - See if Host is in a , seperate list /*{{{*/ // --------------------------------------------------------------------- /* The domain list is a comma seperate list of domains that are suffix diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index d9972abf4..51416a24a 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -62,6 +62,7 @@ void ioprintf(ostream &out,const char *format,...) APT_FORMAT2; void strprintf(string &out,const char *format,...) APT_FORMAT2; char *safe_snprintf(char *Buffer,char *End,const char *Format,...) APT_FORMAT3; bool CheckDomainList(const string &Host, const string &List); +int tolower_ascii(int c); #define APT_MKSTRCMP(name,func) \ inline int name(const char *A,const char *AEnd,const char *B) {return func(A,AEnd,B,B+strlen(B));}; \ diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 896d4d6d8..55ba1f8c4 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -213,7 +213,7 @@ unsigned short debListParser::VersionHash() for (; Start != End; Start++) { if (isspace(*Start) == 0) - *I++ = tolower(*Start); + *I++ = tolower_ascii(*Start); if (*Start == '<' && Start[1] != '<' && Start[1] != '=') *I++ = '='; if (*Start == '>' && Start[1] != '>' && Start[1] != '=') diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index d8c38427f..f57bff32c 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1123,6 +1123,23 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) fclose(log); } } + + // attach dmesg log (to learn about segfaults) + if (FileExists("/bin/dmesg")) + { + FILE *log = NULL; + char buf[1024]; + + fprintf(report, "Dmesg:\n"); + log = popen("/bin/dmesg","r"); + if(log != NULL) + { + while( fgets(buf, sizeof(buf), log) != NULL) + fprintf(report, " %s", buf); + fclose(log); + } + } fclose(report); + } /*}}}*/ diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 4fbf42c4b..6687864ee 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -163,7 +163,7 @@ unsigned long pkgCache::sHash(const string &Str) const { unsigned long Hash = 0; for (string::const_iterator I = Str.begin(); I != Str.end(); I++) - Hash = 5*Hash + tolower(*I); + Hash = 5*Hash + tolower_ascii(*I); return Hash % _count(HeaderP->HashTable); } @@ -171,7 +171,7 @@ unsigned long pkgCache::sHash(const char *Str) const { unsigned long Hash = 0; for (const char *I = Str; *I != 0; I++) - Hash = 5*Hash + tolower(*I); + Hash = 5*Hash + tolower_ascii(*I); return Hash % _count(HeaderP->HashTable); } diff --git a/debian/changelog b/debian/changelog index 07e25051e..a62e13bad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +apt (0.7.20.2ubuntu7) karmic; urgency=low + + * fix problematic use of tolower() when calculating the version + hash by using locale independant tolower_ascii() function. + Thanks to M. Vefa Bicakci (LP: #80248) + * build fixes for g++-4.4 + * include dmesg output in apport package failures + + -- Michael Vogt Fri, 24 Apr 2009 10:14:01 +0200 + apt (0.7.20.2ubuntu6) jaunty; urgency=low [ Jamie Strandboge ] diff --git a/po/apt-all.pot b/po/apt-all.pot index 804c23b48..55f35cafa 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -252,6 +252,7 @@ msgid "" msgstr "" #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 +#: apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "" @@ -718,7 +719,7 @@ msgid "Unable to lock the download directory" msgstr "" #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2076 cmdline/apt-get.cc:2312 -#: apt-pkg/cachefile.cc:63 +#: apt-pkg/cachefile.cc:63 apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "" @@ -781,6 +782,7 @@ msgid "Do you want to continue [Y/n]? " msgstr "" #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2209 +#: apt-pkg/algorithms.cc:1348 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -889,7 +891,8 @@ msgstr "" msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 apt-pkg/algorithms.cc:1374 +#: apt-pkg/algorithms.cc:1376 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -993,6 +996,7 @@ msgid "Calculating upgrade... " msgstr "" #: cmdline/apt-get.cc:1891 methods/ftp.cc:702 methods/connect.cc:101 +#: methods/connect.cc:111 msgid "Failed" msgstr "" @@ -1373,6 +1377,8 @@ msgstr "" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 #: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/contrib/configuration.cc:821 apt-pkg/acquire.cc:419 +#: methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "" @@ -1404,7 +1410,9 @@ msgstr "" #. Build the status cache #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:748 #: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 -#: apt-pkg/pkgcachegen.cc:945 +#: apt-pkg/pkgcachegen.cc:945 apt-pkg/pkgcachegen.cc:760 +#: apt-pkg/pkgcachegen.cc:829 apt-pkg/pkgcachegen.cc:834 +#: apt-pkg/pkgcachegen.cc:957 msgid "Reading package lists" msgstr "" @@ -1598,6 +1606,7 @@ msgid "Server closed the connection" msgstr "" #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: apt-pkg/contrib/fileutl.cc:538 msgid "Read error" msgstr "" @@ -1610,6 +1619,7 @@ msgid "Protocol corruption" msgstr "" #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: apt-pkg/contrib/fileutl.cc:577 msgid "Write error" msgstr "" @@ -1664,6 +1674,7 @@ msgid "Unable to accept connection" msgstr "" #: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/http.cc:993 msgid "Problem hashing file" msgstr "" @@ -1690,78 +1701,78 @@ msgstr "" msgid "Unable to invoke " msgstr "" -#: methods/connect.cc:64 +#: methods/connect.cc:64 methods/connect.cc:71 #, c-format msgid "Connecting to %s (%s)" msgstr "" -#: methods/connect.cc:71 +#: methods/connect.cc:71 methods/connect.cc:82 #, c-format msgid "[IP: %s %s]" msgstr "" -#: methods/connect.cc:80 +#: methods/connect.cc:80 methods/connect.cc:89 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "" -#: methods/connect.cc:86 +#: methods/connect.cc:86 methods/connect.cc:95 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "" -#: methods/connect.cc:93 +#: methods/connect.cc:93 methods/connect.cc:103 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" -#: methods/connect.cc:108 +#: methods/connect.cc:108 methods/connect.cc:118 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "" #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 methods/connect.cc:146 #, c-format msgid "Connecting to %s" msgstr "" -#: methods/connect.cc:167 +#: methods/connect.cc:167 methods/connect.cc:164 methods/connect.cc:183 #, c-format msgid "Could not resolve '%s'" msgstr "" -#: methods/connect.cc:173 +#: methods/connect.cc:173 methods/connect.cc:189 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" -#: methods/connect.cc:176 +#: methods/connect.cc:176 methods/connect.cc:192 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "" -#: methods/connect.cc:223 +#: methods/connect.cc:223 methods/connect.cc:239 #, c-format msgid "Unable to connect to %s %s:" msgstr "" -#: methods/gpgv.cc:65 +#: methods/gpgv.cc:65 methods/gpgv.cc:71 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "" -#: methods/gpgv.cc:101 +#: methods/gpgv.cc:101 methods/gpgv.cc:107 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:205 +#: methods/gpgv.cc:205 methods/gpgv.cc:223 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:210 +#: methods/gpgv.cc:210 methods/gpgv.cc:228 msgid "At least one invalid signature was encountered." msgstr "" @@ -1770,15 +1781,15 @@ msgstr "" msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: methods/gpgv.cc:219 +#: methods/gpgv.cc:219 methods/gpgv.cc:237 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:250 methods/gpgv.cc:271 methods/gpgv.cc:278 msgid "The following signatures were invalid:\n" msgstr "" -#: methods/gpgv.cc:257 +#: methods/gpgv.cc:257 methods/gpgv.cc:285 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1794,76 +1805,78 @@ msgstr "" msgid "Read error from %s process" msgstr "" -#: methods/http.cc:377 +#: methods/http.cc:377 methods/http.cc:378 msgid "Waiting for headers" msgstr "" -#: methods/http.cc:523 +#: methods/http.cc:523 methods/http.cc:524 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:531 +#: methods/http.cc:531 methods/http.cc:532 msgid "Bad header line" msgstr "" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:550 methods/http.cc:557 methods/http.cc:551 +#: methods/http.cc:558 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:586 +#: methods/http.cc:586 methods/http.cc:587 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:601 +#: methods/http.cc:601 methods/http.cc:602 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:603 +#: methods/http.cc:603 methods/http.cc:604 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:627 +#: methods/http.cc:627 methods/http.cc:628 msgid "Unknown date format" msgstr "" -#: methods/http.cc:774 +#: methods/http.cc:774 methods/http.cc:781 msgid "Select failed" msgstr "" -#: methods/http.cc:779 +#: methods/http.cc:779 methods/http.cc:786 msgid "Connection timed out" msgstr "" -#: methods/http.cc:802 +#: methods/http.cc:802 methods/http.cc:809 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:833 +#: methods/http.cc:833 methods/http.cc:840 msgid "Error writing to file" msgstr "" -#: methods/http.cc:861 +#: methods/http.cc:861 methods/http.cc:868 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:875 +#: methods/http.cc:875 methods/http.cc:882 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:877 +#: methods/http.cc:877 methods/http.cc:884 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1104 +#: methods/http.cc:1104 methods/http.cc:1143 msgid "Bad header data" msgstr "" -#: methods/http.cc:1121 methods/http.cc:1176 +#: methods/http.cc:1121 methods/http.cc:1176 methods/http.cc:1160 +#: methods/http.cc:1215 msgid "Connection failed" msgstr "" -#: methods/http.cc:1228 +#: methods/http.cc:1228 methods/http.cc:1307 msgid "Internal error" msgstr "" @@ -1876,7 +1889,7 @@ msgstr "" msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/strutl.cc:978 +#: apt-pkg/contrib/strutl.cc:978 apt-pkg/contrib/strutl.cc:1018 #, c-format msgid "Selection %s not found" msgstr "" @@ -1896,42 +1909,43 @@ msgstr "" msgid "Line %d too long (max %u)" msgstr "" -#: apt-pkg/contrib/configuration.cc:611 +#: apt-pkg/contrib/configuration.cc:611 apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/contrib/configuration.cc:630 +#: apt-pkg/contrib/configuration.cc:630 apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/contrib/configuration.cc:647 +#: apt-pkg/contrib/configuration.cc:647 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/contrib/configuration.cc:687 +#: apt-pkg/contrib/configuration.cc:687 apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/contrib/configuration.cc:694 +#: apt-pkg/contrib/configuration.cc:694 apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" #: apt-pkg/contrib/configuration.cc:698 apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/contrib/configuration.cc:707 +#: apt-pkg/contrib/configuration.cc:707 apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/contrib/configuration.cc:741 +#: apt-pkg/contrib/configuration.cc:741 apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" @@ -1998,78 +2012,80 @@ msgid "Unable to stat the mount point %s" msgstr "" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: apt-pkg/contrib/cdromutl.cc:180 apt-pkg/acquire.cc:425 +#: apt-pkg/acquire.cc:450 methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:187 +#: apt-pkg/contrib/cdromutl.cc:187 apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:82 apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:87 apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:105 apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:109 apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:377 apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:387 apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:390 apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:436 apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:492 apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:522 apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:597 apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:603 apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:614 apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "" @@ -2245,40 +2261,40 @@ msgstr "" msgid "Index file type '%s' is not supported" msgstr "" -#: apt-pkg/algorithms.cc:247 +#: apt-pkg/algorithms.cc:247 apt-pkg/algorithms.cc:248 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1105 +#: apt-pkg/algorithms.cc:1105 apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1107 +#: apt-pkg/algorithms.cc:1107 apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/acquire.cc:59 +#: apt-pkg/acquire.cc:59 apt-pkg/acquire.cc:60 #, c-format msgid "Lists directory %spartial is missing." msgstr "" -#: apt-pkg/acquire.cc:63 +#: apt-pkg/acquire.cc:63 apt-pkg/acquire.cc:64 #, c-format msgid "Archive directory %spartial is missing." msgstr "" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:827 +#: apt-pkg/acquire.cc:827 apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:829 +#: apt-pkg/acquire.cc:829 apt-pkg/acquire.cc:831 #, c-format msgid "Retrieving file %li of %li" msgstr "" @@ -2293,17 +2309,17 @@ msgstr "" msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:398 +#: apt-pkg/acquire-worker.cc:398 apt-pkg/acquire-worker.cc:413 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:124 apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:140 apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "" @@ -2316,11 +2332,11 @@ msgstr "" msgid "You must put some 'source' URIs in your sources.list" msgstr "" -#: apt-pkg/cachefile.cc:69 +#: apt-pkg/cachefile.cc:69 apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" -#: apt-pkg/cachefile.cc:73 +#: apt-pkg/cachefile.cc:73 apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "" @@ -2351,123 +2367,125 @@ msgstr "" msgid "Error occurred while processing %s (UsePackage1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:153 +#: apt-pkg/pkgcachegen.cc:153 apt-pkg/pkgcachegen.cc:164 #, c-format msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:178 +#: apt-pkg/pkgcachegen.cc:178 apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:182 +#: apt-pkg/pkgcachegen.cc:182 apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:213 apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:217 +#: apt-pkg/pkgcachegen.cc:217 apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" -#: apt-pkg/pkgcachegen.cc:221 +#: apt-pkg/pkgcachegen.cc:221 apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:245 +#: apt-pkg/pkgcachegen.cc:245 apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:251 apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:254 apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:257 apt-pkg/pkgcachegen.cc:268 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:260 apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:288 +#: apt-pkg/pkgcachegen.cc:288 apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" -#: apt-pkg/pkgcachegen.cc:301 +#: apt-pkg/pkgcachegen.cc:301 apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" -#: apt-pkg/pkgcachegen.cc:307 +#: apt-pkg/pkgcachegen.cc:307 apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:678 +#: apt-pkg/pkgcachegen.cc:678 apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:763 +#: apt-pkg/pkgcachegen.cc:763 apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "" #: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:127 apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:401 apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "" #: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:707 apt-pkg/acquire-item.cc:1478 msgid "Hash Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1100 +#: apt-pkg/acquire-item.cc:1100 apt-pkg/acquire-item.cc:1170 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1213 +#: apt-pkg/acquire-item.cc:1213 apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1272 +#: apt-pkg/acquire-item.cc:1272 apt-pkg/acquire-item.cc:1342 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1313 +#: apt-pkg/acquire-item.cc:1313 apt-pkg/acquire-item.cc:1383 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1400 +#: apt-pkg/acquire-item.cc:1400 apt-pkg/acquire-item.cc:1470 msgid "Size mismatch" msgstr "" @@ -2553,88 +2571,92 @@ msgstr "" msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 apt-pkg/indexcopy.cc:834 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 apt-pkg/indexcopy.cc:837 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831 apt-pkg/indexcopy.cc:840 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:513 +#: apt-pkg/deb/dpkgpm.cc:513 apt-pkg/deb/dpkgpm.cc:532 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:596 +#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:621 #, c-format msgid "Preparing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:597 +#: apt-pkg/deb/dpkgpm.cc:597 apt-pkg/deb/dpkgpm.cc:622 #, c-format msgid "Unpacking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:602 +#: apt-pkg/deb/dpkgpm.cc:602 apt-pkg/deb/dpkgpm.cc:627 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:603 +#: apt-pkg/deb/dpkgpm.cc:603 apt-pkg/deb/dpkgpm.cc:52 +#: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Configuring %s" msgstr "" #: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:630 apt-pkg/deb/dpkgpm.cc:631 #, c-format msgid "Processing triggers for %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:608 +#: apt-pkg/deb/dpkgpm.cc:608 apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Installed %s" msgstr "" #: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 -#: apt-pkg/deb/dpkgpm.cc:616 +#: apt-pkg/deb/dpkgpm.cc:616 apt-pkg/deb/dpkgpm.cc:638 +#: apt-pkg/deb/dpkgpm.cc:640 apt-pkg/deb/dpkgpm.cc:641 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:618 +#: apt-pkg/deb/dpkgpm.cc:618 apt-pkg/deb/dpkgpm.cc:53 +#: apt-pkg/deb/dpkgpm.cc:643 #, c-format msgid "Removing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:619 +#: apt-pkg/deb/dpkgpm.cc:619 apt-pkg/deb/dpkgpm.cc:644 #, c-format msgid "Removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:624 apt-pkg/deb/dpkgpm.cc:649 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:625 apt-pkg/deb/dpkgpm.cc:650 #, c-format msgid "Completely removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:775 +#: apt-pkg/deb/dpkgpm.cc:775 apt-pkg/deb/dpkgpm.cc:805 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" @@ -2645,3 +2667,143 @@ msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "" + +#: methods/gpgv.cc:232 +#, c-format +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" +msgstr "" + +#: methods/http.cc:978 apt-pkg/contrib/mmap.cc:196 +msgid "Failed to truncate file" +msgstr "" + +#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276 +#, c-format +msgid "" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " +"Current value: %lu. (man 5 apt.conf)" +msgstr "" + +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:335 +#, c-format +msgid "%lid %lih %limin %lis" +msgstr "" + +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:342 +#, c-format +msgid "%lih %limin %lis" +msgstr "" + +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:349 +#, c-format +msgid "%limin %lis" +msgstr "" + +#. s means seconds +#: apt-pkg/contrib/strutl.cc:354 +#, c-format +msgid "%lis" +msgstr "" + +#: apt-pkg/acquire-item.cc:1244 +#, c-format +msgid "" +"A error occurred during the signature verification. The repository is not " +"updated and the previous index files will be used.GPG error: %s: %s\n" +msgstr "" + +#: apt-pkg/acquire-item.cc:1253 +#, c-format +msgid "GPG error: %s: %s" +msgstr "" + +#: apt-pkg/indexrecords.cc:40 +#, c-format +msgid "Unable to parse Release file %s" +msgstr "" + +#: apt-pkg/indexrecords.cc:47 +#, c-format +msgid "No sections in Release file %s" +msgstr "" + +#: apt-pkg/indexrecords.cc:81 +#, c-format +msgid "No Hash entry in Release file %s" +msgstr "" + +#: apt-pkg/cdrom.cc:678 +#, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:51 +#, c-format +msgid "Installing %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:54 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1011 +msgid "No apport report written because MaxReports is reached already" +msgstr "" + +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1016 +msgid "dependency problems - leaving unconfigured" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1018 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1024 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1030 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" +msgstr "" + +#: apt-pkg/deb/debsystem.cc:70 +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" + +#: apt-pkg/deb/debsystem.cc:73 +#, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "" + +#: apt-pkg/deb/debsystem.cc:82 +msgid "" +"dpkg was interrupted, you must manually run 'sudo dpkg --configure -a' to " +"correct the problem. " +msgstr "" + +#: apt-pkg/deb/debsystem.cc:100 +msgid "Not locked" +msgstr "" + +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:172 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" diff --git a/po/ar.po b/po/ar.po index 22cb495cb..afc52c7a8 100644 --- a/po/ar.po +++ b/po/ar.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-12 22:07+0100\n" +"POT-Creation-Date: 2007-06-07 00:57+0200\n" "PO-Revision-Date: 2006-10-20 21:28+0300\n" "Last-Translator: Ossama M. Khayat \n" "Language-Team: Arabic \n" @@ -31,7 +31,8 @@ msgid "Unable to locate package %s" msgstr "تعذر العثور على الحزمة %s" #: cmdline/apt-cache.cc:247 -msgid "Total package names: " +#, fuzzy +msgid "Total package names : " msgstr "أسماء الحزم الكلية :" #: cmdline/apt-cache.cc:287 @@ -60,7 +61,7 @@ msgstr "مجموع النسخ الفريدة:" #: cmdline/apt-cache.cc:295 #, fuzzy -msgid "Total distinct descriptions: " +msgid "Total Distinct Descriptions: " msgstr "مجموع النسخ الفريدة:" #: cmdline/apt-cache.cc:297 @@ -160,10 +161,10 @@ msgid " %4i %s\n" msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 +#: cmdline/apt-get.cc:2564 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format -msgid "%s %s for %s compiled on %s %s\n" +msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s لـ%s %s مُجمّع على %s %s\n" #: cmdline/apt-cache.cc:1721 @@ -189,8 +190,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages in the system\n" -" dotty - Generate package graphs for GraphViz\n" +" pkgnames - List the names of all packages\n" +" dotty - Generate package graphs for GraphVis\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -256,7 +257,8 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 +#: apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" msgstr "تعذرت الكتابة إلى %s" @@ -265,31 +267,31 @@ msgstr "تعذرت الكتابة إلى %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "تعذر الحصول على نسخة debconf. هل هي مثبتة؟" -#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 +#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "قائمة توسيعات الحزمة طويلة جداً" -#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 -#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 -#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 +#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 +#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 +#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 #, c-format msgid "Error processing directory %s" msgstr "خطأ في معالجة الدليل %s" -#: ftparchive/apt-ftparchive.cc:251 +#: ftparchive/apt-ftparchive.cc:254 msgid "Source extension list is too long" msgstr "قائمة توسيعات المصدر طويلة جداً" -#: ftparchive/apt-ftparchive.cc:368 +#: ftparchive/apt-ftparchive.cc:371 msgid "Error writing header to contents file" msgstr "خطأ في كتابة الترويسة إلى ملف المحتويات" -#: ftparchive/apt-ftparchive.cc:398 +#: ftparchive/apt-ftparchive.cc:401 #, c-format msgid "Error processing contents %s" msgstr "خطأ في معالجة المحتويات %s" -#: ftparchive/apt-ftparchive.cc:553 +#: ftparchive/apt-ftparchive.cc:556 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -331,303 +333,303 @@ msgid "" " -o=? Set an arbitrary configuration option" msgstr "" -#: ftparchive/apt-ftparchive.cc:759 +#: ftparchive/apt-ftparchive.cc:762 msgid "No selections matched" msgstr "لم تُطابق أية تحديدات" -#: ftparchive/apt-ftparchive.cc:832 +#: ftparchive/apt-ftparchive.cc:835 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "بعض الملفات مفقودة في مجموعة ملف الحزمة `%s'" -#: ftparchive/cachedb.cc:43 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "قاعدة البيانات كانت فاسدة، فتم تغيير اسمها إلى %s.old" -#: ftparchive/cachedb.cc:61 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "قاعدة البيانات قديمة، محاولة ترقية %s" -#: ftparchive/cachedb.cc:72 +#: ftparchive/cachedb.cc:76 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." msgstr "" -#: ftparchive/cachedb.cc:77 +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "تعذر فتح ملف قاعدة البيانات %s: %s" -#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 -#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 #, c-format msgid "Failed to stat %s" msgstr "" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "" -#: ftparchive/writer.cc:76 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "W: تعذرت قراءة الدليل %s\n" -#: ftparchive/writer.cc:81 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "" -#: ftparchive/writer.cc:132 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "E: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "W: " -#: ftparchive/writer.cc:141 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "" -#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "" -#: ftparchive/writer.cc:170 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "" -#: ftparchive/writer.cc:195 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "فشل فتح %s" -#: ftparchive/writer.cc:254 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr " DeLink %s [%s]\n" -#: ftparchive/writer.cc:262 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "" -#: ftparchive/writer.cc:266 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "" -#: ftparchive/writer.cc:273 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** فشل ربط %s بـ%s" -#: ftparchive/writer.cc:283 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:398 ftparchive/writer.cc:613 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:443 ftparchive/writer.cc:701 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:623 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:627 #, c-format msgid " %s has no binary override entry either\n" msgstr "" -#: ftparchive/contents.cc:321 +#: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" msgstr "خطأ داخلي، تعذر العثور على العضو %s" -#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 +#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 msgid "realloc - Failed to allocate memory" msgstr "realloc - فشل تعيين الذاكرة" -#: ftparchive/override.cc:34 ftparchive/override.cc:142 +#: ftparchive/override.cc:38 ftparchive/override.cc:146 #, c-format msgid "Unable to open %s" msgstr "تعذر فتح %s" -#: ftparchive/override.cc:60 ftparchive/override.cc:166 +#: ftparchive/override.cc:64 ftparchive/override.cc:170 #, c-format msgid "Malformed override %s line %lu #1" msgstr "" -#: ftparchive/override.cc:74 ftparchive/override.cc:178 +#: ftparchive/override.cc:78 ftparchive/override.cc:182 #, c-format msgid "Malformed override %s line %lu #2" msgstr "" -#: ftparchive/override.cc:88 ftparchive/override.cc:191 +#: ftparchive/override.cc:92 ftparchive/override.cc:195 #, c-format msgid "Malformed override %s line %lu #3" msgstr "" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 +#: ftparchive/override.cc:131 ftparchive/override.cc:205 #, c-format msgid "Failed to read the override file %s" msgstr "" -#: ftparchive/multicompress.cc:72 +#: ftparchive/multicompress.cc:75 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "" -#: ftparchive/multicompress.cc:102 +#: ftparchive/multicompress.cc:105 #, c-format msgid "Compressed output %s needs a compression set" msgstr "" -#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 +#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "" -#: ftparchive/multicompress.cc:195 +#: ftparchive/multicompress.cc:198 msgid "Failed to create FILE*" msgstr "" -#: ftparchive/multicompress.cc:198 +#: ftparchive/multicompress.cc:201 msgid "Failed to fork" msgstr "" -#: ftparchive/multicompress.cc:212 +#: ftparchive/multicompress.cc:215 msgid "Compress child" msgstr "" -#: ftparchive/multicompress.cc:235 +#: ftparchive/multicompress.cc:238 #, c-format msgid "Internal error, failed to create %s" msgstr "خطأ داخلي، تعذر إنشاء %s" -#: ftparchive/multicompress.cc:286 +#: ftparchive/multicompress.cc:289 msgid "Failed to create subprocess IPC" msgstr "" -#: ftparchive/multicompress.cc:321 +#: ftparchive/multicompress.cc:324 msgid "Failed to exec compressor " msgstr "" -#: ftparchive/multicompress.cc:360 +#: ftparchive/multicompress.cc:363 msgid "decompressor" msgstr "" -#: ftparchive/multicompress.cc:403 +#: ftparchive/multicompress.cc:406 msgid "IO to subprocess/file failed" msgstr "" -#: ftparchive/multicompress.cc:455 +#: ftparchive/multicompress.cc:458 msgid "Failed to read while computing MD5" msgstr "" -#: ftparchive/multicompress.cc:472 +#: ftparchive/multicompress.cc:475 #, c-format msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 +#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 #, c-format msgid "Failed to rename %s to %s" msgstr "فشل تغيير اسم %s إلى %s" -#: cmdline/apt-get.cc:124 +#: cmdline/apt-get.cc:121 msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 +#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1655 #, c-format msgid "Regex compilation error - %s" msgstr "" -#: cmdline/apt-get.cc:241 +#: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" msgstr "" -#: cmdline/apt-get.cc:331 +#: cmdline/apt-get.cc:328 #, c-format msgid "but %s is installed" msgstr "إلا أن %s مثبت" -#: cmdline/apt-get.cc:333 +#: cmdline/apt-get.cc:330 #, c-format msgid "but %s is to be installed" msgstr "إلا أنه سيتم تثبيت %s" -#: cmdline/apt-get.cc:340 +#: cmdline/apt-get.cc:337 msgid "but it is not installable" msgstr "إلا أنه غير قابل للتثبيت" -#: cmdline/apt-get.cc:342 +#: cmdline/apt-get.cc:339 msgid "but it is a virtual package" msgstr "إلا أنها حزمة وهمية" -#: cmdline/apt-get.cc:345 +#: cmdline/apt-get.cc:342 msgid "but it is not installed" msgstr "إلا أنها غير مثبتة" -#: cmdline/apt-get.cc:345 +#: cmdline/apt-get.cc:342 msgid "but it is not going to be installed" msgstr "إلا أنه لن يتم تثبيتها" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:347 msgid " or" msgstr " أو" -#: cmdline/apt-get.cc:379 +#: cmdline/apt-get.cc:376 msgid "The following NEW packages will be installed:" msgstr "سيتم تثبيت الحزم الجديدة التالية:" -#: cmdline/apt-get.cc:405 +#: cmdline/apt-get.cc:402 msgid "The following packages will be REMOVED:" msgstr "سيتم إزالة الحزم التالية:" -#: cmdline/apt-get.cc:427 +#: cmdline/apt-get.cc:424 msgid "The following packages have been kept back:" msgstr "سيتم الإبقاء على الحزم التالية:" -#: cmdline/apt-get.cc:448 +#: cmdline/apt-get.cc:445 msgid "The following packages will be upgraded:" msgstr "ستتم ترقية الحزم التالية:" -#: cmdline/apt-get.cc:469 +#: cmdline/apt-get.cc:466 msgid "The following packages will be DOWNGRADED:" msgstr "سيتم تثبيط الحزم التالية:" -#: cmdline/apt-get.cc:489 +#: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" msgstr "سيتم تغيير الحزم المبقاة التالية:" -#: cmdline/apt-get.cc:542 +#: cmdline/apt-get.cc:539 #, c-format msgid "%s (due to %s) " msgstr "%s (بسبب %s) " -#: cmdline/apt-get.cc:550 +#: cmdline/apt-get.cc:547 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -635,143 +637,143 @@ msgstr "" "تحذير: ستتم إزالة الحزم الأساسية التالية.\n" "لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:578 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً، " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:582 #, c-format msgid "%lu reinstalled, " msgstr "%lu أعيد تثبيتها، " -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu downgraded, " msgstr "%lu مثبطة، " -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:586 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n" -#: cmdline/apt-get.cc:593 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu غير مثبتة بالكامل أو مزالة.\n" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." msgstr "تصحيح المعتمدات..." -#: cmdline/apt-get.cc:670 +#: cmdline/apt-get.cc:667 msgid " failed." msgstr " فشل." -#: cmdline/apt-get.cc:673 +#: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" msgstr "لم يمكن تصحيح المعتمدات" -#: cmdline/apt-get.cc:676 +#: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" msgstr "لم يمكن تقليص مجموعة الترقية" -#: cmdline/apt-get.cc:678 +#: cmdline/apt-get.cc:675 msgid " Done" msgstr " تم" -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:679 msgid "You might want to run `apt-get -f install' to correct these." msgstr "قد ترغب بتنفيذ الأمر `apt-get -f install' لتصحيح هذه." -#: cmdline/apt-get.cc:685 +#: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." msgstr "مُعتمدات غير مستوفاة. حاول استخدام -f." -#: cmdline/apt-get.cc:707 +#: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" msgstr "تحذير: تعذرت المصادقة على الحزم التالية!" -#: cmdline/apt-get.cc:711 +#: cmdline/apt-get.cc:708 msgid "Authentication warning overridden.\n" msgstr "تم غض النظر عن تحذير المصادقة.\n" -#: cmdline/apt-get.cc:718 +#: cmdline/apt-get.cc:715 msgid "Install these packages without verification [y/N]? " msgstr "تثبيت هذه الحزم دون التحقق منها [y/N]؟ " -#: cmdline/apt-get.cc:720 +#: cmdline/apt-get.cc:717 msgid "Some packages could not be authenticated" msgstr "تعذرت المصادقة على بعض الحزم" -#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 +#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873 msgid "There are problems and -y was used without --force-yes" msgstr "هناك مشاكل وتم استخدام -y دون --force-yes" -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "خطأ داخلي، تم طلب InstallPackages مع وجود حزم معطوبة!" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." msgstr "حزم بحاجة للإزالة لكن الإزالة مُعطّلة." -#: cmdline/apt-get.cc:793 +#: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" msgstr "خطأ داخلي، لم تنته عملية الترتيب" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 +#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1995 cmdline/apt-get.cc:2028 msgid "Unable to lock the download directory" msgstr "تعذر قَفْل دليل التنزيل" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319 -#: apt-pkg/cachefile.cc:65 +#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2076 cmdline/apt-get.cc:2312 +#: apt-pkg/cachefile.cc:63 apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "تعذرت قراءة قائمة المصادر." -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:831 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "يا للغرابة.. لم تتطابق الأحجام، الرجاء مراسلة apt@packages.debian.org" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:836 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "بحاجة إلى جلب %sب/%sب من الأرشيف.\n" -#: cmdline/apt-get.cc:842 +#: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB of archives.\n" msgstr "بحاجة إلى جلب %sب من الأرشيف.\n" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:844 #, fuzzy, c-format -msgid "After this operation, %sB of additional disk space will be used.\n" +msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "بعد الاستخراج %sب من المساحة الإضافيّة سيتمّ استخدامها.\n" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:847 #, fuzzy, c-format -msgid "After this operation, %sB disk space will be freed.\n" +msgid "After unpacking %sB disk space will be freed.\n" msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2166 #, c-format msgid "Couldn't determine free space in %s" msgstr "تعذر حساب المساحة الحرة في %s" -#: cmdline/apt-get.cc:871 +#: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." msgstr "ليس هناك مساحة كافية في %s." -#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 +#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:881 msgid "Yes, do as I say!" msgstr "نعم، افعل ما أقوله!" -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:883 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -782,28 +784,29 @@ msgstr "" "كي تستمر اكتب العبارة '%s'\n" " ؟] " -#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 msgid "Abort." msgstr "إجهاض." -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:904 msgid "Do you want to continue [Y/n]? " msgstr "هل تريد الاستمرار [Y/n]؟" -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349 +#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2209 +#: apt-pkg/algorithms.cc:1348 #, c-format msgid "Failed to fetch %s %s\n" msgstr "فشل إحضار %s %s\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:994 msgid "Some files failed to download" msgstr "فشل تنزيل بعض الملفات" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 +#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2218 msgid "Download complete and in download only mode" msgstr "اكتمل التنزيل وفي وضع التنزيل فقط" -#: cmdline/apt-get.cc:1009 +#: cmdline/apt-get.cc:1001 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -811,47 +814,47 @@ msgstr "" "تعذر إحضار بعض الأرشيف، ربما يمكنك محاولة تنفيذ apt-get update أو إضافة --" "fix-missing؟" -#: cmdline/apt-get.cc:1013 +#: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing وتبديل الأوساط غير مدعومة حالياً" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." msgstr "تعذر تصحيح الحزم المفقودة." -#: cmdline/apt-get.cc:1019 +#: cmdline/apt-get.cc:1011 msgid "Aborting install." msgstr "إجهاض التثبيت." -#: cmdline/apt-get.cc:1053 +#: cmdline/apt-get.cc:1045 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "لاحظ، تحديد %s بدلاً من %s\n" -#: cmdline/apt-get.cc:1063 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "الحزمة %s وهميّة وتوفّرها:\n" -#: cmdline/apt-get.cc:1104 +#: cmdline/apt-get.cc:1096 msgid " [Installed]" msgstr " [مُثبّتة]" -#: cmdline/apt-get.cc:1109 +#: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." msgstr "يجب اختيار واحدة بالتحديد لتثبيتها." -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1106 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -859,124 +862,121 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" msgstr "على أيّ فإن الحزم التالية تحلّ مكانها:" -#: cmdline/apt-get.cc:1136 +#: cmdline/apt-get.cc:1128 #, c-format msgid "Package %s has no installation candidate" msgstr "الحزمة %s ليس لها مرشح تثبيت" -#: cmdline/apt-get.cc:1156 +#: cmdline/apt-get.cc:1148 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "إعادة تثبيت %s غير ممكنة، حيث أنّه لا يمكن تنزيلها.\n" -#: cmdline/apt-get.cc:1164 +#: cmdline/apt-get.cc:1156 #, c-format msgid "%s is already the newest version.\n" msgstr "%s هي النسخة الأحدث.\n" -#: cmdline/apt-get.cc:1193 +#: cmdline/apt-get.cc:1185 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'" -#: cmdline/apt-get.cc:1195 +#: cmdline/apt-get.cc:1187 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'" -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1193 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "النسخة المحددة %s (%s) للإصدارة %s\n" -#: cmdline/apt-get.cc:1338 +#: cmdline/apt-get.cc:1330 msgid "The update command takes no arguments" msgstr "لا يقبل الأمر update أية مُعطيات" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1343 msgid "Unable to lock the list directory" msgstr "تعذر قفل دليل القائمة" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 apt-pkg/algorithms.cc:1374 +#: apt-pkg/algorithms.cc:1376 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" + +#: cmdline/apt-get.cc:1433 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1435 +#: cmdline/apt-get.cc:1465 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "سيتم تثبيت الحزم الجديدة التالية:" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1467 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1442 +#: cmdline/apt-get.cc:1472 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#. -#. if (Packages == 1) -#. { -#. c1out << endl; -#. c1out << -#. _("Since you only requested a single operation it is extremely likely that\n" -#. "the package is simply not installable and a bug report against\n" -#. "that package should be filed.") << endl; -#. } -#. -#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1736 msgid "The following information may help to resolve the situation:" msgstr "قد تساعد المعلومات التالية في حل المشكلة:" -#: cmdline/apt-get.cc:1449 +#: cmdline/apt-get.cc:1479 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء" -#: cmdline/apt-get.cc:1468 +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء" -#: cmdline/apt-get.cc:1523 +#: cmdline/apt-get.cc:1543 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "تعذر العثور على الحزمة %s" -#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1642 cmdline/apt-get.cc:1678 #, c-format msgid "Couldn't find package %s" msgstr "تعذر العثور على الحزمة %s" -#: cmdline/apt-get.cc:1661 +#: cmdline/apt-get.cc:1665 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "لاحظ، تحديد %s بسبب صيغة regex '%s'\n" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1695 #, fuzzy, c-format -msgid "%s set to manually installed.\n" +msgid "%s set to manual installed.\n" msgstr "إلا أنه سيتم تثبيت %s" -#: cmdline/apt-get.cc:1705 +#: cmdline/apt-get.cc:1708 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "قد ترغب بتشغيل `apt-get -f install' لتصحيح هذه:" -#: cmdline/apt-get.cc:1708 +#: cmdline/apt-get.cc:1711 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" "مُعتمدات غير مستوفاة. جرب 'apt-get -f install' بدون أسماء حزم (أو حدّد حلاً)." -#: cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:1723 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -984,152 +984,160 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1731 +msgid "" +"Since you only requested a single operation it is extremely likely that\n" +"the package is simply not installable and a bug report against\n" +"that package should be filed." +msgstr "" + +#: cmdline/apt-get.cc:1739 msgid "Broken packages" msgstr "حزم معطوبة" -#: cmdline/apt-get.cc:1767 +#: cmdline/apt-get.cc:1770 msgid "The following extra packages will be installed:" msgstr "سيتم تثبيت الحزم الإضافيّة التالية:" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1859 msgid "Suggested packages:" msgstr "الحزم المقترحة:" -#: cmdline/apt-get.cc:1857 +#: cmdline/apt-get.cc:1860 msgid "Recommended packages:" msgstr "الحزم المستحسنة:" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1888 msgid "Calculating upgrade... " msgstr "حساب الترقية..." -#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 +#: cmdline/apt-get.cc:1891 methods/ftp.cc:702 methods/connect.cc:101 +#: methods/connect.cc:111 msgid "Failed" msgstr "فشل" -#: cmdline/apt-get.cc:1893 +#: cmdline/apt-get.cc:1896 msgid "Done" msgstr "تمّ" -#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:1963 cmdline/apt-get.cc:1971 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2071 msgid "Must specify at least one package to fetch source for" msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها" -#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 +#: cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2330 #, c-format msgid "Unable to find a source package for %s" msgstr "تعذر العثور على مصدر الحزمة %s" -#: cmdline/apt-get.cc:2147 +#: cmdline/apt-get.cc:2145 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "تخطي الملف '%s' المنزل مسبقاً\n" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2169 #, c-format msgid "You don't have enough free space in %s" msgstr "ليس هناك مساحة كافية في %s" -#: cmdline/apt-get.cc:2181 +#: cmdline/apt-get.cc:2174 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "يجب جلب %sب/%sب من الأرشيفات المصدرية.\n" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2177 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n" -#: cmdline/apt-get.cc:2190 +#: cmdline/apt-get.cc:2183 #, c-format msgid "Fetch source %s\n" msgstr "إحضار المصدر %s\n" -#: cmdline/apt-get.cc:2221 +#: cmdline/apt-get.cc:2214 msgid "Failed to fetch some archives." msgstr "فشل إحضار بعض الأرشيفات." -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2242 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2261 +#: cmdline/apt-get.cc:2254 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "أمر فك الحزمة '%s' فشل.\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2255 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2279 +#: cmdline/apt-get.cc:2272 #, c-format msgid "Build command '%s' failed.\n" msgstr "أمر البناء '%s' فشل.\n" -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2291 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2314 +#: cmdline/apt-get.cc:2307 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2335 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2362 +#: cmdline/apt-get.cc:2355 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2414 +#: cmdline/apt-get.cc:2407 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2467 +#: cmdline/apt-get.cc:2459 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2503 +#: cmdline/apt-get.cc:2494 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2528 +#: cmdline/apt-get.cc:2519 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2542 +#: cmdline/apt-get.cc:2533 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2546 +#: cmdline/apt-get.cc:2537 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2578 +#: cmdline/apt-get.cc:2569 msgid "Supported modules:" msgstr "الوحدات المدعومة:" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2610 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1144,8 +1152,6 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" -" autoremove - Remove automatically all unused packages\n" -" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1161,7 +1167,7 @@ msgid "" " -d Download only - do NOT install or unpack archives\n" " -s No-act. Perform ordering simulation\n" " -y Assume Yes to all queries and do not prompt\n" -" -f Attempt to correct a system with broken dependencies in place\n" +" -f Attempt to continue if the integrity check fails\n" " -m Attempt to continue if archives are unlocatable\n" " -u Show a list of upgraded packages as well\n" " -b Build the source package after fetching it\n" @@ -1232,28 +1238,24 @@ msgstr "" msgid "Bad default setting!" msgstr "إعداد افتراضيّ سيّء!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 -#: dselect/install:105 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 +#: dselect/install:104 dselect/update:45 msgid "Press enter to continue." msgstr "اضغط مفتاح الإدخال للاستمرار." -#: dselect/install:91 -msgid "Do you want to erase any previously downloaded .deb files?" -msgstr "" - -#: dselect/install:101 +#: dselect/install:100 msgid "Some errors occurred while unpacking. I'm going to configure the" msgstr "حدثت بعض الأخطاء أثناء فك الحزمة. سأقوم بتهيئة " -#: dselect/install:102 +#: dselect/install:101 msgid "packages that were installed. This may result in duplicate errors" msgstr "الحزم التي تم تثبيتها. قد يتسبب هذا بظهر أخطاء متكررة" -#: dselect/install:103 +#: dselect/install:102 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "أو أخطاء سبّبتها المُعتمدات المفقودة. لا بأس بهذا، فقط الأخطاء" -#: dselect/install:104 +#: dselect/install:103 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "أعلى هذه الرسالة مهمّة. الرجاء تصحيحها وتشغيل التثبيت مجدداً" @@ -1262,188 +1264,192 @@ msgstr "أعلى هذه الرسالة مهمّة. الرجاء تصحيحها msgid "Merging available information" msgstr "دمج المعلومات المتوفرة" -#: apt-inst/contrib/extracttar.cc:114 +#: apt-inst/contrib/extracttar.cc:117 msgid "Failed to create pipes" msgstr "" -#: apt-inst/contrib/extracttar.cc:141 +#: apt-inst/contrib/extracttar.cc:144 msgid "Failed to exec gzip " msgstr "فشل تنفيذ gzip" -#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207 msgid "Corrupted archive" msgstr "أرشيف فاسد" -#: apt-inst/contrib/extracttar.cc:193 +#: apt-inst/contrib/extracttar.cc:196 msgid "Tar checksum failed, archive corrupted" msgstr "فشل تحقّق Checksum لملف Tar، الأرشيف فاسد" -#: apt-inst/contrib/extracttar.cc:296 +#: apt-inst/contrib/extracttar.cc:299 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "" -#: apt-inst/contrib/arfile.cc:70 +#: apt-inst/contrib/arfile.cc:73 msgid "Invalid archive signature" msgstr "توقيع الأرشيف غير صالح" -#: apt-inst/contrib/arfile.cc:78 +#: apt-inst/contrib/arfile.cc:81 msgid "Error reading archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 +#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 msgid "Invalid archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:128 +#: apt-inst/contrib/arfile.cc:131 msgid "Archive is too short" msgstr "الأرشيف قصير جداً" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Failed to read the archive headers" msgstr "فشلت قراءة ترويسات الأرشيف" -#: apt-inst/filelist.cc:380 +#: apt-inst/filelist.cc:384 msgid "DropNode called on still linked node" msgstr "" -#: apt-inst/filelist.cc:412 +#: apt-inst/filelist.cc:416 msgid "Failed to locate the hash element!" msgstr "" -#: apt-inst/filelist.cc:459 +#: apt-inst/filelist.cc:463 msgid "Failed to allocate diversion" msgstr "" -#: apt-inst/filelist.cc:464 +#: apt-inst/filelist.cc:468 msgid "Internal error in AddDiversion" msgstr "خطأ داخلي في AddDiversion" -#: apt-inst/filelist.cc:477 +#: apt-inst/filelist.cc:481 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" msgstr "" -#: apt-inst/filelist.cc:506 +#: apt-inst/filelist.cc:510 #, c-format msgid "Double add of diversion %s -> %s" msgstr "" -#: apt-inst/filelist.cc:549 +#: apt-inst/filelist.cc:553 #, c-format msgid "Duplicate conf file %s/%s" msgstr "ملف تهيئة مُزدوج %s/%s" -#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 +#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 #, c-format msgid "Failed to write file %s" msgstr "فشلت كتابة الملف %s" -#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "فشل إغلاق الملف %s" -#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 +#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 #, c-format msgid "The path %s is too long" msgstr "المسار %s طويل جداً" -#: apt-inst/extract.cc:124 +#: apt-inst/extract.cc:127 #, c-format msgid "Unpacking %s more than once" msgstr "فكّ تحزيم %s أكثر من مرّة" -#: apt-inst/extract.cc:134 +#: apt-inst/extract.cc:137 #, c-format msgid "The directory %s is diverted" msgstr "" -#: apt-inst/extract.cc:144 +#: apt-inst/extract.cc:147 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "" -#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 +#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 msgid "The diversion path is too long" msgstr "" -#: apt-inst/extract.cc:240 +#: apt-inst/extract.cc:243 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "" -#: apt-inst/extract.cc:280 +#: apt-inst/extract.cc:283 msgid "Failed to locate node in its hash bucket" msgstr "" -#: apt-inst/extract.cc:284 +#: apt-inst/extract.cc:287 msgid "The path is too long" msgstr "المسار طويل جداً" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:417 #, c-format msgid "Overwrite package match with no version for %s" msgstr "" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:434 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "" -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821 +#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:753 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 #: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/contrib/configuration.cc:821 apt-pkg/acquire.cc:419 +#: methods/mirror.cc:85 #, c-format msgid "Unable to read %s" msgstr "تعذرت قراءة %s" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:494 #, c-format msgid "Unable to stat %s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 +#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 #, c-format msgid "Failed to remove %s" msgstr "تعذرت إزالة %s" -#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 +#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 #, c-format msgid "Unable to create %s" msgstr "تعذر إنشاء %s" -#: apt-inst/deb/dpkgdb.cc:114 +#: apt-inst/deb/dpkgdb.cc:118 #, c-format msgid "Failed to stat %sinfo" msgstr "" -#: apt-inst/deb/dpkgdb.cc:119 +#: apt-inst/deb/dpkgdb.cc:123 msgid "The info and temp directories need to be on the same filesystem" msgstr "" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:760 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 apt-pkg/pkgcachegen.cc:760 #: apt-pkg/pkgcachegen.cc:829 apt-pkg/pkgcachegen.cc:834 #: apt-pkg/pkgcachegen.cc:957 msgid "Reading package lists" msgstr "قراءة قوائم الحزم" -#: apt-inst/deb/dpkgdb.cc:176 +#: apt-inst/deb/dpkgdb.cc:180 #, c-format msgid "Failed to change to the admin dir %sinfo" msgstr "فشل تغيير دليل الإدارة إلى %sinfo" -#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 -#: apt-inst/deb/dpkgdb.cc:444 +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 +#: apt-inst/deb/dpkgdb.cc:448 msgid "Internal error getting a package name" msgstr "خطأ داخلي أثناء الحصول على اسم الحزمة" -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "قراءة سرد الملفات" -#: apt-inst/deb/dpkgdb.cc:212 +#: apt-inst/deb/dpkgdb.cc:216 #, c-format msgid "" "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " @@ -1451,77 +1457,77 @@ msgid "" "package!" msgstr "" -#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 +#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "فشلت قراءة ملف القائمة %sinfo/%s" -#: apt-inst/deb/dpkgdb.cc:262 +#: apt-inst/deb/dpkgdb.cc:266 msgid "Internal error getting a node" msgstr "خطأ داخلي أثناء الحصول على node" -#: apt-inst/deb/dpkgdb.cc:305 +#: apt-inst/deb/dpkgdb.cc:309 #, c-format msgid "Failed to open the diversions file %sdiversions" msgstr "" -#: apt-inst/deb/dpkgdb.cc:320 +#: apt-inst/deb/dpkgdb.cc:324 msgid "The diversion file is corrupted" msgstr "" -#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 -#: apt-inst/deb/dpkgdb.cc:337 +#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 +#: apt-inst/deb/dpkgdb.cc:341 #, c-format msgid "Invalid line in the diversion file: %s" msgstr "" -#: apt-inst/deb/dpkgdb.cc:358 +#: apt-inst/deb/dpkgdb.cc:362 msgid "Internal error adding a diversion" msgstr "" -#: apt-inst/deb/dpkgdb.cc:379 +#: apt-inst/deb/dpkgdb.cc:383 msgid "The pkg cache must be initialized first" msgstr "" -#: apt-inst/deb/dpkgdb.cc:439 +#: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" msgstr "" -#: apt-inst/deb/dpkgdb.cc:461 +#: apt-inst/deb/dpkgdb.cc:465 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" msgstr "" -#: apt-inst/deb/dpkgdb.cc:466 +#: apt-inst/deb/dpkgdb.cc:470 #, c-format msgid "Error parsing MD5. Offset %lu" msgstr "" -#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 +#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:50 +#: apt-inst/deb/debfile.cc:52 #, c-format -msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" +msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:110 +#: apt-inst/deb/debfile.cc:112 #, c-format msgid "Couldn't change to %s" msgstr "تعذر التغيير إلى %s" -#: apt-inst/deb/debfile.cc:140 +#: apt-inst/deb/debfile.cc:138 msgid "Internal error, could not locate member" msgstr "خطأ داخلي، تعذر العثور على العضو" -#: apt-inst/deb/debfile.cc:173 +#: apt-inst/deb/debfile.cc:171 msgid "Failed to locate a valid control file" msgstr "فشل العثور على ملف تحكّم صالح" -#: apt-inst/deb/debfile.cc:258 +#: apt-inst/deb/debfile.cc:256 msgid "Unparsable control file" msgstr "" @@ -1622,7 +1628,8 @@ msgstr "انتهى وقت الاتصال" msgid "Server closed the connection" msgstr "أغلق الخادم الاتصال" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: apt-pkg/contrib/fileutl.cc:538 msgid "Read error" msgstr "خطأ في القراءة" @@ -1634,7 +1641,8 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: apt-pkg/contrib/fileutl.cc:577 msgid "Write error" msgstr "خطأ في الكتابة" @@ -1688,7 +1696,8 @@ msgstr "" msgid "Unable to accept connection" msgstr "تعذر قبول الاتصال" -#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 +#: methods/http.cc:993 msgid "Problem hashing file" msgstr "" @@ -1715,95 +1724,95 @@ msgstr "استعلام" msgid "Unable to invoke " msgstr "" -#: methods/connect.cc:70 +#: methods/connect.cc:64 methods/connect.cc:71 #, c-format msgid "Connecting to %s (%s)" msgstr "الاتصال بـ%s (%s)" -#: methods/connect.cc:81 +#: methods/connect.cc:71 methods/connect.cc:82 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:90 +#: methods/connect.cc:80 methods/connect.cc:89 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "" -#: methods/connect.cc:96 +#: methods/connect.cc:86 methods/connect.cc:95 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "تعذر تمهيد الاتصال بـ%s:%s (%s)." -#: methods/connect.cc:104 +#: methods/connect.cc:93 methods/connect.cc:103 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "تعذر الاتصال بـ%s:%s (%s)، انتهى وقت الاتصال" -#: methods/connect.cc:119 +#: methods/connect.cc:108 methods/connect.cc:118 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "تعذر الاتصال بـ%s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:147 methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 methods/connect.cc:146 #, c-format msgid "Connecting to %s" msgstr "الاتصال بـ%s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:167 methods/connect.cc:164 methods/connect.cc:183 #, c-format msgid "Could not resolve '%s'" msgstr "" -#: methods/connect.cc:190 +#: methods/connect.cc:173 methods/connect.cc:189 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" -#: methods/connect.cc:193 +#: methods/connect.cc:176 methods/connect.cc:192 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "" -#: methods/connect.cc:240 +#: methods/connect.cc:223 methods/connect.cc:239 #, c-format msgid "Unable to connect to %s %s:" msgstr "تعذر الاتصال بـ%s %s:" -#: methods/gpgv.cc:65 +#: methods/gpgv.cc:65 methods/gpgv.cc:71 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "" -#: methods/gpgv.cc:101 +#: methods/gpgv.cc:101 methods/gpgv.cc:107 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:205 +#: methods/gpgv.cc:205 methods/gpgv.cc:223 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:210 +#: methods/gpgv.cc:210 methods/gpgv.cc:228 msgid "At least one invalid signature was encountered." msgstr "" #: methods/gpgv.cc:214 #, c-format -msgid "Could not execute '%s' to verify signature (is gpgv installed?)" +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: methods/gpgv.cc:219 +#: methods/gpgv.cc:219 methods/gpgv.cc:237 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:250 methods/gpgv.cc:271 methods/gpgv.cc:278 msgid "The following signatures were invalid:\n" msgstr "" -#: methods/gpgv.cc:257 +#: methods/gpgv.cc:257 methods/gpgv.cc:285 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1819,81 +1828,78 @@ msgstr "" msgid "Read error from %s process" msgstr "" -#: methods/http.cc:377 +#: methods/http.cc:377 methods/http.cc:378 msgid "Waiting for headers" msgstr "بانتظار الترويسات" -#: methods/http.cc:523 +#: methods/http.cc:523 methods/http.cc:524 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:531 +#: methods/http.cc:531 methods/http.cc:532 msgid "Bad header line" msgstr "سطر ترويسة سيء" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:550 methods/http.cc:557 methods/http.cc:551 +#: methods/http.cc:558 msgid "The HTTP server sent an invalid reply header" msgstr "أرسل خادم http ترويسة ردّ غير صالحة" -#: methods/http.cc:586 +#: methods/http.cc:586 methods/http.cc:587 msgid "The HTTP server sent an invalid Content-Length header" msgstr "أرسل خادم http ترويسة طول محتويات (ِContent-Length) غير صالحة" -#: methods/http.cc:601 +#: methods/http.cc:601 methods/http.cc:602 msgid "The HTTP server sent an invalid Content-Range header" msgstr "أرسل خادم http ترويسة مدى محتويات (ِContent-Range) غير صالحة" -#: methods/http.cc:603 +#: methods/http.cc:603 methods/http.cc:604 msgid "This HTTP server has broken range support" msgstr "خادم http له دعم مدى معطوب" -#: methods/http.cc:627 +#: methods/http.cc:627 methods/http.cc:628 msgid "Unknown date format" msgstr "نسق تاريخ مجهول" -#: methods/http.cc:774 +#: methods/http.cc:774 methods/http.cc:781 msgid "Select failed" msgstr "فشل التحديد" -#: methods/http.cc:779 +#: methods/http.cc:779 methods/http.cc:786 msgid "Connection timed out" msgstr "انتهى وقت الاتصال" -#: methods/http.cc:802 +#: methods/http.cc:802 methods/http.cc:809 msgid "Error writing to output file" msgstr "خطأ في الكتابة إلى ملف المُخرجات" -#: methods/http.cc:833 +#: methods/http.cc:833 methods/http.cc:840 msgid "Error writing to file" msgstr "خطأ في الكتابة إلى الملف" -#: methods/http.cc:861 +#: methods/http.cc:861 methods/http.cc:868 msgid "Error writing to the file" msgstr "خطأ في الكتابة إلى الملف" -#: methods/http.cc:875 +#: methods/http.cc:875 methods/http.cc:882 msgid "Error reading from server. Remote end closed connection" msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآخر الاتصال" -#: methods/http.cc:877 +#: methods/http.cc:877 methods/http.cc:884 msgid "Error reading from server" msgstr "خطأ في القراءة من الخادم" -#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 -#, fuzzy -msgid "Failed to truncate file" -msgstr "فشلت كتابة الملف %s" - -#: methods/http.cc:1105 +#: methods/http.cc:1104 methods/http.cc:1143 msgid "Bad header data" msgstr "بيانات ترويسة سيئة" -#: methods/http.cc:1122 methods/http.cc:1177 +#: methods/http.cc:1121 methods/http.cc:1176 methods/http.cc:1160 +#: methods/http.cc:1215 msgid "Connection failed" msgstr "فشل الاتصال" -#: methods/http.cc:1229 +#: methods/http.cc:1228 methods/http.cc:1307 msgid "Internal error" msgstr "خطأ داخلي" @@ -1906,11 +1912,7 @@ msgstr "" msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/mmap.cc:213 -msgid "Dynamic MMap ran out of room" -msgstr "" - -#: apt-pkg/contrib/strutl.cc:1014 +#: apt-pkg/contrib/strutl.cc:978 apt-pkg/contrib/strutl.cc:1018 #, c-format msgid "Selection %s not found" msgstr "تعذر العثور على التحديد %s" @@ -1925,42 +1927,48 @@ msgstr "اختصار نوع مجهول: '%c'" msgid "Opening configuration file %s" msgstr "فتح ملف التهيئة %s" -#: apt-pkg/contrib/configuration.cc:662 +#: apt-pkg/contrib/configuration.cc:515 +#, fuzzy, c-format +msgid "Line %d too long (max %u)" +msgstr "السطر %d طويل جداً (أقصاه %d)" + +#: apt-pkg/contrib/configuration.cc:611 apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/contrib/configuration.cc:681 +#: apt-pkg/contrib/configuration.cc:630 apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/contrib/configuration.cc:698 +#: apt-pkg/contrib/configuration.cc:647 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:687 apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/contrib/configuration.cc:745 +#: apt-pkg/contrib/configuration.cc:694 apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" +#: apt-pkg/contrib/configuration.cc:698 apt-pkg/contrib/configuration.cc:703 #: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/contrib/configuration.cc:758 +#: apt-pkg/contrib/configuration.cc:707 apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/contrib/configuration.cc:809 +#: apt-pkg/contrib/configuration.cc:741 apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" @@ -2026,80 +2034,81 @@ msgstr "عمليّة غير صالحة %s" msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40 +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 +#: apt-pkg/contrib/cdromutl.cc:180 apt-pkg/acquire.cc:425 +#: apt-pkg/acquire.cc:450 methods/mirror.cc:91 #, c-format msgid "Unable to change to %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:188 +#: apt-pkg/contrib/cdromutl.cc:187 apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:82 apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:87 apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:105 apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:109 apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:377 apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:454 +#: apt-pkg/contrib/fileutl.cc:387 apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:390 apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:459 +#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:503 +#: apt-pkg/contrib/fileutl.cc:436 apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:559 +#: apt-pkg/contrib/fileutl.cc:492 apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:589 +#: apt-pkg/contrib/fileutl.cc:522 apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:664 +#: apt-pkg/contrib/fileutl.cc:597 apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" msgstr "مشكلة في إغلاق الملف" -#: apt-pkg/contrib/fileutl.cc:670 +#: apt-pkg/contrib/fileutl.cc:603 apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:681 +#: apt-pkg/contrib/fileutl.cc:614 apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" msgstr "مشكلة في مزامنة الملف" @@ -2276,46 +2285,40 @@ msgstr "" msgid "Index file type '%s' is not supported" msgstr "" -#: apt-pkg/algorithms.cc:248 +#: apt-pkg/algorithms.cc:247 apt-pkg/algorithms.cc:248 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1107 +#: apt-pkg/algorithms.cc:1105 apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1109 +#: apt-pkg/algorithms.cc:1107 apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377 -msgid "" -"Some index files failed to download, they have been ignored, or old ones " -"used instead." -msgstr "" - -#: apt-pkg/acquire.cc:59 +#: apt-pkg/acquire.cc:59 apt-pkg/acquire.cc:60 #, c-format msgid "Lists directory %spartial is missing." msgstr "" -#: apt-pkg/acquire.cc:63 +#: apt-pkg/acquire.cc:63 apt-pkg/acquire.cc:64 #, c-format msgid "Archive directory %spartial is missing." msgstr "" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:828 +#: apt-pkg/acquire.cc:827 apt-pkg/acquire.cc:829 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:829 apt-pkg/acquire.cc:831 #, c-format msgid "Retrieving file %li of %li" msgstr "" @@ -2330,17 +2333,17 @@ msgstr "" msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:399 +#: apt-pkg/acquire-worker.cc:398 apt-pkg/acquire-worker.cc:413 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "الرجاء إدخال القرص المُسمّى '%s' في السوّاقة '%s' وضغط مفتاح الإدخال." -#: apt-pkg/init.cc:124 +#: apt-pkg/init.cc:124 apt-pkg/init.cc:125 #, c-format msgid "Packaging system '%s' is not supported" msgstr "نظام الحزم '%s' غير مدعوم" -#: apt-pkg/init.cc:140 +#: apt-pkg/init.cc:140 apt-pkg/init.cc:141 msgid "Unable to determine a suitable packaging system type" msgstr "" @@ -2353,11 +2356,11 @@ msgstr "" msgid "You must put some 'source' URIs in your sources.list" msgstr "" -#: apt-pkg/cachefile.cc:71 +#: apt-pkg/cachefile.cc:69 apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" -#: apt-pkg/cachefile.cc:75 +#: apt-pkg/cachefile.cc:73 apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" msgstr "قد يساعدك تنفيذ الأمر apt-get update في تصحيح هذه المشاكل" @@ -2388,124 +2391,126 @@ msgstr "حدث خطأ أثناء معالجة %s (NewPackage)" msgid "Error occurred while processing %s (UsePackage1)" msgstr "حدث خطأ أثناء معالجة %s (UserPackage1)" -#: apt-pkg/pkgcachegen.cc:164 +#: apt-pkg/pkgcachegen.cc:153 apt-pkg/pkgcachegen.cc:164 #, fuzzy, c-format msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:189 +#: apt-pkg/pkgcachegen.cc:178 apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "حدث خطأ أثناء معالجة %s (UserPackage2)" -#: apt-pkg/pkgcachegen.cc:193 +#: apt-pkg/pkgcachegen.cc:182 apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:224 +#: apt-pkg/pkgcachegen.cc:213 apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "حدث خطأ أثناء معالجة %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:228 +#: apt-pkg/pkgcachegen.cc:217 apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "حدث خطأ أثناء معالجة %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:232 +#: apt-pkg/pkgcachegen.cc:221 apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "حدث خطأ أثناء معالجة %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:256 +#: apt-pkg/pkgcachegen.cc:245 apt-pkg/pkgcachegen.cc:256 #, fuzzy, c-format msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:262 +#: apt-pkg/pkgcachegen.cc:251 apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:265 +#: apt-pkg/pkgcachegen.cc:254 apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:268 +#: apt-pkg/pkgcachegen.cc:257 apt-pkg/pkgcachegen.cc:268 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:271 +#: apt-pkg/pkgcachegen.cc:260 apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:299 +#: apt-pkg/pkgcachegen.cc:288 apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" -#: apt-pkg/pkgcachegen.cc:312 +#: apt-pkg/pkgcachegen.cc:301 apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" -#: apt-pkg/pkgcachegen.cc:318 +#: apt-pkg/pkgcachegen.cc:307 apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:690 +#: apt-pkg/pkgcachegen.cc:678 apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:775 +#: apt-pkg/pkgcachegen.cc:763 apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" msgstr "" +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 #: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:127 +#: apt-pkg/acquire-item.cc:127 apt-pkg/acquire-item.cc:134 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "فشل إعادة التسمية ، %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:401 apt-pkg/acquire-item.cc:451 msgid "MD5Sum mismatch" msgstr "MD5Sum غير متطابقة" -#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 +#: apt-pkg/acquire-item.cc:707 apt-pkg/acquire-item.cc:1478 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum غير متطابقة" -#: apt-pkg/acquire-item.cc:1118 +#: apt-pkg/acquire-item.cc:1100 apt-pkg/acquire-item.cc:1170 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1231 +#: apt-pkg/acquire-item.cc:1213 apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1290 +#: apt-pkg/acquire-item.cc:1272 apt-pkg/acquire-item.cc:1342 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1331 +#: apt-pkg/acquire-item.cc:1313 apt-pkg/acquire-item.cc:1383 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1418 +#: apt-pkg/acquire-item.cc:1400 apt-pkg/acquire-item.cc:1470 msgid "Size mismatch" msgstr "الحجم غير متطابق" @@ -2560,8 +2565,8 @@ msgstr "" #: apt-pkg/cdrom.cc:678 #, c-format msgid "" -"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" -"zu signatures\n" +"Found %u package indexes, %u source indexes, %u translation indexes and %u " +"signatures\n" msgstr "" #: apt-pkg/cdrom.cc:715 @@ -2594,98 +2599,92 @@ msgstr "كتابة لائحة المصادر الجديدة\n" msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 apt-pkg/indexcopy.cc:834 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 apt-pkg/indexcopy.cc:837 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831 apt-pkg/indexcopy.cc:840 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:49 -#, fuzzy, c-format -msgid "Installing %s" -msgstr "تم تثبيت %s" - -#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 -#, c-format -msgid "Configuring %s" -msgstr "تهيئة %s" - -#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 -#, c-format -msgid "Removing %s" -msgstr "إزالة %s" - -#: apt-pkg/deb/dpkgpm.cc:52 -#, c-format -msgid "Running post-installation trigger %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:521 +#: apt-pkg/deb/dpkgpm.cc:513 apt-pkg/deb/dpkgpm.cc:532 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:605 +#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:621 #, c-format msgid "Preparing %s" msgstr "تحضير %s" -#: apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:597 apt-pkg/deb/dpkgpm.cc:622 #, c-format msgid "Unpacking %s" msgstr "فتح %s" -#: apt-pkg/deb/dpkgpm.cc:611 +#: apt-pkg/deb/dpkgpm.cc:602 apt-pkg/deb/dpkgpm.cc:627 #, c-format msgid "Preparing to configure %s" msgstr "التحضير لتهيئة %s" -#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 +#: apt-pkg/deb/dpkgpm.cc:603 apt-pkg/deb/dpkgpm.cc:52 +#: apt-pkg/deb/dpkgpm.cc:628 +#, c-format +msgid "Configuring %s" +msgstr "تهيئة %s" + +#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606 +#: apt-pkg/deb/dpkgpm.cc:630 apt-pkg/deb/dpkgpm.cc:631 #, fuzzy, c-format msgid "Processing triggers for %s" msgstr "خطأ في معالجة الدليل %s" -#: apt-pkg/deb/dpkgpm.cc:617 +#: apt-pkg/deb/dpkgpm.cc:608 apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Installed %s" msgstr "تم تثبيت %s" -#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624 -#: apt-pkg/deb/dpkgpm.cc:625 +#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615 +#: apt-pkg/deb/dpkgpm.cc:616 apt-pkg/deb/dpkgpm.cc:638 +#: apt-pkg/deb/dpkgpm.cc:640 apt-pkg/deb/dpkgpm.cc:641 #, c-format msgid "Preparing for removal of %s" msgstr "التحضير لإزالة %s" -#: apt-pkg/deb/dpkgpm.cc:628 +#: apt-pkg/deb/dpkgpm.cc:618 apt-pkg/deb/dpkgpm.cc:53 +#: apt-pkg/deb/dpkgpm.cc:643 +#, c-format +msgid "Removing %s" +msgstr "إزالة %s" + +#: apt-pkg/deb/dpkgpm.cc:619 apt-pkg/deb/dpkgpm.cc:644 #, c-format msgid "Removed %s" msgstr "تم إزالة %s" -#: apt-pkg/deb/dpkgpm.cc:633 +#: apt-pkg/deb/dpkgpm.cc:624 apt-pkg/deb/dpkgpm.cc:649 #, c-format msgid "Preparing to completely remove %s" msgstr "التحضير لإزالة %s بالكامل" -#: apt-pkg/deb/dpkgpm.cc:634 +#: apt-pkg/deb/dpkgpm.cc:625 apt-pkg/deb/dpkgpm.cc:650 #, c-format msgid "Completely removed %s" msgstr "تمت إزالة %s بالكامل" -#: apt-pkg/deb/dpkgpm.cc:791 +#: apt-pkg/deb/dpkgpm.cc:775 apt-pkg/deb/dpkgpm.cc:805 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" @@ -2697,9 +2696,146 @@ msgstr "" msgid "Connection closed prematurely" msgstr "" +#: methods/gpgv.cc:232 +#, c-format +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" +msgstr "" + +#: methods/http.cc:978 apt-pkg/contrib/mmap.cc:196 #, fuzzy -#~ msgid "Line %d too long (max %lu)" -#~ msgstr "السطر %d طويل جداً (أقصاه %d)" +msgid "Failed to truncate file" +msgstr "فشلت كتابة الملف %s" + +#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276 +#, c-format +msgid "" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " +"Current value: %lu. (man 5 apt.conf)" +msgstr "" + +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:335 +#, c-format +msgid "%lid %lih %limin %lis" +msgstr "" + +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:342 +#, c-format +msgid "%lih %limin %lis" +msgstr "" + +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:349 +#, c-format +msgid "%limin %lis" +msgstr "" + +#. s means seconds +#: apt-pkg/contrib/strutl.cc:354 +#, c-format +msgid "%lis" +msgstr "" + +#: apt-pkg/acquire-item.cc:1244 +#, c-format +msgid "" +"A error occurred during the signature verification. The repository is not " +"updated and the previous index files will be used.GPG error: %s: %s\n" +msgstr "" + +#: apt-pkg/acquire-item.cc:1253 +#, c-format +msgid "GPG error: %s: %s" +msgstr "" + +#: apt-pkg/indexrecords.cc:40 +#, fuzzy, c-format +msgid "Unable to parse Release file %s" +msgstr "تعذر فتح ملف قاعدة البيانات %s: %s" + +#: apt-pkg/indexrecords.cc:47 +#, fuzzy, c-format +msgid "No sections in Release file %s" +msgstr "لاحظ، تحديد %s بدلاً من %s\n" + +#: apt-pkg/indexrecords.cc:81 +#, c-format +msgid "No Hash entry in Release file %s" +msgstr "" + +#: apt-pkg/cdrom.cc:678 +#, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:51 +#, fuzzy, c-format +msgid "Installing %s" +msgstr "تم تثبيت %s" + +#: apt-pkg/deb/dpkgpm.cc:54 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1011 +msgid "No apport report written because MaxReports is reached already" +msgstr "" + +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1016 +msgid "dependency problems - leaving unconfigured" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1018 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1024 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1030 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" +msgstr "" + +#: apt-pkg/deb/debsystem.cc:70 +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" + +#: apt-pkg/deb/debsystem.cc:73 +#, fuzzy, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "تعذر قفل دليل القائمة" + +#: apt-pkg/deb/debsystem.cc:82 +msgid "" +"dpkg was interrupted, you must manually run 'sudo dpkg --configure -a' to " +"correct the problem. " +msgstr "" + +#: apt-pkg/deb/debsystem.cc:100 +msgid "Not locked" +msgstr "" + +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:172 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" #, fuzzy #~ msgid "Line %d too long (max %d)" -- cgit v1.2.3 From 5c8a2aa8d5fa2f5e3342e9abd2b750f1615a226a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 28 Apr 2009 16:55:10 +0200 Subject: include apt ordering into apport package failures --- apt-pkg/deb/dpkgpm.cc | 6 ++++++ debian/changelog | 1 + 2 files changed, 7 insertions(+) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index f57bff32c..b41b38bd5 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1124,6 +1124,12 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) } } + // log the ordering + const char *ops_str[] = {"Install", "Configure","Remove","Purge"}; + fprintf(report, "AptOrdering:\n"); + for (vector::iterator I = List.begin(); I != List.end(); I++) + fprintf(report, " %s: %s\n", (*I).Pkg.Name(), ops_str[(*I).Op]); + // attach dmesg log (to learn about segfaults) if (FileExists("/bin/dmesg")) { diff --git a/debian/changelog b/debian/changelog index a62e13bad..d3d28d0dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ apt (0.7.20.2ubuntu7) karmic; urgency=low Thanks to M. Vefa Bicakci (LP: #80248) * build fixes for g++-4.4 * include dmesg output in apport package failures + * include apt ordering into apport package failures -- Michael Vogt Fri, 24 Apr 2009 10:14:01 +0200 -- cgit v1.2.3 From 28b5ff3f76e63f0b4bbed5980b9c13f4a7c3cecc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Sun, 10 May 2009 12:12:29 +0200 Subject: Drop duplicate "purge" in command list. --- cmdline/apt-get.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 0339afdf1..988abe216 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2778,7 +2778,6 @@ int main(int argc,const char *argv[]) {"remove",&DoInstall}, {"purge",&DoInstall}, {"autoremove",&DoInstall}, - {"purge",&DoInstall}, {"dist-upgrade",&DoDistUpgrade}, {"dselect-upgrade",&DoDSelectUpgrade}, {"build-dep",&DoBuildDep}, -- cgit v1.2.3 From e729233f0c20656bf41f8254d03160191e2f4d81 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 28 May 2009 17:52:10 +0200 Subject: * apt-pkg/acquire.cc: - make the max pipeline depth of the acquire queue configurable via Acquire::Max-Pipeline-Depth --- apt-pkg/acquire.cc | 2 +- debian/changelog | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 2e6bd3401..dc1599a61 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -621,7 +621,7 @@ bool pkgAcquire::Queue::Startup() added other source retry to have cycle maintain a pipeline depth on its own. */ if (Cnf->Pipeline == true) - MaxPipeDepth = 1000; + MaxPipeDepth = _config->FindI("Acquire::Max-Pipeline-Depth",1000); else MaxPipeDepth = 1; } diff --git a/debian/changelog b/debian/changelog index d3d28d0dc..8958bdfb7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.20.2ubuntu8) UNRELEASEDkarmic; urgency=low + + * apt-pkg/acquire.cc: + - make the max pipeline depth of the acquire queue configurable + via Acquire::Max-Pipeline-Depth + + -- Michael Vogt Thu, 28 May 2009 17:51:42 +0200 + apt (0.7.20.2ubuntu7) karmic; urgency=low * fix problematic use of tolower() when calculating the version -- cgit v1.2.3 From 38f5cfd8381dbdc761ba4758fb9c22c2e95498d6 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 17 Jun 2009 10:21:14 +0200 Subject: make the (internal) max pipeline depth of the acquire queue configurable via Acquire::Max-Pipeline-Depth --- apt-pkg/acquire.cc | 2 +- debian/changelog | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index dc1599a61..bafba337e 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -621,7 +621,7 @@ bool pkgAcquire::Queue::Startup() added other source retry to have cycle maintain a pipeline depth on its own. */ if (Cnf->Pipeline == true) - MaxPipeDepth = _config->FindI("Acquire::Max-Pipeline-Depth",1000); + MaxPipeDepth = _config->FindI("Acquire::Max-Pipeline-Depth",10); else MaxPipeDepth = 1; } diff --git a/debian/changelog b/debian/changelog index 2d2153d07..2db8ae677 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,8 +21,8 @@ apt (0.7.21ubuntu1) karmic; urgency=low [ Michael Vogt ] * apt-pkg/acquire.cc: - - make the max pipeline depth of the acquire queue configurable - via Acquire::Max-Pipeline-Depth + - make the (internal) max pipeline depth of the acquire queue + configurable via Acquire::Max-Pipeline-Depth -- Michael Vogt Tue, 09 Jun 2009 15:49:07 +0200 -- cgit v1.2.3 From 217d575b5713f4d9275177b58a36c581a7880c03 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 14 Jul 2009 11:22:41 +0200 Subject: * apt-pkg/acquire-worker.cc: - show error details of failed methods * apt-pkg/contrib/fileutl.cc: - if a process aborts with signal, show signal number * methods/http.cc: - ignore SIGPIPE, we deal with EPIPE from write in HttpMethod::ServerDie() (LP: #385144) --- apt-pkg/acquire-worker.cc | 7 ++----- apt-pkg/contrib/fileutl.cc | 7 +++++-- debian/changelog | 12 ++++++++++++ methods/http_main.cc | 5 +++++ 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index 78c68737c..4f0b52af9 100644 --- a/apt-pkg/acquire-worker.cc +++ b/apt-pkg/acquire-worker.cc @@ -527,10 +527,6 @@ bool pkgAcquire::Worker::OutFdReady() if (Res <= 0) return MethodFailure(); - - // Hmm.. this should never happen. - if (Res < 0) - return true; OutQueue.erase(0,Res); if (OutQueue.empty() == true) @@ -558,7 +554,8 @@ bool pkgAcquire::Worker::MethodFailure() { _error->Error("Method %s has died unexpectedly!",Access.c_str()); - ExecWait(Process,Access.c_str(),true); + // do not reap the child here to show meaningfull error to the user + ExecWait(Process,Access.c_str(),false); Process = -1; close(InFd); close(OutFd); diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index a5976cf3a..a7de09c44 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -450,8 +450,11 @@ bool ExecWait(pid_t Pid,const char *Name,bool Reap) { if (Reap == true) return false; - if (WIFSIGNALED(Status) != 0 && WTERMSIG(Status) == SIGSEGV) - return _error->Error(_("Sub-process %s received a segmentation fault."),Name); + if (WIFSIGNALED(Status) != 0) + if( WTERMSIG(Status) == SIGSEGV) + return _error->Error(_("Sub-process %s received a segmentation fault."),Name); + else + return _error->Error(_("Sub-process %s received signal %u."),Name, WTERMSIG(Status)); if (WIFEXITED(Status) != 0) return _error->Error(_("Sub-process %s returned an error code (%u)"),Name,WEXITSTATUS(Status)); diff --git a/debian/changelog b/debian/changelog index 2db8ae677..d6e6a5997 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +apt (0.7.21ubuntu2~ppa1) karmic; urgency=low + + * apt-pkg/acquire-worker.cc: + - show error details of failed methods + * apt-pkg/contrib/fileutl.cc: + - if a process aborts with signal, show signal number + * methods/http.cc: + - ignore SIGPIPE, we deal with EPIPE from write in + HttpMethod::ServerDie() (LP: #385144) + + -- Michael Vogt Thu, 02 Jul 2009 14:11:35 +0200 + apt (0.7.21ubuntu1) karmic; urgency=low * merged from the debian-sid bzr branch diff --git a/methods/http_main.cc b/methods/http_main.cc index 2c46ab19d..7815c2fc1 100644 --- a/methods/http_main.cc +++ b/methods/http_main.cc @@ -1,5 +1,6 @@ #include #include +#include #include "connect.h" #include "rfc2553emu.h" @@ -10,6 +11,10 @@ int main() { setlocale(LC_ALL, ""); + // ignore SIGPIPE, this can happen on write() if the socket + // closes the connection (this is dealt with via ServerDie()) + signal(SIGPIPE, SIG_IGN); + HttpMethod Mth; return Mth.Loop(); } -- cgit v1.2.3 From adbce12126ccc58016af69d541bafad5c8bde631 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 14 Jul 2009 11:24:19 +0200 Subject: * debian/apt.cron.daily: - if the timestamp is too far in the future, delete it (LP: #135262) --- debian/apt.cron.daily | 7 +++++++ debian/changelog | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 7f2978568..3c440307c 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -76,6 +76,13 @@ check_stamp() #echo "stampfile: $1" #echo "interval=$interval, now=$now, stamp=$stamp, delta=$delta" + # remove timestamps a day (or more) in the future and force re-check + if [ $stamp -gt $(($now+86400)) ]; then + echo "WARNING: file $stamp_file has a timestamp in the future: $stamp" + rm -f "$stamp_file" + return 0 + fi + if [ $delta -ge $interval ]; then return 0 fi diff --git a/debian/changelog b/debian/changelog index d6e6a5997..498c6710c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,10 @@ apt (0.7.21ubuntu2~ppa1) karmic; urgency=low * methods/http.cc: - ignore SIGPIPE, we deal with EPIPE from write in HttpMethod::ServerDie() (LP: #385144) + * debian/apt.cron.daily: + - if the timestamp is too far in the future, delete it + (LP: #135262) + -- Michael Vogt Thu, 02 Jul 2009 14:11:35 +0200 -- cgit v1.2.3 From 056539eeb8eb84cea65c0c15466111b978ee156d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 30 Jul 2009 18:25:16 +0200 Subject: methods/http.cc: remove merge artifact --- methods/http.cc | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/methods/http.cc b/methods/http.cc index 476fb751f..859dbd39c 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -1316,15 +1316,4 @@ int HttpMethod::Loop() } /*}}}*/ -int main() -{ - setlocale(LC_ALL, ""); - // ignore SIGPIPE, this can happen on write() if the socket - // closes the connection (this is dealt with via ServerDie()) - signal(SIGPIPE, SIG_IGN); - - HttpMethod Mth; - return Mth.Loop(); -} - -- cgit v1.2.3 From 076c46e5fe4a0ec150952017650c4cc778dc2fd2 Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Thu, 6 Aug 2009 17:44:51 +0100 Subject: * apt-pkg/deb/dpkgpm.cc: - Suppress apport reports on dpkg short reads (these I/O errors are not generally indicative of a bug in the packaging) --- apt-pkg/deb/dpkgpm.cc | 7 +++++++ debian/changelog | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 4403eaefe..3e23720e0 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1078,6 +1078,13 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) return; } + // do not report dpkg I/O errors + // XXX - this message is localized, but this only matches the English version. This is better than nothing. + if(strstr(errormsg, "short read in buffer_copy (")) { + std::clog << _("No apport report written because the error message indicates a dpkg I/O error") << std::endl; + return; + } + // get the pkgname and reportfile pkgname = flNotDir(pkgpath); pos = pkgname.find('_'); diff --git a/debian/changelog b/debian/changelog index f6c282f42..3d5db8114 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,18 @@ apt (0.7.23ubuntu1) karmic; urgency=low + [ Michael Vogt ] * merged from the debian-sid bzr branch * cmdline/apt-get.cc: - honor APT::Get::Only-Source properly in FindSrc() (thanks to Martin Pitt for reporting the problem) - -- Michael Vogt Thu, 30 Jul 2009 15:27:30 +0200 + [ Matt Zimmerman ] + * apt-pkg/deb/dpkgpm.cc: + - Suppress apport reports on dpkg short reads (these I/O errors are not + generally indicative of a bug in the packaging) + + -- Matt Zimmerman Thu, 06 Aug 2009 16:37:04 +0100 apt (0.7.22) unstable; urgency=low -- cgit v1.2.3 From 3d513bbd0c7cdcfb962403645dd9f05f0a127938 Mon Sep 17 00:00:00 2001 From: Brian Murray Date: Thu, 13 Aug 2009 13:25:21 -0700 Subject: incorporate string-fix patch from Matthew East for LP: #370094 --- cmdline/apt-get.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 04f3944a9..7385c3dd3 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2127,7 +2127,7 @@ bool DoSource(CommandLine &CmdL) if(vcs == "Bzr") ioprintf(c1out,_("Please use:\n" "bzr get %s\n" - "to retrieve the latest (possible unreleased) " + "to retrieve the latest (possibly unreleased) " "updates to the package.\n"), uri.c_str()); break; -- cgit v1.2.3 From a69a3a044be84f72508fb468cdf13d9e5f724dd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Fri, 28 Aug 2009 12:03:39 +0200 Subject: * cmdline/apt-key: - Emit a warning if removed keys keyring is missing and skip associated checks (LP: #218971) --- cmdline/apt-key | 18 +++++++++++------- debian/changelog | 5 +++++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/cmdline/apt-key b/cmdline/apt-key index 26aa55633..b579e5a53 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -90,13 +90,17 @@ update() { # add any security. we *need* this check on net-update though $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --import - # remove no-longer supported/used keys - keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys | grep ^pub | cut -d: -f5` - for key in $keys; do - if $GPG --list-keys --with-colons | grep ^pub | cut -d: -f5 | grep -q $key; then - $GPG --quiet --batch --delete-key --yes ${key} - fi - done + if [ -r "$REMOVED_KEYS" ]; then + # remove no-longer supported/used keys + keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys | grep ^pub | cut -d: -f5` + for key in $keys; do + if $GPG --list-keys --with-colons | grep ^pub | cut -d: -f5 | grep -q $key; then + $GPG --quiet --batch --delete-key --yes ${key} + fi + done + else + echo "Warning: removed keys keyring $REMOVED_KEYS missing or not readable" >&2 + fi } diff --git a/debian/changelog b/debian/changelog index dbd8fe5b3..160210dac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,11 @@ apt (0.7.22.3) UNRELEASED; urgency=low * cmdline/apt-get.cc: - typo fix (LP: #370094) + [ Loïc Minier ] + * cmdline/apt-key: + - Emit a warning if removed keys keyring is missing and skip associated + checks (LP: #218971) + -- Michael Vogt Wed, 19 Aug 2009 11:14:15 +0200 apt (0.7.22.2) unstable; urgency=low -- cgit v1.2.3 From fae49a716142b87ac6f6cdcc8e11d2d323ba615f Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Wed, 14 Oct 2009 15:31:05 -0700 Subject: * debian/apt.cron.daily: - fix quotes for use with "eval", thanks to Lars Ljung (LP: #449535). --- debian/apt.cron.daily | 2 +- debian/changelog | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 328282a41..9afc553ae 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -454,7 +454,7 @@ if check_stamp $UPDATE_STAMP $UpdateInterval; then else debug_echo "apt-key net-update (failure)" fi - if eval apt-get $XAPTOPT -y update -o APT::Update::Auth-Failure::="cp /usr/share/apt/apt-auth-failure.note /var/lib/update-notifier/user.d/" $XSTDERR; then + if eval apt-get $XAPTOPT -y update -o APT::Update::Auth-Failure::=\"cp /usr/share/apt/apt-auth-failure.note /var/lib/update-notifier/user.d/\" $XSTDERR; then debug_echo "download updated metadata (success)." if which dbus-send >/dev/null && pidof dbus-daemon >/dev/null; then if dbus-send --system / app.apt.dbus.updated boolean:true ; then diff --git a/debian/changelog b/debian/changelog index 822c7142e..20bcf9bb9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,7 +21,11 @@ apt (0.7.24ubuntu1) UNRELEASED; urgency=low - Emit a warning if removed keys keyring is missing and skip associated checks (LP: #218971) - -- Michael Vogt Wed, 23 Sep 2009 17:24:20 +0200 + [ Kees Cook ] + * debian/apt.cron.daily: + - fix quotes for use with "eval", thanks to Lars Ljung (LP: #449535). + + -- Kees Cook Wed, 14 Oct 2009 15:27:56 -0700 apt (0.7.24) UNRELEASED; urgency=low -- cgit v1.2.3 From 2183a0862311cf2fbb82f61ecdcdf3816ce90040 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 3 Dec 2009 10:40:37 +0100 Subject: * apt-pkg/deb/dpkgpm.cc: - include df -l output in the apport log as well (thanks to tjaalton) --- apt-pkg/deb/dpkgpm.cc | 17 +++++++++++++++++ debian/changelog | 3 +++ 2 files changed, 20 insertions(+) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 7daa55a58..500d4a260 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1243,6 +1243,23 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) fclose(log); } } + + // attach df -l log (to learn about filesystem status) + if (FileExists("/bin/df")) + { + FILE *log = NULL; + char buf[1024]; + + fprintf(report, "Df:\n"); + log = popen("/bin/df -l","r"); + if(log != NULL) + { + while( fgets(buf, sizeof(buf), log) != NULL) + fprintf(report, " %s", buf); + fclose(log); + } + } + fclose(report); } diff --git a/debian/changelog b/debian/changelog index 20bcf9bb9..0113fb95a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ apt (0.7.24ubuntu1) UNRELEASED; urgency=low triggers-pending state. dpkg will deal with the trigger and it if does it before we trigger it, dpkg will error out (LP: #414631) + * apt-pkg/deb/dpkgpm.cc: + - include df -l output in the apport log as well (thanks to + tjaalton) [ Matt Zimmerman ] * apt-pkg/deb/dpkgpm.cc: -- cgit v1.2.3 From 773e2c1fe5fd1a315ffaaf79f2f2e4a9e975649a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Dec 2009 19:24:03 +0100 Subject: Refactor the cache iterators by using a common base class This should not change the public interface, but it removes the friend connection between the iterators and pkgcache as it is unused. --- apt-pkg/cacheiterators.h | 673 +++++++++++++++++++++-------------------------- apt-pkg/pkgcache.cc | 56 ++-- apt-pkg/pkgcache.h | 9 +- 3 files changed, 320 insertions(+), 418 deletions(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 28466cd40..1da5c6f02 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -1,6 +1,5 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: cacheiterators.h,v 1.18.2.1 2004/05/08 22:44:27 mdz Exp $ /* ###################################################################### Cache Iterators - Iterators for navigating the cache structure @@ -30,417 +29,333 @@ /*}}}*/ #ifndef PKGLIB_CACHEITERATORS_H #define PKGLIB_CACHEITERATORS_H - - +// abstract Iterator template /*{{{*/ +/* This template provides the very basic iterator methods we + need to have for doing some walk-over-the-cache magic, */ +template class pkgCache::Iterator { + __attribute__ ((deprecated)) void _dummy(); // FIXME: Who on earth uses this method ??? + + protected: + Str *S; + pkgCache *Owner; + + /** \brief Returns the Pointer for this struct in the owner + * The implementation of this method should be pretty short + * as it will only return the Pointer into the mmap stored + * in the owner but the name of this pointer is different for + * each stucture and we want to abstract here at least for the + * basic methods from the actual structure. + * \return Pointer to the first structure of this type + */ + virtual Str* OwnerPointer() const = 0; + + public: + // Iteration + virtual void operator ++(int) = 0; + virtual void operator ++() = 0; // Should be {operator ++(0);}; + inline bool end() const {return Owner == 0 || S == OwnerPointer();}; + + // Comparison + inline bool operator ==(const Itr &B) const {return S == B.S;}; + inline bool operator !=(const Itr &B) const {return S != B.S;}; + + // Accessors + inline Str *operator ->() {return S;}; + inline Str const *operator ->() const {return S;}; + inline operator Str *() {return S == OwnerPointer() ? 0 : S;}; + inline operator Str const *() const {return S == OwnerPointer() ? 0 : S;}; + inline Str const &operator *() const {return *S;}; + inline pkgCache *Cache() {return Owner;}; + + // Mixed stuff + inline void operator =(const Itr &B) {S = B.S; Owner = B.Owner;}; + inline bool IsGood() const { return S && Owner && ! end();}; + inline unsigned long Index() const {return S - OwnerPointer();}; + + // Constructors - look out for the variable assigning + inline Iterator() : S(0), Owner(0) {}; + inline Iterator(pkgCache &Owner,Str *T = 0) : S(T), Owner(&Owner) {}; +}; + /*}}}*/ // Package Iterator /*{{{*/ -class pkgCache::PkgIterator -{ - friend class pkgCache; - Package *Pkg; - pkgCache *Owner; - long HashIndex; - - protected: - - // This constructor is the 'begin' constructor, never use it. - inline PkgIterator(pkgCache &Owner) : Owner(&Owner), HashIndex(-1) - { - Pkg = Owner.PkgP; - operator ++(0); - }; - - public: - - enum OkState {NeedsNothing,NeedsUnpack,NeedsConfigure}; - - // Iteration - void operator ++(int); - inline void operator ++() {operator ++(0);}; - inline bool end() const {return Owner == 0 || Pkg == Owner->PkgP?true:false;}; - - // Comparison - inline bool operator ==(const PkgIterator &B) const {return Pkg == B.Pkg;}; - inline bool operator !=(const PkgIterator &B) const {return Pkg != B.Pkg;}; - - // Accessors - inline Package *operator ->() {return Pkg;}; - inline Package const *operator ->() const {return Pkg;}; - inline Package const &operator *() const {return *Pkg;}; - inline operator Package *() {return Pkg == Owner->PkgP?0:Pkg;}; - inline operator Package const *() const {return Pkg == Owner->PkgP?0:Pkg;}; - inline pkgCache *Cache() {return Owner;}; - - inline const char *Name() const {return Pkg->Name == 0?0:Owner->StrP + Pkg->Name;}; - inline const char *Section() const {return Pkg->Section == 0?0:Owner->StrP + Pkg->Section;}; - inline bool Purge() const {return Pkg->CurrentState == pkgCache::State::Purge || - (Pkg->CurrentVer == 0 && Pkg->CurrentState == pkgCache::State::NotInstalled);}; - inline VerIterator VersionList() const; - inline VerIterator CurrentVer() const; - inline DepIterator RevDependsList() const; - inline PrvIterator ProvidesList() const; - inline unsigned long Index() const {return Pkg - Owner->PkgP;}; - OkState State() const; - - //Nice printable representation - friend std::ostream& operator<<(std::ostream& out, pkgCache::PkgIterator Pkg); - - const char *CandVersion() const; - const char *CurVersion() const; - - // Constructors - inline PkgIterator(pkgCache &Owner,Package *Trg) : Pkg(Trg), Owner(&Owner), - HashIndex(0) - { - if (Pkg == 0) - Pkg = Owner.PkgP; - }; - inline PkgIterator() : Pkg(0), Owner(0), HashIndex(0) {}; +class pkgCache::PkgIterator: public Iterator { + long HashIndex; + + protected: + inline Package* OwnerPointer() const { + return Owner->PkgP; + }; + + public: + // This constructor is the 'begin' constructor, never use it. + inline PkgIterator(pkgCache &Owner) : Iterator(Owner), HashIndex(-1) { + S = OwnerPointer(); + operator ++(0); + }; + + virtual void operator ++(int); + virtual void operator ++() {operator ++(0);}; + + enum OkState {NeedsNothing,NeedsUnpack,NeedsConfigure}; + + // Accessors + inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;}; + inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;}; + inline bool Purge() const {return S->CurrentState == pkgCache::State::Purge || + (S->CurrentVer == 0 && S->CurrentState == pkgCache::State::NotInstalled);}; + + inline VerIterator VersionList() const; + inline VerIterator CurrentVer() const; + inline DepIterator RevDependsList() const; + inline PrvIterator ProvidesList() const; + OkState State() const; + const char *CandVersion() const; + const char *CurVersion() const; + + //Nice printable representation + friend std::ostream& operator <<(std::ostream& out, PkgIterator i); + + // Constructors + inline PkgIterator(pkgCache &Owner,Package *Trg) : Iterator(Owner, Trg), HashIndex(0) { + if (S == 0) + S = OwnerPointer(); + }; + inline PkgIterator() : Iterator(), HashIndex(0) {}; }; /*}}}*/ // Version Iterator /*{{{*/ -class pkgCache::VerIterator -{ - Version *Ver; - pkgCache *Owner; - - void _dummy(); - - public: - - // Iteration - void operator ++(int) {if (Ver != Owner->VerP) Ver = Owner->VerP + Ver->NextVer;}; - inline void operator ++() {operator ++(0);}; - inline bool end() const {return Owner == 0 || (Ver == Owner->VerP?true:false);}; - inline void operator =(const VerIterator &B) {Ver = B.Ver; Owner = B.Owner;}; - - // Comparison - inline bool operator ==(const VerIterator &B) const {return Ver == B.Ver;}; - inline bool operator !=(const VerIterator &B) const {return Ver != B.Ver;}; - int CompareVer(const VerIterator &B) const; - - // Testing - inline bool IsGood() const { return Ver && Owner && ! end();}; - - // Accessors - inline Version *operator ->() {return Ver;}; - inline Version const *operator ->() const {return Ver;}; - inline Version &operator *() {return *Ver;}; - inline Version const &operator *() const {return *Ver;}; - inline operator Version *() {return Ver == Owner->VerP?0:Ver;}; - inline operator Version const *() const {return Ver == Owner->VerP?0:Ver;}; - inline pkgCache *Cache() {return Owner;}; - - inline const char *VerStr() const {return Ver->VerStr == 0?0:Owner->StrP + Ver->VerStr;}; - inline const char *Section() const {return Ver->Section == 0?0:Owner->StrP + Ver->Section;}; - inline const char *Arch() const {return Ver->Arch == 0?0:Owner->StrP + Ver->Arch;}; - inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + Ver->ParentPkg);}; - inline DescIterator DescriptionList() const; - DescIterator TranslatedDescription() const; - inline DepIterator DependsList() const; - inline PrvIterator ProvidesList() const; - inline VerFileIterator FileList() const; - inline unsigned long Index() const {return Ver - Owner->VerP;}; - bool Downloadable() const; - inline const char *PriorityType() {return Owner->Priority(Ver->Priority);}; - string RelStr(); - - bool Automatic() const; - VerFileIterator NewestFile() const; - - inline VerIterator() : Ver(0), Owner(0) {}; - inline VerIterator(pkgCache &Owner,Version *Trg = 0) : Ver(Trg), - Owner(&Owner) - { - if (Ver == 0) - Ver = Owner.VerP; - }; +class pkgCache::VerIterator : public Iterator { + protected: + inline Version* OwnerPointer() const { + return Owner->VerP; + }; + + public: + // Iteration + void operator ++(int) {if (S != Owner->VerP) S = Owner->VerP + S->NextVer;}; + inline void operator ++() {operator ++(0);}; + + // Comparison + int CompareVer(const VerIterator &B) const; + + // Accessors + inline const char *VerStr() const {return S->VerStr == 0?0:Owner->StrP + S->VerStr;}; + inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;}; + inline const char *Arch() const {return S->Arch == 0?0:Owner->StrP + S->Arch;}; + inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);}; + + inline DescIterator DescriptionList() const; + DescIterator TranslatedDescription() const; + inline DepIterator DependsList() const; + inline PrvIterator ProvidesList() const; + inline VerFileIterator FileList() const; + bool Downloadable() const; + inline const char *PriorityType() {return Owner->Priority(S->Priority);}; + string RelStr(); + + bool Automatic() const; + VerFileIterator NewestFile() const; + + inline VerIterator(pkgCache &Owner,Version *Trg = 0) : Iterator(Owner, Trg) { + if (S == 0) + S = OwnerPointer(); + }; + inline VerIterator() : Iterator() {}; }; /*}}}*/ // Description Iterator /*{{{*/ -class pkgCache::DescIterator -{ - Description *Desc; - pkgCache *Owner; - - void _dummy(); - - public: - - // Iteration - void operator ++(int) {if (Desc != Owner->DescP) Desc = Owner->DescP + Desc->NextDesc;}; - inline void operator ++() {operator ++(0);}; - inline bool end() const {return Owner == 0 || Desc == Owner->DescP?true:false;}; - inline void operator =(const DescIterator &B) {Desc = B.Desc; Owner = B.Owner;}; - - // Comparison - inline bool operator ==(const DescIterator &B) const {return Desc == B.Desc;}; - inline bool operator !=(const DescIterator &B) const {return Desc != B.Desc;}; - int CompareDesc(const DescIterator &B) const; - - // Accessors - inline Description *operator ->() {return Desc;}; - inline Description const *operator ->() const {return Desc;}; - inline Description &operator *() {return *Desc;}; - inline Description const &operator *() const {return *Desc;}; - inline operator Description *() {return Desc == Owner->DescP?0:Desc;}; - inline operator Description const *() const {return Desc == Owner->DescP?0:Desc;}; - inline pkgCache *Cache() {return Owner;}; - - inline const char *LanguageCode() const {return Owner->StrP + Desc->language_code;}; - inline const char *md5() const {return Owner->StrP + Desc->md5sum;}; - inline DescFileIterator FileList() const; - inline unsigned long Index() const {return Desc - Owner->DescP;}; - - inline DescIterator() : Desc(0), Owner(0) {}; - inline DescIterator(pkgCache &Owner,Description *Trg = 0) : Desc(Trg), - Owner(&Owner) - { - if (Desc == 0) - Desc = Owner.DescP; - }; +class pkgCache::DescIterator : public Iterator { + protected: + inline Description* OwnerPointer() const { + return Owner->DescP; + }; + + public: + // Iteration + void operator ++(int) {if (S != Owner->DescP) S = Owner->DescP + S->NextDesc;}; + inline void operator ++() {operator ++(0);}; + + // Comparison + int CompareDesc(const DescIterator &B) const; + + // Accessors + inline const char *LanguageCode() const {return Owner->StrP + S->language_code;}; + inline const char *md5() const {return Owner->StrP + S->md5sum;}; + inline DescFileIterator FileList() const; + + inline DescIterator() : Iterator() {}; + inline DescIterator(pkgCache &Owner,Description *Trg = 0) : Iterator(Owner, Trg) { + if (S == 0) + S = Owner.DescP; + }; }; /*}}}*/ // Dependency iterator /*{{{*/ -class pkgCache::DepIterator -{ - Dependency *Dep; - enum {DepVer, DepRev} Type; - pkgCache *Owner; - - void _dummy(); - - public: - - // Iteration - void operator ++(int) {if (Dep != Owner->DepP) Dep = Owner->DepP + - (Type == DepVer?Dep->NextDepends:Dep->NextRevDepends);}; - inline void operator ++() {operator ++(0);}; - inline bool end() const {return Owner == 0 || Dep == Owner->DepP?true:false;}; - - // Comparison - inline bool operator ==(const DepIterator &B) const {return Dep == B.Dep;}; - inline bool operator !=(const DepIterator &B) const {return Dep != B.Dep;}; - - // Accessors - inline Dependency *operator ->() {return Dep;}; - inline Dependency const *operator ->() const {return Dep;}; - inline Dependency &operator *() {return *Dep;}; - inline Dependency const &operator *() const {return *Dep;}; - inline operator Dependency *() {return Dep == Owner->DepP?0:Dep;}; - inline operator Dependency const *() const {return Dep == Owner->DepP?0:Dep;}; - inline pkgCache *Cache() {return Owner;}; - - inline const char *TargetVer() const {return Dep->Version == 0?0:Owner->StrP + Dep->Version;}; - inline PkgIterator TargetPkg() {return PkgIterator(*Owner,Owner->PkgP + Dep->Package);}; - inline PkgIterator SmartTargetPkg() {PkgIterator R(*Owner,0);SmartTargetPkg(R);return R;}; - inline VerIterator ParentVer() {return VerIterator(*Owner,Owner->VerP + Dep->ParentVer);}; - inline PkgIterator ParentPkg() {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[Dep->ParentVer].ParentPkg);}; - inline bool Reverse() {return Type == DepRev;}; - inline unsigned long Index() const {return Dep - Owner->DepP;}; - bool IsCritical(); - void GlobOr(DepIterator &Start,DepIterator &End); - Version **AllTargets(); - bool SmartTargetPkg(PkgIterator &Result); - inline const char *CompType() {return Owner->CompType(Dep->CompareOp);}; - inline const char *DepType() {return Owner->DepType(Dep->Type);}; - - inline DepIterator(pkgCache &Owner,Dependency *Trg,Version * = 0) : - Dep(Trg), Type(DepVer), Owner(&Owner) - { - if (Dep == 0) - Dep = Owner.DepP; - }; - inline DepIterator(pkgCache &Owner,Dependency *Trg,Package *) : - Dep(Trg), Type(DepRev), Owner(&Owner) - { - if (Dep == 0) - Dep = Owner.DepP; - }; - inline DepIterator() : Dep(0), Type(DepVer), Owner(0) {}; +class pkgCache::DepIterator : public Iterator { + enum {DepVer, DepRev} Type; + + protected: + inline Dependency* OwnerPointer() const { + return Owner->DepP; + }; + + public: + // Iteration + void operator ++(int) {if (S != Owner->DepP) S = Owner->DepP + + (Type == DepVer ? S->NextDepends : S->NextRevDepends);}; + inline void operator ++() {operator ++(0);}; + + // Accessors + inline const char *TargetVer() const {return S->Version == 0?0:Owner->StrP + S->Version;}; + inline PkgIterator TargetPkg() {return PkgIterator(*Owner,Owner->PkgP + S->Package);}; + inline PkgIterator SmartTargetPkg() {PkgIterator R(*Owner,0);SmartTargetPkg(R);return R;}; + inline VerIterator ParentVer() {return VerIterator(*Owner,Owner->VerP + S->ParentVer);}; + inline PkgIterator ParentPkg() {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->ParentVer].ParentPkg);}; + inline bool Reverse() {return Type == DepRev;}; + bool IsCritical(); + void GlobOr(DepIterator &Start,DepIterator &End); + Version **AllTargets(); + bool SmartTargetPkg(PkgIterator &Result); + inline const char *CompType() {return Owner->CompType(S->CompareOp);}; + inline const char *DepType() {return Owner->DepType(S->Type);}; + + inline DepIterator(pkgCache &Owner, Dependency *Trg, Version* = 0) : + Iterator(Owner, Trg), Type(DepVer) { + if (S == 0) + S = Owner.DepP; + }; + inline DepIterator(pkgCache &Owner, Dependency *Trg, Package*) : + Iterator(Owner, Trg), Type(DepRev) { + if (S == 0) + S = Owner.DepP; + }; + inline DepIterator() : Iterator(), Type(DepVer) {}; }; /*}}}*/ // Provides iterator /*{{{*/ -class pkgCache::PrvIterator -{ - Provides *Prv; - enum {PrvVer, PrvPkg} Type; - pkgCache *Owner; - - void _dummy(); - - public: - - // Iteration - void operator ++(int) {if (Prv != Owner->ProvideP) Prv = Owner->ProvideP + - (Type == PrvVer?Prv->NextPkgProv:Prv->NextProvides);}; - inline void operator ++() {operator ++(0);}; - inline bool end() const {return Owner == 0 || Prv == Owner->ProvideP?true:false;}; - - // Comparison - inline bool operator ==(const PrvIterator &B) const {return Prv == B.Prv;}; - inline bool operator !=(const PrvIterator &B) const {return Prv != B.Prv;}; - - // Accessors - inline Provides *operator ->() {return Prv;}; - inline Provides const *operator ->() const {return Prv;}; - inline Provides &operator *() {return *Prv;}; - inline Provides const &operator *() const {return *Prv;}; - inline operator Provides *() {return Prv == Owner->ProvideP?0:Prv;}; - inline operator Provides const *() const {return Prv == Owner->ProvideP?0:Prv;}; - inline pkgCache *Cache() {return Owner;}; - - inline const char *Name() const {return Owner->StrP + Owner->PkgP[Prv->ParentPkg].Name;}; - inline const char *ProvideVersion() const {return Prv->ProvideVersion == 0?0:Owner->StrP + Prv->ProvideVersion;}; - inline PkgIterator ParentPkg() {return PkgIterator(*Owner,Owner->PkgP + Prv->ParentPkg);}; - inline VerIterator OwnerVer() {return VerIterator(*Owner,Owner->VerP + Prv->Version);}; - inline PkgIterator OwnerPkg() {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[Prv->Version].ParentPkg);}; - inline unsigned long Index() const {return Prv - Owner->ProvideP;}; - - inline PrvIterator() : Prv(0), Type(PrvVer), Owner(0) {}; - - inline PrvIterator(pkgCache &Owner,Provides *Trg,Version *) : - Prv(Trg), Type(PrvVer), Owner(&Owner) - { - if (Prv == 0) - Prv = Owner.ProvideP; - }; - inline PrvIterator(pkgCache &Owner,Provides *Trg,Package *) : - Prv(Trg), Type(PrvPkg), Owner(&Owner) - { - if (Prv == 0) - Prv = Owner.ProvideP; - }; +class pkgCache::PrvIterator : public Iterator { + enum {PrvVer, PrvPkg} Type; + + protected: + inline Provides* OwnerPointer() const { + return Owner->ProvideP; + }; + + public: + // Iteration + void operator ++(int) {if (S != Owner->ProvideP) S = Owner->ProvideP + + (Type == PrvVer?S->NextPkgProv:S->NextProvides);}; + inline void operator ++() {operator ++(0);}; + + // Accessors + inline const char *Name() const {return Owner->StrP + Owner->PkgP[S->ParentPkg].Name;}; + inline const char *ProvideVersion() const {return S->ProvideVersion == 0?0:Owner->StrP + S->ProvideVersion;}; + inline PkgIterator ParentPkg() {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);}; + inline VerIterator OwnerVer() {return VerIterator(*Owner,Owner->VerP + S->Version);}; + inline PkgIterator OwnerPkg() {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->Version].ParentPkg);}; + + inline PrvIterator() : Iterator(), Type(PrvVer) {}; + + inline PrvIterator(pkgCache &Owner, Provides *Trg, Version*) : + Iterator(Owner, Trg), Type(PrvVer) { + if (S == 0) + S = Owner.ProvideP; + }; + inline PrvIterator(pkgCache &Owner, Provides *Trg, Package*) : + Iterator(Owner, Trg), Type(PrvPkg) { + if (S == 0) + S = Owner.ProvideP; + }; }; /*}}}*/ // Package file /*{{{*/ -class pkgCache::PkgFileIterator -{ - pkgCache *Owner; - PackageFile *File; - - public: - - // Iteration - void operator ++(int) {if (File!= Owner->PkgFileP) File = Owner->PkgFileP + File->NextFile;}; - inline void operator ++() {operator ++(0);}; - inline bool end() const {return Owner == 0 || File == Owner->PkgFileP?true:false;}; - - // Comparison - inline bool operator ==(const PkgFileIterator &B) const {return File == B.File;}; - inline bool operator !=(const PkgFileIterator &B) const {return File != B.File;}; - - // Accessors - inline PackageFile *operator ->() {return File;}; - inline PackageFile const *operator ->() const {return File;}; - inline PackageFile const &operator *() const {return *File;}; - inline operator PackageFile *() {return File == Owner->PkgFileP?0:File;}; - inline operator PackageFile const *() const {return File == Owner->PkgFileP?0:File;}; - inline pkgCache *Cache() {return Owner;}; - - inline const char *FileName() const {return File->FileName == 0?0:Owner->StrP + File->FileName;}; - inline const char *Archive() const {return File->Archive == 0?0:Owner->StrP + File->Archive;}; - inline const char *Component() const {return File->Component == 0?0:Owner->StrP + File->Component;}; - inline const char *Version() const {return File->Version == 0?0:Owner->StrP + File->Version;}; - inline const char *Origin() const {return File->Origin == 0?0:Owner->StrP + File->Origin;}; - inline const char *Codename() const {return File->Codename ==0?0:Owner->StrP + File->Codename;}; - inline const char *Label() const {return File->Label == 0?0:Owner->StrP + File->Label;}; - inline const char *Site() const {return File->Site == 0?0:Owner->StrP + File->Site;}; - inline const char *Architecture() const {return File->Architecture == 0?0:Owner->StrP + File->Architecture;}; - inline const char *IndexType() const {return File->IndexType == 0?0:Owner->StrP + File->IndexType;}; - - inline unsigned long Index() const {return File - Owner->PkgFileP;}; - - bool IsOk(); - string RelStr(); - - // Constructors - inline PkgFileIterator() : Owner(0), File(0) {}; - inline PkgFileIterator(pkgCache &Owner) : Owner(&Owner), File(Owner.PkgFileP) {}; - inline PkgFileIterator(pkgCache &Owner,PackageFile *Trg) : Owner(&Owner), File(Trg) {}; +class pkgCache::PkgFileIterator : public Iterator { + protected: + inline PackageFile* OwnerPointer() const { + return Owner->PkgFileP; + }; + + public: + // Iteration + void operator ++(int) {if (S != Owner->PkgFileP) S = Owner->PkgFileP + S->NextFile;}; + inline void operator ++() {operator ++(0);}; + + // Accessors + inline const char *FileName() const {return S->FileName == 0?0:Owner->StrP + S->FileName;}; + inline const char *Archive() const {return S->Archive == 0?0:Owner->StrP + S->Archive;}; + inline const char *Component() const {return S->Component == 0?0:Owner->StrP + S->Component;}; + inline const char *Version() const {return S->Version == 0?0:Owner->StrP + S->Version;}; + inline const char *Origin() const {return S->Origin == 0?0:Owner->StrP + S->Origin;}; + inline const char *Codename() const {return S->Codename ==0?0:Owner->StrP + S->Codename;}; + inline const char *Label() const {return S->Label == 0?0:Owner->StrP + S->Label;}; + inline const char *Site() const {return S->Site == 0?0:Owner->StrP + S->Site;}; + inline const char *Architecture() const {return S->Architecture == 0?0:Owner->StrP + S->Architecture;}; + inline const char *IndexType() const {return S->IndexType == 0?0:Owner->StrP + S->IndexType;}; + + bool IsOk(); + string RelStr(); + + // Constructors + inline PkgFileIterator() : Iterator() {}; + inline PkgFileIterator(pkgCache &Owner,PackageFile *Trg = 0) : Iterator(Owner, Trg) {}; }; /*}}}*/ // Version File /*{{{*/ -class pkgCache::VerFileIterator -{ - pkgCache *Owner; - VerFile *FileP; - - public: - - // Iteration - void operator ++(int) {if (FileP != Owner->VerFileP) FileP = Owner->VerFileP + FileP->NextFile;}; - inline void operator ++() {operator ++(0);}; - inline bool end() const {return Owner == 0 || FileP == Owner->VerFileP?true:false;}; - - // Comparison - inline bool operator ==(const VerFileIterator &B) const {return FileP == B.FileP;}; - inline bool operator !=(const VerFileIterator &B) const {return FileP != B.FileP;}; - - // Accessors - inline VerFile *operator ->() {return FileP;}; - inline VerFile const *operator ->() const {return FileP;}; - inline VerFile const &operator *() const {return *FileP;}; - inline operator VerFile *() {return FileP == Owner->VerFileP?0:FileP;}; - inline operator VerFile const *() const {return FileP == Owner->VerFileP?0:FileP;}; - inline pkgCache *Cache() {return Owner;}; - - inline PkgFileIterator File() const {return PkgFileIterator(*Owner,FileP->File + Owner->PkgFileP);}; - inline unsigned long Index() const {return FileP - Owner->VerFileP;}; - - inline VerFileIterator() : Owner(0), FileP(0) {}; - inline VerFileIterator(pkgCache &Owner,VerFile *Trg) : Owner(&Owner), FileP(Trg) {}; +class pkgCache::VerFileIterator : public pkgCache::Iterator { + protected: + inline VerFile* OwnerPointer() const { + return Owner->VerFileP; + }; + + public: + // Iteration + void operator ++(int) {if (S != Owner->VerFileP) S = Owner->VerFileP + S->NextFile;}; + inline void operator ++() {operator ++(0);}; + + // Accessors + inline PkgFileIterator File() const {return PkgFileIterator(*Owner,S->File + Owner->PkgFileP);}; + + inline VerFileIterator() : Iterator() {}; + inline VerFileIterator(pkgCache &Owner,VerFile *Trg) : Iterator(Owner, Trg) {}; }; /*}}}*/ // Description File /*{{{*/ -class pkgCache::DescFileIterator -{ - pkgCache *Owner; - DescFile *FileP; - - public: - - // Iteration - void operator ++(int) {if (FileP != Owner->DescFileP) FileP = Owner->DescFileP + FileP->NextFile;}; - inline void operator ++() {operator ++(0);}; - inline bool end() const {return Owner == 0 || FileP == Owner->DescFileP?true:false;}; - - // Comparison - inline bool operator ==(const DescFileIterator &B) const {return FileP == B.FileP;}; - inline bool operator !=(const DescFileIterator &B) const {return FileP != B.FileP;}; - - // Accessors - inline DescFile *operator ->() {return FileP;}; - inline DescFile const *operator ->() const {return FileP;}; - inline DescFile const &operator *() const {return *FileP;}; - inline operator DescFile *() {return FileP == Owner->DescFileP?0:FileP;}; - inline operator DescFile const *() const {return FileP == Owner->DescFileP?0:FileP;}; - inline pkgCache *Cache() {return Owner;}; - - inline PkgFileIterator File() const {return PkgFileIterator(*Owner,FileP->File + Owner->PkgFileP);}; - inline unsigned long Index() const {return FileP - Owner->DescFileP;}; - - inline DescFileIterator() : Owner(0), FileP(0) {}; - inline DescFileIterator(pkgCache &Owner,DescFile *Trg) : Owner(&Owner), FileP(Trg) {}; +class pkgCache::DescFileIterator : public Iterator { + protected: + inline DescFile* OwnerPointer() const { + return Owner->DescFileP; + }; + + public: + // Iteration + void operator ++(int) {if (S != Owner->DescFileP) S = Owner->DescFileP + S->NextFile;}; + inline void operator ++() {operator ++(0);}; + + // Accessors + inline PkgFileIterator File() const {return PkgFileIterator(*Owner,S->File + Owner->PkgFileP);}; + + inline DescFileIterator() : Iterator() {}; + inline DescFileIterator(pkgCache &Owner,DescFile *Trg) : Iterator(Owner, Trg) {}; }; /*}}}*/ // Inlined Begin functions cant be in the class because of order problems /*{{{*/ inline pkgCache::VerIterator pkgCache::PkgIterator::VersionList() const - {return VerIterator(*Owner,Owner->VerP + Pkg->VersionList);}; + {return VerIterator(*Owner,Owner->VerP + S->VersionList);}; inline pkgCache::VerIterator pkgCache::PkgIterator::CurrentVer() const - {return VerIterator(*Owner,Owner->VerP + Pkg->CurrentVer);}; + {return VerIterator(*Owner,Owner->VerP + S->CurrentVer);}; inline pkgCache::DepIterator pkgCache::PkgIterator::RevDependsList() const - {return DepIterator(*Owner,Owner->DepP + Pkg->RevDepends,Pkg);}; + {return DepIterator(*Owner,Owner->DepP + S->RevDepends,S);}; inline pkgCache::PrvIterator pkgCache::PkgIterator::ProvidesList() const - {return PrvIterator(*Owner,Owner->ProvideP + Pkg->ProvidesList,Pkg);}; + {return PrvIterator(*Owner,Owner->ProvideP + S->ProvidesList,S);}; inline pkgCache::DescIterator pkgCache::VerIterator::DescriptionList() const - {return DescIterator(*Owner,Owner->DescP + Ver->DescriptionList);}; + {return DescIterator(*Owner,Owner->DescP + S->DescriptionList);}; inline pkgCache::PrvIterator pkgCache::VerIterator::ProvidesList() const - {return PrvIterator(*Owner,Owner->ProvideP + Ver->ProvidesList,Ver);}; + {return PrvIterator(*Owner,Owner->ProvideP + S->ProvidesList,S);}; inline pkgCache::DepIterator pkgCache::VerIterator::DependsList() const - {return DepIterator(*Owner,Owner->DepP + Ver->DependsList,Ver);}; + {return DepIterator(*Owner,Owner->DepP + S->DependsList,S);}; inline pkgCache::VerFileIterator pkgCache::VerIterator::FileList() const - {return VerFileIterator(*Owner,Owner->VerFileP + Ver->FileList);}; + {return VerFileIterator(*Owner,Owner->VerFileP + S->FileList);}; inline pkgCache::DescFileIterator pkgCache::DescIterator::FileList() const - {return DescFileIterator(*Owner,Owner->DescFileP + Desc->FileList);}; + {return DescFileIterator(*Owner,Owner->DescFileP + S->FileList);}; /*}}}*/ #endif diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 997ff51fe..2f8bde6f7 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -242,26 +242,20 @@ const char *pkgCache::Priority(unsigned char Prio) return 0; } /*}}}*/ -// Bases for iterator classes /*{{{*/ -void pkgCache::VerIterator::_dummy() {} -void pkgCache::DepIterator::_dummy() {} -void pkgCache::PrvIterator::_dummy() {} -void pkgCache::DescIterator::_dummy() {} - /*}}}*/ // PkgIterator::operator ++ - Postfix incr /*{{{*/ // --------------------------------------------------------------------- /* This will advance to the next logical package in the hash table. */ void pkgCache::PkgIterator::operator ++(int) { // Follow the current links - if (Pkg != Owner->PkgP) - Pkg = Owner->PkgP + Pkg->NextPackage; + if (S != Owner->PkgP) + S = Owner->PkgP + S->NextPackage; // Follow the hash table - while (Pkg == Owner->PkgP && (HashIndex+1) < (signed)_count(Owner->HeaderP->HashTable)) + while (S == Owner->PkgP && (HashIndex+1) < (signed)_count(Owner->HeaderP->HashTable)) { HashIndex++; - Pkg = Owner->PkgP + Owner->HeaderP->HashTable[HashIndex]; + S = Owner->PkgP + Owner->HeaderP->HashTable[HashIndex]; } }; /*}}}*/ @@ -270,12 +264,12 @@ void pkgCache::PkgIterator::operator ++(int) /* By this we mean if it is either cleanly installed or cleanly removed. */ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const { - if (Pkg->InstState == pkgCache::State::ReInstReq || - Pkg->InstState == pkgCache::State::HoldReInstReq) + if (S->InstState == pkgCache::State::ReInstReq || + S->InstState == pkgCache::State::HoldReInstReq) return NeedsUnpack; - if (Pkg->CurrentState == pkgCache::State::UnPacked || - Pkg->CurrentState == pkgCache::State::HalfConfigured) + if (S->CurrentState == pkgCache::State::UnPacked || + S->CurrentState == pkgCache::State::HalfConfigured) // we leave triggers alone complettely. dpkg deals with // them in a hard-to-predict manner and if they get // resolved by dpkg before apt run dpkg --configure on @@ -284,8 +278,8 @@ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const //Pkg->CurrentState == pkgCache::State::TriggersPending) return NeedsConfigure; - if (Pkg->CurrentState == pkgCache::State::HalfInstalled || - Pkg->InstState != pkgCache::State::Ok) + if (S->CurrentState == pkgCache::State::HalfInstalled || + S->InstState != pkgCache::State::Ok) return NeedsUnpack; return NeedsNothing; @@ -347,11 +341,11 @@ operator<<(ostream& out, pkgCache::PkgIterator Pkg) conflicts (including dpkg's Breaks fields). */ bool pkgCache::DepIterator::IsCritical() { - if (Dep->Type == pkgCache::Dep::Conflicts || - Dep->Type == pkgCache::Dep::DpkgBreaks || - Dep->Type == pkgCache::Dep::Obsoletes || - Dep->Type == pkgCache::Dep::Depends || - Dep->Type == pkgCache::Dep::PreDepends) + if (S->Type == pkgCache::Dep::Conflicts || + S->Type == pkgCache::Dep::DpkgBreaks || + S->Type == pkgCache::Dep::Obsoletes || + S->Type == pkgCache::Dep::Depends || + S->Type == pkgCache::Dep::PreDepends) return true; return false; } @@ -430,12 +424,12 @@ pkgCache::Version **pkgCache::DepIterator::AllTargets() // Walk along the actual package providing versions for (VerIterator I = DPkg.VersionList(); I.end() == false; I++) { - if (Owner->VS->CheckDep(I.VerStr(),Dep->CompareOp,TargetVer()) == false) + if (Owner->VS->CheckDep(I.VerStr(),S->CompareOp,TargetVer()) == false) continue; - if ((Dep->Type == pkgCache::Dep::Conflicts || - Dep->Type == pkgCache::Dep::DpkgBreaks || - Dep->Type == pkgCache::Dep::Obsoletes) && + if ((S->Type == pkgCache::Dep::Conflicts || + S->Type == pkgCache::Dep::DpkgBreaks || + S->Type == pkgCache::Dep::Obsoletes) && ParentPkg() == I.ParentPkg()) continue; @@ -447,12 +441,12 @@ pkgCache::Version **pkgCache::DepIterator::AllTargets() // Follow all provides for (PrvIterator I = DPkg.ProvidesList(); I.end() == false; I++) { - if (Owner->VS->CheckDep(I.ProvideVersion(),Dep->CompareOp,TargetVer()) == false) + if (Owner->VS->CheckDep(I.ProvideVersion(),S->CompareOp,TargetVer()) == false) continue; - if ((Dep->Type == pkgCache::Dep::Conflicts || - Dep->Type == pkgCache::Dep::DpkgBreaks || - Dep->Type == pkgCache::Dep::Obsoletes) && + if ((S->Type == pkgCache::Dep::Conflicts || + S->Type == pkgCache::Dep::DpkgBreaks || + S->Type == pkgCache::Dep::Obsoletes) && ParentPkg() == I.OwnerPkg()) continue; @@ -490,7 +484,7 @@ void pkgCache::DepIterator::GlobOr(DepIterator &Start,DepIterator &End) End = *this; for (bool LastOR = true; end() == false && LastOR == true;) { - LastOR = (Dep->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or; + LastOR = (S->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or; (*this)++; if (LastOR == true) End = (*this); @@ -640,7 +634,7 @@ bool pkgCache::PkgFileIterator::IsOk() if (stat(FileName(),&Buf) != 0) return false; - if (Buf.st_size != (signed)File->Size || Buf.st_mtime != File->mtime) + if (Buf.st_size != (signed)S->Size || Buf.st_mtime != S->mtime) return false; return true; diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index e8a3e1064..359f8a590 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -43,6 +43,7 @@ class pkgCache /*{{{*/ struct DescFile; // Iterators + template class Iterator; class PkgIterator; class VerIterator; class DescIterator; @@ -51,14 +52,6 @@ class pkgCache /*{{{*/ class PkgFileIterator; class VerFileIterator; class DescFileIterator; - friend class PkgIterator; - friend class VerIterator; - friend class DescInterator; - friend class DepIterator; - friend class PrvIterator; - friend class PkgFileIterator; - friend class VerFileIterator; - friend class DescFileIterator; class Namespace; -- cgit v1.2.3 From b52da4cd38991881e0f456fb1976412886c564ee Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 14 Dec 2009 10:09:10 +0100 Subject: releasing version 0.7.24ubuntu1 --- debian/changelog | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 32d019cc5..41ed03a0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,6 @@ -apt (0.7.24ubuntu1) UNRELEASED; urgency=low +apt (0.7.24ubuntu1) lucid; urgency=low [ Michael Vogt ] - * apt-pkg/pkgcache.cc: - - do not set internel "needs-configure" state for packages in - triggers-pending state. dpkg will deal with the trigger and - it if does it before we trigger it, dpkg will error out - (LP: #414631) * apt-pkg/deb/dpkgpm.cc: - include df -l output in the apport log as well (thanks to tjaalton) @@ -24,7 +19,7 @@ apt (0.7.24ubuntu1) UNRELEASED; urgency=low * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc: - typo fix (LP: #462328) - -- Michael Vogt Wed, 09 Dec 2009 09:56:03 +0100 + -- Michael Vogt Mon, 14 Dec 2009 09:27:26 +0100 apt (0.7.24) unstable; urgency=low -- cgit v1.2.3 From 7d15572bc3124b15c043e38bdc3d90bcc94f108a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 19 Dec 2009 14:25:20 +0100 Subject: add optional gcc features as deprecated, unused and (un)likely --- apt-pkg/contrib/system.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/apt-pkg/contrib/system.h b/apt-pkg/contrib/system.h index 7ec3d7feb..f68df6265 100644 --- a/apt-pkg/contrib/system.h +++ b/apt-pkg/contrib/system.h @@ -55,4 +55,26 @@ #define CLRFLAG(v,f) ((v) &=~FLAG(f)) #define CHKFLAG(v,f) ((v) & FLAG(f) ? true : false) +// some nice optional GNUC features +#if __GNUC__ >= 3 + #define __must_check __attribute__ ((warn_unused_result)) + #define __deprecated __attribute__ ((deprecated)) + /* likely() and unlikely() can be used to mark boolean expressions + as (not) likely true which will help the compiler to optimise */ + #define likely(x) __builtin_expect (!!(x), 1) + #define unlikely(x) __builtin_expect (!!(x), 0) +#else + #define __must_check /* no warn_unused_result */ + #define __deprecated /* no deprecated */ + #define likely(x) (x) + #define unlikely(x) (x) +#endif + +// cold functions are unlikely() to be called +#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4 + #define __cold __attribute__ ((__cold__)) +#else + #define __cold /* no cold marker */ +#endif + #endif -- cgit v1.2.3 From 201d1fa0d25deeda77c2570ee5342eaf18499699 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 19 Dec 2009 14:27:21 +0100 Subject: mark the Error/Warning method as __cold --- apt-pkg/contrib/error.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index a3be6a575..d92e40e9c 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -52,6 +52,7 @@ #endif #include +#include using std::string; @@ -71,13 +72,13 @@ class GlobalError public: // Call to generate an error from a library call. - bool Errno(const char *Function,const char *Description,...) APT_MFORMAT2; - bool WarningE(const char *Function,const char *Description,...) APT_MFORMAT2; + bool Errno(const char *Function,const char *Description,...) APT_MFORMAT2 __cold; + bool WarningE(const char *Function,const char *Description,...) APT_MFORMAT2 __cold; /* A warning should be considered less severe than an error, and may be ignored by the client. */ - bool Error(const char *Description,...) APT_MFORMAT1; - bool Warning(const char *Description,...) APT_MFORMAT1; + bool Error(const char *Description,...) APT_MFORMAT1 __cold; + bool Warning(const char *Description,...) APT_MFORMAT1 __cold; // Simple accessors inline bool PendingError() {return PendingFlag;}; -- cgit v1.2.3 From 5bf15716398fdb767ca6249a0155219b88d7ae60 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 19 Dec 2009 16:25:56 +0100 Subject: Implement the first step toward Multi-Arch by setting up a Group infrastructor for packages. APT is now aware of the fact that a package A in architecture X can't satisfy a dependency on package A in architecture Y - to handle these packages are now identified by name and architecture, so different architectures of the same package are handled internally as completly different packages. This is great for pinning, dependency checking and in many other situations, but sometimes we need to know which archs are available for a given package: Here Groups come to our rescue! --- apt-pkg/cacheiterators.h | 37 ++++++++++++-- apt-pkg/deb/deblistparser.cc | 40 +++++++++++----- apt-pkg/deb/deblistparser.h | 1 + apt-pkg/pkgcache.cc | 112 ++++++++++++++++++++++++++++++++++++------- apt-pkg/pkgcache.h | 30 ++++++++++-- apt-pkg/pkgcachegen.cc | 111 +++++++++++++++++++++++++++++------------- apt-pkg/pkgcachegen.h | 6 ++- 7 files changed, 267 insertions(+), 70 deletions(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 1da5c6f02..35d3aa228 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -31,10 +31,8 @@ #define PKGLIB_CACHEITERATORS_H // abstract Iterator template /*{{{*/ /* This template provides the very basic iterator methods we - need to have for doing some walk-over-the-cache magic, */ + need to have for doing some walk-over-the-cache magic */ template class pkgCache::Iterator { - __attribute__ ((deprecated)) void _dummy(); // FIXME: Who on earth uses this method ??? - protected: Str *S; pkgCache *Owner; @@ -75,6 +73,35 @@ template class pkgCache::Iterator { // Constructors - look out for the variable assigning inline Iterator() : S(0), Owner(0) {}; inline Iterator(pkgCache &Owner,Str *T = 0) : S(T), Owner(&Owner) {}; +}; + /*}}}*/ +// Group Iterator /*{{{*/ +/* Packages with the same name are collected in a Group so someone only + interest in package names can iterate easily over the names, so the + different architectures can be treated as of the "same" package + (apt internally treat them as totally different packages) */ +class pkgCache::GrpIterator: public Iterator { + protected: + inline Group* OwnerPointer() const { + return Owner->GrpP; + }; + + public: + void operator ++(int) {if (S != Owner->GrpP) S = Owner->GrpP + S->Next;}; + virtual void operator ++() {operator ++(0);}; + + inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;}; + inline PkgIterator PackageList() const; + PkgIterator FindPkg(string Arch = "any"); + PkgIterator NextPkg(PkgIterator const &Pkg); + + // Constructors + inline GrpIterator(pkgCache &Owner, Group *Trg) : Iterator(Owner, Trg) { + if (S == 0) + S = OwnerPointer(); + }; + inline GrpIterator() : Iterator() {}; + }; /*}}}*/ // Package Iterator /*{{{*/ @@ -103,6 +130,8 @@ class pkgCache::PkgIterator: public Iterator { inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;}; inline bool Purge() const {return S->CurrentState == pkgCache::State::Purge || (S->CurrentVer == 0 && S->CurrentState == pkgCache::State::NotInstalled);}; + inline const char *Arch() const {return S->Arch == 0?0:Owner->StrP + S->Arch;}; + inline GrpIterator Group() const { return GrpIterator(*Owner, Owner->GrpP + S->Group);}; inline VerIterator VersionList() const; inline VerIterator CurrentVer() const; @@ -339,6 +368,8 @@ class pkgCache::DescFileIterator : public Iterator { }; /*}}}*/ // Inlined Begin functions cant be in the class because of order problems /*{{{*/ +inline pkgCache::PkgIterator pkgCache::GrpIterator::PackageList() const + {return PkgIterator(*Owner,Owner->PkgP + S->FirstPackage);}; inline pkgCache::VerIterator pkgCache::PkgIterator::VersionList() const {return VerIterator(*Owner,Owner->VerP + S->VersionList);}; inline pkgCache::VerIterator pkgCache::PkgIterator::CurrentVer() const diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 25a1df3f9..fe68aec0b 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -53,12 +53,25 @@ unsigned long debListParser::UniqFindTagWrite(const char *Tag) // ListParser::Package - Return the package name /*{{{*/ // --------------------------------------------------------------------- /* This is to return the name of the package this section describes */ -string debListParser::Package() -{ - string Result = Section.FindS("Package"); - if (Result.empty() == true) - _error->Error("Encountered a section with no Package: header"); - return Result; +string debListParser::Package() { + string const Result = Section.FindS("Package"); + if(unlikely(Result.empty() == true)) + _error->Error("Encountered a section with no Package: header"); + return Result; +} + /*}}}*/ +// ListParser::Architecture - Return the package arch /*{{{*/ +// --------------------------------------------------------------------- +/* This will return the Architecture of the package this section describes + Note that architecture "all" packages will get the architecture of the + Packages file parsed here */ +string debListParser::Architecture() { + string const Result = Section.FindS("Architecture"); + if (Result.empty() == true) + return Arch; + if (Result == "all") + return Arch; + return Result; } /*}}}*/ // ListParser::Version - Return the version string /*{{{*/ @@ -78,8 +91,10 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver) { // Parse the section Ver->Section = UniqFindTagWrite("Section"); - Ver->Arch = UniqFindTagWrite("Architecture"); - + + // Parse the architecture + Ver->Arch = WriteUniqString(Architecture()); + // Archive Size Ver->Size = (unsigned)Section.FindI("Size"); @@ -537,6 +552,7 @@ bool debListParser::ParseDepends(pkgCache::VerIterator Ver, return true; string Package; + string const pkgArch = Ver.Arch(); string Version; unsigned int Op; @@ -546,7 +562,7 @@ bool debListParser::ParseDepends(pkgCache::VerIterator Ver, if (Start == 0) return _error->Error("Problem parsing dependency %s",Tag); - if (NewDepends(Ver,Package,Version,Op,Type) == false) + if (NewDepends(Ver,Package,pkgArch,Version,Op,Type) == false) return false; if (Start == Stop) break; @@ -619,6 +635,7 @@ bool debListParser::Step() if (Section.Find("Architecture",Start,Stop) == false) return true; + //FIXME: Accept different Architectures here if (stringcmp(Arch,Start,Stop) == 0) return true; @@ -641,8 +658,9 @@ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator FileI, if (Tags.Step(Section) == false) return false; - //mvo: I don't think we need to fill that in (it's unused since apt-0.6) - //FileI->Architecture = WriteUniqString(Arch); + // FIXME: Do we need it now for multi-arch? + // mvo: I don't think we need to fill that in (it's unused since apt-0.6) +// FileI->Architecture = WriteUniqString(Arch); // apt-secure does no longer download individual (per-section) Release // file. to provide Component pinning we use the section name now diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 1c709229f..5f91e073e 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -46,6 +46,7 @@ class debListParser : public pkgCacheGenerator::ListParser // These all operate against the current section virtual string Package(); + virtual string Architecture(); virtual string Version(); virtual bool NewVersion(pkgCache::VerIterator Ver); virtual string Description(); diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 2f8bde6f7..2b5f53f6f 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -79,7 +79,8 @@ pkgCache::Header::Header() StringList = 0; VerSysName = 0; Architecture = 0; - memset(HashTable,0,sizeof(HashTable)); + memset(PkgHashTable,0,sizeof(PkgHashTable)); + memset(GrpHashTable,0,sizeof(GrpHashTable)); memset(Pools,0,sizeof(Pools)); } /*}}}*/ @@ -118,6 +119,7 @@ bool pkgCache::ReMap() { // Apply the typecasts. HeaderP = (Header *)Map.Data(); + GrpP = (Group *)Map.Data(); PkgP = (Package *)Map.Data(); VerFileP = (VerFile *)Map.Data(); DescFileP = (DescFile *)Map.Data(); @@ -165,7 +167,7 @@ unsigned long pkgCache::sHash(const string &Str) const unsigned long Hash = 0; for (string::const_iterator I = Str.begin(); I != Str.end(); I++) Hash = 5*Hash + tolower_ascii(*I); - return Hash % _count(HeaderP->HashTable); + return Hash % _count(HeaderP->PkgHashTable); } unsigned long pkgCache::sHash(const char *Str) const @@ -173,24 +175,40 @@ unsigned long pkgCache::sHash(const char *Str) const unsigned long Hash = 0; for (const char *I = Str; *I != 0; I++) Hash = 5*Hash + tolower_ascii(*I); - return Hash % _count(HeaderP->HashTable); + return Hash % _count(HeaderP->PkgHashTable); } /*}}}*/ // Cache::FindPkg - Locate a package by name /*{{{*/ // --------------------------------------------------------------------- /* Returns 0 on error, pointer to the package otherwise */ -pkgCache::PkgIterator pkgCache::FindPkg(const string &Name) -{ - // Look at the hash bucket - Package *Pkg = PkgP + HeaderP->HashTable[Hash(Name)]; - for (; Pkg != PkgP; Pkg = PkgP + Pkg->NextPackage) - { - if (Pkg->Name != 0 && StrP[Pkg->Name] == Name[0] && - stringcasecmp(Name,StrP + Pkg->Name) == 0) - return PkgIterator(*this,Pkg); - } - return PkgIterator(*this,0); +pkgCache::PkgIterator pkgCache::FindPkg(const string &Name, string Arch) { + /* We make a detour via the GrpIterator here as + on a multi-arch environment a group is easier to + find than a package (less entries in the buckets) */ + pkgCache::GrpIterator Grp = FindGrp(Name); + if (Grp.end() == true) + return PkgIterator(*this,0); + + return Grp.FindPkg(Arch); +} + /*}}}*/ +// Cache::FindGrp - Locate a group by name /*{{{*/ +// --------------------------------------------------------------------- +/* Returns End-Pointer on error, pointer to the group otherwise */ +pkgCache::GrpIterator pkgCache::FindGrp(const string &Name) { + if (unlikely(Name.empty() == true)) + return GrpIterator(*this,0); + + // Look at the hash bucket for the group + Group *Grp = GrpP + HeaderP->GrpHashTable[sHash(Name)]; + for (; Grp != GrpP; Grp = GrpP + Grp->Next) { + if (Grp->Name != 0 && StrP[Grp->Name] == Name[0] && + stringcasecmp(Name, StrP + Grp->Name) == 0) + return GrpIterator(*this, Grp); + } + + return GrpIterator(*this,0); } /*}}}*/ // Cache::CompTypeDeb - Return a string describing the compare type /*{{{*/ @@ -242,6 +260,68 @@ const char *pkgCache::Priority(unsigned char Prio) return 0; } /*}}}*/ +// GrpIterator::FindPkg - Locate a package by arch /*{{{*/ +// --------------------------------------------------------------------- +/* Returns an End-Pointer on error, pointer to the package otherwise */ +pkgCache::PkgIterator pkgCache::GrpIterator::FindPkg(string Arch) { + if (unlikely(IsGood() == false || S->FirstPackage == 0)) + return PkgIterator(*Owner, 0); + + static string const myArch = _config->Find("APT::Architecture"); + /* Most of the time the package for our native architecture is + the one we add at first to the cache, but this would be the + last one we check, so we do it now. */ + if (Arch == "native" || Arch == myArch) { + Arch = myArch; + pkgCache::Package *Pkg = Owner->PkgP + S->LastPackage; + if (stringcasecmp(Arch, Owner->StrP + Pkg->Arch) == 0) + return PkgIterator(*Owner, Pkg); + } + + /* If we accept any package we simply return the "first" + package in this group (the last one added). */ + if (Arch == "any") + return PkgIterator(*Owner, Owner->PkgP + S->FirstPackage); + + /* Iterate over the list to find the matching arch + unfortunately this list includes "package noise" + (= different packages with same calculated hash), + so we need to check the name also */ + for (pkgCache::Package *Pkg = PackageList(); Pkg != Owner->PkgP; + Pkg = Owner->PkgP + Pkg->NextPackage) { + if (S->Name == Pkg->Name && + stringcasecmp(Arch, Owner->StrP + Pkg->Arch) == 0) + return PkgIterator(*Owner, Pkg); + if ((Owner->PkgP + S->LastPackage) == Pkg) + break; + } + + return PkgIterator(*Owner, 0); +} + /*}}}*/ +// GrpIterator::NextPkg - Locate the next package in the group /*{{{*/ +// --------------------------------------------------------------------- +/* Returns an End-Pointer on error, pointer to the package otherwise. + We can't simply ++ to the next as the list of packages includes + "package noise" (= packages with the same hash value but different name) */ +pkgCache::PkgIterator pkgCache::GrpIterator::NextPkg(pkgCache::PkgIterator const &LastPkg) { + if (unlikely(IsGood() == false || S->FirstPackage == 0 || + LastPkg.end() == true)) + return PkgIterator(*Owner, 0); + + // Iterate over the list to find the next package + pkgCache::Package *Pkg = Owner->PkgP + LastPkg.Index(); + Pkg = Owner->PkgP + Pkg->NextPackage; + for (; Pkg != Owner->PkgP; Pkg = Owner->PkgP + Pkg->NextPackage) { + if (S->Name == Pkg->Name) + return PkgIterator(*Owner, Pkg); + if ((Owner->PkgP + S->LastPackage) == Pkg) + break; + } + + return PkgIterator(*Owner, 0); +} + /*}}}*/ // PkgIterator::operator ++ - Postfix incr /*{{{*/ // --------------------------------------------------------------------- /* This will advance to the next logical package in the hash table. */ @@ -252,10 +332,10 @@ void pkgCache::PkgIterator::operator ++(int) S = Owner->PkgP + S->NextPackage; // Follow the hash table - while (S == Owner->PkgP && (HashIndex+1) < (signed)_count(Owner->HeaderP->HashTable)) + while (S == Owner->PkgP && (HashIndex+1) < (signed)_count(Owner->HeaderP->PkgHashTable)) { HashIndex++; - S = Owner->PkgP + Owner->HeaderP->HashTable[HashIndex]; + S = Owner->PkgP + Owner->HeaderP->PkgHashTable[HashIndex]; } }; /*}}}*/ diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 359f8a590..b3d2752d2 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -32,6 +32,7 @@ class pkgCache /*{{{*/ public: // Cache element predeclarations struct Header; + struct Group; struct Package; struct PackageFile; struct Version; @@ -44,6 +45,7 @@ class pkgCache /*{{{*/ // Iterators template class Iterator; + class GrpIterator; class PkgIterator; class VerIterator; class DescIterator; @@ -97,6 +99,7 @@ class pkgCache /*{{{*/ // Pointers to the arrays of items Header *HeaderP; + Group *GrpP; Package *PkgP; VerFile *VerFileP; DescFile *DescFileP; @@ -121,7 +124,9 @@ class pkgCache /*{{{*/ const char *Priority(unsigned char Priority); // Accessors - PkgIterator FindPkg(const string &Name); + GrpIterator FindGrp(const string &Name); + PkgIterator FindPkg(const string &Name, string Arch = "native"); + Header &Head() {return *HeaderP;}; inline PkgIterator PkgBegin(); inline PkgIterator PkgEnd(); @@ -161,6 +166,7 @@ struct pkgCache::Header unsigned short DescFileSz; // Structure counts + unsigned long GroupCount; unsigned long PackageCount; unsigned long VersionCount; unsigned long DescriptionCount; @@ -180,22 +186,36 @@ struct pkgCache::Header /* Allocation pools, there should be one of these for each structure excluding the header */ - DynamicMMap::Pool Pools[8]; + DynamicMMap::Pool Pools[9]; - // Rapid package name lookup - map_ptrloc HashTable[2*1048]; + // Rapid package and group name lookup + // Notice: Increase only both table sizes as the + // hashmethod assume the size of the Pkg one + map_ptrloc PkgHashTable[2*1048]; + map_ptrloc GrpHashTable[2*1048]; bool CheckSizes(Header &Against) const; Header(); }; /*}}}*/ +struct pkgCache::Group { /*{{{*/ + map_ptrloc Name; // Stringtable + + // Linked List + map_ptrloc FirstPackage;// Package + map_ptrloc LastPackage; // Package + map_ptrloc Next; // Group +}; + /*}}}*/ struct pkgCache::Package /*{{{*/ { // Pointers map_ptrloc Name; // Stringtable + map_ptrloc Arch; // StringTable (StringItem) map_ptrloc VersionList; // Version map_ptrloc CurrentVer; // Version map_ptrloc Section; // StringTable (StringItem) + map_ptrloc Group; // Group the Package belongs to // Linked list map_ptrloc NextPackage; // Package @@ -254,7 +274,7 @@ struct pkgCache::Version /*{{{*/ map_ptrloc VerStr; // Stringtable map_ptrloc Section; // StringTable (StringItem) map_ptrloc Arch; // StringTable - + // Lists map_ptrloc FileList; // VerFile map_ptrloc NextVer; // Version diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 68180c702..c37f6f48e 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -108,12 +108,12 @@ bool pkgCacheGenerator::MergeList(ListParser &List, while (List.Step() == true) { // Get a pointer to the package structure - string PackageName = List.Package(); + string const PackageName = List.Package(); if (PackageName.empty() == true) return false; - + pkgCache::PkgIterator Pkg; - if (NewPackage(Pkg,PackageName) == false) + if (NewPackage(Pkg, PackageName, List.Architecture()) == false) return _error->Error(_("Error occurred while processing %s (NewPackage)"),PackageName.c_str()); Counter++; if (Counter % 100 == 0 && Progress != 0) @@ -323,33 +323,71 @@ bool pkgCacheGenerator::MergeFileProvides(ListParser &List) return true; } /*}}}*/ +// CacheGenerator::NewGroup - Add a new group /*{{{*/ +// --------------------------------------------------------------------- +/* This creates a new group structure and adds it to the hash table */ +bool pkgCacheGenerator::NewGroup(pkgCache::GrpIterator &Grp, const string &Name) { + Grp = Cache.FindGrp(Name); + if (Grp.end() == false) + return true; + + // Get a structure + unsigned long const Group = Map.Allocate(sizeof(pkgCache::Group)); + if (unlikely(Group == 0)) + return false; + + Grp = pkgCache::GrpIterator(Cache, Cache.GrpP + Group); + Grp->Name = Map.WriteString(Name); + if (unlikely(Grp->Name == 0)) + return false; + + // Insert it into the hash table + unsigned long const Hash = Cache.Hash(Name); + Grp->Next = Cache.HeaderP->GrpHashTable[Hash]; + Cache.HeaderP->GrpHashTable[Hash] = Group; + + Cache.HeaderP->GroupCount++; + + return true; +} + /*}}}*/ // CacheGenerator::NewPackage - Add a new package /*{{{*/ // --------------------------------------------------------------------- /* This creates a new package structure and adds it to the hash table */ -bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name) -{ - Pkg = Cache.FindPkg(Name); - if (Pkg.end() == false) - return true; +bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name, + const string &Arch) { + pkgCache::GrpIterator Grp; + if (unlikely(NewGroup(Grp, Name) == false)) + return false; + + Pkg = Grp.FindPkg(Arch); + if (Pkg.end() == false) + return true; // Get a structure - unsigned long Package = Map.Allocate(sizeof(pkgCache::Package)); - if (Package == 0) + unsigned long const Package = Map.Allocate(sizeof(pkgCache::Package)); + if (unlikely(Package == 0)) return false; - Pkg = pkgCache::PkgIterator(Cache,Cache.PkgP + Package); - + // Insert it into the hash table - unsigned long Hash = Cache.Hash(Name); - Pkg->NextPackage = Cache.HeaderP->HashTable[Hash]; - Cache.HeaderP->HashTable[Hash] = Package; - - // Set the name and the ID - Pkg->Name = Map.WriteString(Name); - if (Pkg->Name == 0) + unsigned long const Hash = Cache.Hash(Name); + Pkg->NextPackage = Cache.HeaderP->PkgHashTable[Hash]; + Cache.HeaderP->PkgHashTable[Hash] = Package; + + // remember the packages in the group + Grp->FirstPackage = Package; + if (Grp->LastPackage == 0) + Grp->LastPackage = Package; + + // Set the name, arch and the ID + Pkg->Name = Grp->Name; + Pkg->Group = Grp.Index(); + Pkg->Arch = WriteUniqString(Arch.c_str()); + if (unlikely(Pkg->Arch == 0)) return false; Pkg->ID = Cache.HeaderP->PackageCount++; - + return true; } /*}}}*/ @@ -474,6 +512,7 @@ map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc, version and to the package that it is pointing to. */ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, const string &PackageName, + const string &Arch, const string &Version, unsigned int Op, unsigned int Type) @@ -481,8 +520,8 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, pkgCache &Cache = Owner->Cache; // Get a structure - unsigned long Dependency = Owner->Map.Allocate(sizeof(pkgCache::Dependency)); - if (Dependency == 0) + unsigned long const Dependency = Owner->Map.Allocate(sizeof(pkgCache::Dependency)); + if (unlikely(Dependency == 0)) return false; // Fill it in @@ -492,11 +531,17 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, Dep->CompareOp = Op; Dep->ID = Cache.HeaderP->DependsCount++; - // Locate the target package - pkgCache::PkgIterator Pkg; - if (Owner->NewPackage(Pkg,PackageName) == false) + pkgCache::GrpIterator Grp; + if (unlikely(Owner->NewGroup(Grp, PackageName) == false)) return false; - + + // Locate the target package + pkgCache::PkgIterator Pkg = Grp.FindPkg(Arch); + if (Pkg.end() == true) { + if (unlikely(Owner->NewPackage(Pkg, PackageName, Arch) == false)) + return false; + } + // Probe the reverse dependency list for a version string that matches if (Version.empty() == false) { @@ -504,7 +549,7 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, if (I->Version != 0 && I.TargetVer() == Version) Dep->Version = I->Version;*/ if (Dep->Version == 0) - if ((Dep->Version = WriteString(Version)) == 0) + if (unlikely((Dep->Version = WriteString(Version)) == 0)) return false; } @@ -524,7 +569,7 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, } // Is it a file dependency? - if (PackageName[0] == '/') + if (unlikely(PackageName[0] == '/')) FoundFileDeps = true; Dep->NextDepends = *OldDepLast; @@ -544,12 +589,12 @@ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver, pkgCache &Cache = Owner->Cache; // We do not add self referencing provides - if (Ver.ParentPkg().Name() == PackageName) + if (unlikely(Ver.ParentPkg().Name() == PackageName)) return true; // Get a structure - unsigned long Provides = Owner->Map.Allocate(sizeof(pkgCache::Provides)); - if (Provides == 0) + unsigned long const Provides = Owner->Map.Allocate(sizeof(pkgCache::Provides)); + if (unlikely(Provides == 0)) return false; Cache.HeaderP->ProvidesCount++; @@ -558,12 +603,12 @@ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver, Prv->Version = Ver.Index(); Prv->NextPkgProv = Ver->ProvidesList; Ver->ProvidesList = Prv.Index(); - if (Version.empty() == false && (Prv->ProvideVersion = WriteString(Version)) == 0) + if (Version.empty() == false && unlikely((Prv->ProvideVersion = WriteString(Version)) == 0)) return false; // Locate the target package pkgCache::PkgIterator Pkg; - if (Owner->NewPackage(Pkg,PackageName) == false) + if (unlikely(Owner->NewPackage(Pkg,PackageName,string(Ver.Arch())) == false)) return false; // Link it to the package diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index 108b34207..4a2419b24 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -51,7 +51,8 @@ class pkgCacheGenerator /*{{{*/ // Flag file dependencies bool FoundFileDeps; - bool NewPackage(pkgCache::PkgIterator &Pkg,const string &PkgName); + bool NewGroup(pkgCache::GrpIterator &Grp,const string &Name); + bool NewPackage(pkgCache::PkgIterator &Pkg,const string &Name, const string &Arch); bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List); bool NewFileDesc(pkgCache::DescIterator &Desc,ListParser &List); unsigned long NewVersion(pkgCache::VerIterator &Ver,const string &VerStr,unsigned long Next); @@ -96,7 +97,7 @@ class pkgCacheGenerator::ListParser inline unsigned long WriteUniqString(const char *S,unsigned int Size) {return Owner->WriteUniqString(S,Size);}; inline unsigned long WriteString(const string &S) {return Owner->Map.WriteString(S);}; inline unsigned long WriteString(const char *S,unsigned int Size) {return Owner->Map.WriteString(S,Size);}; - bool NewDepends(pkgCache::VerIterator Ver,const string &Package, + bool NewDepends(pkgCache::VerIterator Ver,const string &Package, const string &Arch, const string &Version,unsigned int Op, unsigned int Type); bool NewProvides(pkgCache::VerIterator Ver,const string &Package, @@ -106,6 +107,7 @@ class pkgCacheGenerator::ListParser // These all operate against the current section virtual string Package() = 0; + virtual string Architecture() = 0; virtual string Version() = 0; virtual bool NewVersion(pkgCache::VerIterator Ver) = 0; virtual string Description() = 0; -- cgit v1.2.3 From bfbf474475649ee7c9b36b2f1c92d33e071dfef2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 22 Dec 2009 10:01:18 +0100 Subject: buildlib/libversion.mak: fix compat file for ubuntu version --- buildlib/libversion.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildlib/libversion.mak b/buildlib/libversion.mak index 26ca86ced..5585ab487 100644 --- a/buildlib/libversion.mak +++ b/buildlib/libversion.mak @@ -18,4 +18,4 @@ LIBAPTINST_MINOR=$(shell egrep '^MINOR=' $(BASE)/apt-inst/makefile |cut -d '=' - # want to drop this, but this a ABI break. # And we don't want to do this now. So we hardcode a value here, # and drop it later on (hopefully as fast as possible). -LIBEXT=-libc6.9-6 +LIBEXT=-libc6.10-6 -- cgit v1.2.3 From 7ec263803c488d90cc72ce46d04d9f5923aa093d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 22 Dec 2009 10:11:50 +0100 Subject: releasing version 0.7.25ubuntu1 --- configure.in | 2 +- debian/changelog | 4 +- debian/copyright | 151 ++++++------------------------------------------------- 3 files changed, 19 insertions(+), 138 deletions(-) diff --git a/configure.in b/configure.in index fe30d4ca1..07a495bac 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.25") +AC_DEFINE_UNQUOTED(VERSION,"0.7.25ubuntu1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 6fb5d6a15..e6afafe99 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -apt (0.7.25ubuntu1) UNRELEASED; urgency=low +apt (0.7.25ubuntu1) lucid; urgency=low * Merged from the mvo branch * merged from the lp:~mvo/apt/history branch - -- Michael Vogt Fri, 18 Dec 2009 17:01:25 +0100 + -- Michael Vogt Tue, 22 Dec 2009 09:44:08 +0100 apt (0.7.25) unstable; urgency=low diff --git a/debian/copyright b/debian/copyright index 3baf9ac5a..c0e89b51a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,142 +1,23 @@ Apt is copyright 1997, 1998, 1999 Jason Gunthorpe and others. +Apt is currently developed by APT Development Team . -Apt is licensed under the terms of the GNU General Public License (GPL), -version 2.0 or later, as published by the Free Software Foundation. See -the file COPYING.GPL [included], /usr/share/common-licenses/GPL, or - for the terms of the latest version -of the GNU General Public License. - -In addition, prior to November 15th, 2000, apt may be distributed under -terms identical to the above with the following addition: - -Works using apt may link against the GUI library "libqt", copyright by -Troll Tech AS, Norway, provided that: - -1. The version of "libqt" is licensed under the terms of the "Qt Free Edition - License" published by Troll Tech AS. The license terms identified as - the Qt Free Edition License below are the only such terms under which - distribution of works derived from both apt and "libqt" are permitted; - -and - -2. The source code of the version of "libqt" used is - - a) Distributed with the binary version; - - or - - b) Downloadable by anyone, without fee, using a publicly-announced - URL on the Internet, for a duration of at least three years - starting with distribution of the binary version. - -On and after November 15th, 2000, the above additional terms lose all -force, and apt will be licensed only under the terms of the GNU General -Public License, version 2.0 or later. - - _______________________________________________________________ - -The following text, up to the text of the Qt Free Edition License, is -informational and not part of the license terms on apt. - -Modifications to apt in either source or compiled form must be licensed -under the terms of the GNU General Public License, version 2.0 (or later), -but need not include the above clause permitting usage of the "libqt" -library under the Qt Free Edition License. Note that removal of this -clause will result in software which is not licensed for binary -redistribution linked against software governed by the Qt Free Edition -License. In the event that a version of "libqt" is released that is -licensed under terms that do not conflict with the GPL, the additional -clause above is not required to grant permission for distribution of works -that are derived from both apt and "libqt". - -No part of apt is licensed under the Qt Free Edition License. The terms -below are provided to help identify the circumstances under which the -"libqt" library may be used with apt (or a work derived from both). The -terms below are copied from the LICENSE file of the qt-1.44 distribution, -as of November 10th, 1999. - - _______________________________________________________________ - - QT FREE EDITION LICENSE +License: GPLv2+ -Copyright (C) 1992-1999 Troll Tech AS. All rights reserved. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. -This is the license for Qt Free Edition version 1.44; it covers private use, -use of third-party application programs based on Qt, and development of -free software for the free software community. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - COPYRIGHT AND RESTRICTIONS - -The Qt toolkit is a product of Troll Tech AS. The Qt Free Edition is limited -to use with the X Window System. - -You may copy this version of the Qt Free Edition provided that the entire -archive is distributed unchanged and as a whole, including this notice. - -You may use this version of the Qt Free Edition to compile, link and run -application programs legally developed by third parties. - -You may use the Qt Free Edition to create application programs -provided that: - - You accept this license. - Your software does not require modifications to Qt Free Edition. - You satisfy ONE of the following three requirements - EITHER - Users of your software can freely obtain source code for the - software, freely modify the source code (possibly with - restrictions on copyright notices, attributions and legal - responsibility), and freely redistribute original or modified - versions of the software. - OR - Your software is distributed under the GNU GENERAL - PUBLIC LICENSE, version 2 or later, as defined by the - Free Software Foundation. - OR - Your software is distributed under the GNU LIBRARY - GENERAL PUBLIC LICENSE, version 2 or later, as - defined by the Free Software Foundation. - -If you are paid to develop something with Qt Free Edition or it is a part of -your job the following conditions also apply: - - Your software must not require libraries, programs, data or - documentation that are not available outside your organization in - order to compile or use. - If and when your organization starts using the software, you must - notify Troll Tech AS of the following: - Your organization's name and purpose. - The software's name and purpose. - The software's license. - That your organization considers the software to be free - software. - -You may also use the Qt Free Edition to create reusable components -(such as libraries) provided that you accept the terms above, and in -addition that: - - Your components' license includes the following text: - - [Your package] requires the Qt library, which is - copyright Troll Tech AS. Freely distributable - programs may generally use Qt Free Edition free of - charge, see [README.QT] for details. - - README.QT is distributed along with your components. - Qt Free Edition is not distributed as an integral part of your - components. - - LIMITATIONS OF LIABILITY - -Troll Tech AS makes no obligation under this license to support or -upgrade Qt Free Edition, or assist in the use of Qt Free Edition. - -In no event shall Troll Tech AS be liable for any lost revenue or profits or -other direct, indirect, special, incidental or consequential damages, even -if Troll Tech has been advised of the possibility of such damages. +See /usr/share/common-licenses/GPL-2, or + for the terms of the latest version +of the GNU General Public License. -QT FREE EDITION IS PROVIDED AS IS WITH NO WARRANTY OF ANY KIND, -INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE. - _______________________________________________________________ -- cgit v1.2.3 From 5dd4c8b811d9c7bc33e50254811f5bc0fc37f872 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 23 Dec 2009 12:38:19 +0100 Subject: merge Goswin Brederlow "support download of index files for different archs" patch which includes the following big changes: - Declare the unused [vendor] field in sources.list as option field, e.g. deb [arch=amd64,i386 lang=en_GB have=fun] http://example.org - When fetching index files download them for all APT::Architectures (overrideable with the options field above) - Allow all architectures of APT::Architectures to be in the Cache - Add the architecture to status and progress informations - Add b= (Binary architecture) to policy This commit doesn't incude the "pin-hack" as the Group structure will take care of this (and does it already to some extend). --- apt-pkg/aptconfiguration.cc | 25 ++++ apt-pkg/aptconfiguration.h | 16 +++ apt-pkg/cdrom.cc | 34 ++--- apt-pkg/clean.cc | 6 +- apt-pkg/contrib/strutl.cc | 17 +++ apt-pkg/contrib/strutl.h | 1 + apt-pkg/deb/debindexfile.cc | 15 ++- apt-pkg/deb/debindexfile.h | 4 +- apt-pkg/deb/deblistparser.cc | 57 ++++++--- apt-pkg/deb/deblistparser.h | 2 +- apt-pkg/deb/debmetaindex.cc | 292 +++++++++++++++++++++++++++---------------- apt-pkg/deb/debmetaindex.h | 28 +++-- apt-pkg/metaindex.h | 4 +- apt-pkg/pkgcache.cc | 8 +- apt-pkg/sourcelist.cc | 81 ++++++------ apt-pkg/sourcelist.h | 8 +- apt-pkg/versionmatch.cc | 8 +- apt-pkg/versionmatch.h | 2 + 18 files changed, 394 insertions(+), 214 deletions(-) diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 899004d9f..1ec526646 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -223,4 +224,28 @@ std::vector const Configuration::getLanguages(bool const &All, return codes; } /*}}}*/ +// getArchitectures - Return Vector of prefered Architectures /*{{{*/ +std::vector const Configuration::getArchitectures(bool const &Cached) { + using std::string; + + std::vector static archs; + if (likely(Cached == true) && archs.empty() == false) + return archs; + + string const arch = _config->Find("APT::Architecture"); + archs = _config->FindVector("APT::Architectures"); + if (archs.empty() == true || + std::find(archs.begin(), archs.end(), arch) == archs.end()) + archs.push_back(arch); + return archs; +} + /*}}}*/ +// checkArchitecture - are we interested in the given Architecture? /*{{{*/ +bool const Configuration::checkArchitecture(std::string const &Arch) { + if (Arch == "all") + return true; + std::vector const archs = getArchitectures(true); + return (std::find(archs.begin(), archs.end(), Arch) != archs.end()); +} + /*}}}*/ } diff --git a/apt-pkg/aptconfiguration.h b/apt-pkg/aptconfiguration.h index f2f04a39b..b6650e20c 100644 --- a/apt-pkg/aptconfiguration.h +++ b/apt-pkg/aptconfiguration.h @@ -66,6 +66,22 @@ public: /*{{{*/ std::vector static const getLanguages(bool const &All = false, bool const &Cached = true, char const * const Locale = 0); + /** \brief Returns a vector of Architectures we support + * + * \param Cached saves the result so we need to calculated it only once + * this parameter should ony be used for testing purposes. + * + * \return a vector of Architectures in prefered order + */ + std::vector static const getArchitectures(bool const &Cached = true); + + /** \brief Are we interested in the given Architecture? + * + * \param Arch we want to check + * \return true if we are interested, false otherwise + */ + bool static const checkArchitecture(std::string const &Arch); + /*}}}*/ }; /*}}}*/ diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 72d8e4d41..271bca409 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -6,6 +6,8 @@ #include #include #include +#include + #include #include #include @@ -216,33 +218,23 @@ int pkgCdrom::Score(string Path) /* Here we drop everything that is not this machines arch */ bool pkgCdrom::DropBinaryArch(vector &List) { - char S[300]; - snprintf(S,sizeof(S),"/binary-%s/", - _config->Find("Apt::Architecture").c_str()); - + for (unsigned int I = 0; I < List.size(); I++) { const char *Str = List[I].c_str(); - - const char *Res; - if ((Res = strstr(Str,"/binary-")) == 0) + const char *Start, *End; + if ((Start = strstr(Str,"/binary-")) == 0) continue; - // Weird, remove it. - if (strlen(Res) < strlen(S)) - { - List.erase(List.begin() + I); - I--; - continue; - } - - // See if it is our arch - if (stringcmp(Res,Res + strlen(S),S) == 0) - continue; - - // Erase it + // Between Start and End is the architecture + Start += 8; + if ((End = strstr(Start,"/")) != 0 && Start != End && + APT::Configuration::checkArchitecture(string(Start, --End)) == true) + continue; // okay, architecture is accepted + + // not accepted -> Erase it List.erase(List.begin() + I); - I--; + --I; // the next entry is at the same index after the erase } return true; diff --git a/apt-pkg/clean.cc b/apt-pkg/clean.cc index 0d1dfbf74..629afd7cf 100644 --- a/apt-pkg/clean.cc +++ b/apt-pkg/clean.cc @@ -12,6 +12,7 @@ #include #include #include +#include #include @@ -26,7 +27,6 @@ bool pkgArchiveCleaner::Go(string Dir,pkgCache &Cache) { bool CleanInstalled = _config->FindB("APT::Clean-Installed",true); - string MyArch = _config->Find("APT::Architecture"); DIR *D = opendir(Dir.c_str()); if (D == 0) @@ -75,9 +75,9 @@ bool pkgArchiveCleaner::Go(string Dir,pkgCache &Cache) for (I = Start; *I != 0 && *I != '.' ;I++); if (*I != '.') continue; - string Arch = DeQuoteString(string(Start,I-Start)); + string const Arch = DeQuoteString(string(Start,I-Start)); - if (Arch != "all" && Arch != MyArch) + if (APT::Configuration::checkArchitecture(Arch) == false) continue; // Lookup the package diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 4c05f2df8..bed51881f 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -983,6 +983,23 @@ bool TokSplitString(char Tok,char *Input,char **List, return true; } /*}}}*/ +// ExplodeString - Split a string up into a vector /*{{{*/ +// --------------------------------------------------------------------- +/* This can be used to split a given string up into a vector, so the + propose is the same as in the method above and this one is a bit slower + also, but the advantage is that we an iteratable vector */ +vector ExplodeString(string const &haystack, char const &split) { + string::const_iterator start = haystack.begin(); + string::const_iterator end = start; + vector exploded; + do { + for (; end != haystack.end() && *end != split; ++end); + exploded.push_back(string(start, end)); + start = end; + } while (end != haystack.end() && (++end) != haystack.end()); + return exploded; +} + /*}}}*/ // RegexChoice - Simple regex list/list matcher /*{{{*/ // --------------------------------------------------------------------- /* */ diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index 2b2e147fb..3bdb65b4d 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -59,6 +59,7 @@ bool StrToNum(const char *Str,unsigned long &Res,unsigned Len,unsigned Base = 0) bool Hex2Num(const string &Str,unsigned char *Num,unsigned int Length); bool TokSplitString(char Tok,char *Input,char **List, unsigned long ListMax); +vector ExplodeString(string const &haystack, char const &split=','); void ioprintf(ostream &out,const char *format,...) APT_FORMAT2; void strprintf(string &out,const char *format,...) APT_FORMAT2; char *safe_snprintf(char *Buffer,char *End,const char *Format,...) APT_FORMAT3; diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index 5beb83665..73d72c729 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -149,9 +149,12 @@ unsigned long debSourcesIndex::Size() const // PackagesIndex::debPackagesIndex - Contructor /*{{{*/ // --------------------------------------------------------------------- /* */ -debPackagesIndex::debPackagesIndex(string URI,string Dist,string Section,bool Trusted) : - pkgIndexFile(Trusted), URI(URI), Dist(Dist), Section(Section) +debPackagesIndex::debPackagesIndex(string const &URI, string const &Dist, string const &Section, + bool const &Trusted, string const &Arch) : + pkgIndexFile(Trusted), URI(URI), Dist(Dist), Section(Section), Architecture(Arch) { + if (Architecture == "native") + Architecture = _config->Find("APT::Architecture"); } /*}}}*/ // PackagesIndex::ArchiveInfo - Short version of the archive url /*{{{*/ @@ -171,6 +174,8 @@ string debPackagesIndex::ArchiveInfo(pkgCache::VerIterator Ver) const Res += " "; Res += Ver.ParentPkg().Name(); Res += " "; + Res += Ver.Arch(); + Res += " "; Res += Ver.VerStr(); return Res; } @@ -204,6 +209,8 @@ string debPackagesIndex::Info(const char *Type) const else Info += Dist + '/' + Section; Info += " "; + Info += Architecture; + Info += " "; Info += Type; return Info; } @@ -227,7 +234,7 @@ string debPackagesIndex::IndexURI(const char *Type) const } else Res = URI + "dists/" + Dist + '/' + Section + - "/binary-" + _config->Find("APT::Architecture") + '/'; + "/binary-" + Architecture + '/'; Res += Type; return Res; @@ -259,7 +266,7 @@ bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const { string PackageFile = IndexFile("Packages"); FileFd Pkg(PackageFile,FileFd::ReadOnly); - debListParser Parser(&Pkg); + debListParser Parser(&Pkg, Architecture); if (_error->PendingError() == true) return _error->Error("Problem opening %s",PackageFile.c_str()); diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h index c0e8d7d8e..766e8b214 100644 --- a/apt-pkg/deb/debindexfile.h +++ b/apt-pkg/deb/debindexfile.h @@ -46,6 +46,7 @@ class debPackagesIndex : public pkgIndexFile string URI; string Dist; string Section; + string Architecture; string Info(const char *Type) const; string IndexFile(const char *Type) const; @@ -69,7 +70,8 @@ class debPackagesIndex : public pkgIndexFile virtual bool Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const; virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const; - debPackagesIndex(string URI,string Dist,string Section,bool Trusted); + debPackagesIndex(string const &URI, string const &Dist, string const &Section, + bool const &Trusted, string const &Arch = "native"); }; class debTranslationsIndex : public pkgIndexFile diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index fe68aec0b..b57eca813 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -32,10 +32,13 @@ static debListParser::WordList PrioList[] = {{"important",pkgCache::State::Impor // ListParser::debListParser - Constructor /*{{{*/ // --------------------------------------------------------------------- -/* */ -debListParser::debListParser(FileFd *File) : Tags(File) -{ - Arch = _config->Find("APT::architecture"); +/* Provide an architecture and only this one and "all" will be accepted + in Step(), if no Architecture is given we will accept every arch + we would accept in general with checkArchitecture() */ +debListParser::debListParser(FileFd *File, string const &Arch) : Tags(File), + Arch(Arch) { + if (Arch == "native") + this->Arch = _config->Find("APT::Architecture"); } /*}}}*/ // ListParser::UniqFindTagWrite - Find the tag and write a unq string /*{{{*/ @@ -64,13 +67,19 @@ string debListParser::Package() { // --------------------------------------------------------------------- /* This will return the Architecture of the package this section describes Note that architecture "all" packages will get the architecture of the - Packages file parsed here */ + Packages file parsed here. */ string debListParser::Architecture() { string const Result = Section.FindS("Architecture"); - if (Result.empty() == true) - return Arch; - if (Result == "all") - return Arch; + if (Result.empty() == true || Result == "all") { + if (Arch.empty() == true) + /* FIXME: this is a problem for installed arch all + packages as we don't know from which arch this + package was installed - and therefore which + dependency this package resolves. */ + return _config->Find("APT::Architecture"); + else + return Arch; + } return Result; } /*}}}*/ @@ -199,8 +208,12 @@ bool debListParser::UsePackage(pkgCache::PkgIterator Pkg, { if (Pkg->Section == 0) Pkg->Section = UniqFindTagWrite("Section"); - if (Section.FindFlag("Essential",Pkg->Flags,pkgCache::Flag::Essential) == false) - return false; + + // Packages which are not from "our" arch doesn't get the essential flag + string const static myArch = _config->Find("APT::Architecture"); + if (Pkg->Arch != 0 && myArch == Pkg.Arch()) + if (Section.FindFlag("Essential",Pkg->Flags,pkgCache::Flag::Essential) == false) + return false; if (Section.FindFlag("Important",Pkg->Flags,pkgCache::Flag::Important) == false) return false; @@ -630,17 +643,23 @@ bool debListParser::Step() /* See if this is the correct Architecture, if it isn't then we drop the whole section. A missing arch tag only happens (in theory) inside the Status file, so that is a positive return */ - const char *Start; - const char *Stop; - if (Section.Find("Architecture",Start,Stop) == false) + string const Architecture = Section.FindS("Architecture"); + if (Architecture.empty() == true) return true; - //FIXME: Accept different Architectures here - if (stringcmp(Arch,Start,Stop) == 0) - return true; + if (Arch.empty() == true) + { + if (APT::Configuration::checkArchitecture(Architecture) == true) + return true; + } + else + { + if (Architecture == Arch) + return true; - if (stringcmp(Start,Stop,"all") == 0) - return true; + if (Architecture == "all") + return true; + } iOffset = Tags.Offset(); } diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 5f91e073e..cba4f8e5d 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -69,7 +69,7 @@ class debListParser : public pkgCacheGenerator::ListParser bool const &StripMultiArch = false); static const char *ConvertRelation(const char *I,unsigned int &Op); - debListParser(FileFd *File); + debListParser(FileFd *File, string const &Arch = ""); }; #endif diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index 8f28f053b..eb01a0156 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -8,9 +8,11 @@ #include #include +#include + using namespace std; -string debReleaseIndex::Info(const char *Type, const string Section) const +string debReleaseIndex::Info(const char *Type, string const &Section, string const &Arch) const { string Info = ::URI::SiteOnly(URI) + ' '; if (Dist[Dist.size() - 1] == '/') @@ -19,7 +21,11 @@ string debReleaseIndex::Info(const char *Type, const string Section) const Info += Dist; } else - Info += Dist + '/' + Section; + { + Info += Dist + '/' + Section; + if (Arch.empty() == true) + Info += " " + Arch; + } Info += " "; Info += Type; return Info; @@ -61,16 +67,21 @@ string debReleaseIndex::MetaIndexURI(const char *Type) const return Res; } -string debReleaseIndex::IndexURISuffix(const char *Type, const string Section) const +string debReleaseIndex::IndexURISuffix(const char *Type, string const &Section, string const &Arch) const { string Res =""; if (Dist[Dist.size() - 1] != '/') - Res += Section + "/binary-" + _config->Find("APT::Architecture") + '/'; + { + if (Arch == "native") + Res += Section + "/binary-" + _config->Find("APT::Architecture") + '/'; + else + Res += Section + "/binary-" + Arch + '/'; + } return Res + Type; } -string debReleaseIndex::IndexURI(const char *Type, const string Section) const +string debReleaseIndex::IndexURI(const char *Type, string const &Section, string const &Arch) const { if (Dist[Dist.size() - 1] == '/') { @@ -82,10 +93,10 @@ string debReleaseIndex::IndexURI(const char *Type, const string Section) const return Res + Type; } else - return URI + "dists/" + Dist + '/' + IndexURISuffix(Type, Section); + return URI + "dists/" + Dist + '/' + IndexURISuffix(Type, Section, Arch); } -string debReleaseIndex::SourceIndexURISuffix(const char *Type, const string Section) const +string debReleaseIndex::SourceIndexURISuffix(const char *Type, const string &Section) const { string Res =""; if (Dist[Dist.size() - 1] != '/') @@ -93,7 +104,7 @@ string debReleaseIndex::SourceIndexURISuffix(const char *Type, const string Sect return Res + Type; } -string debReleaseIndex::SourceIndexURI(const char *Type, const string Section) const +string debReleaseIndex::SourceIndexURI(const char *Type, const string &Section) const { string Res; if (Dist[Dist.size() - 1] == '/') @@ -108,44 +119,61 @@ string debReleaseIndex::SourceIndexURI(const char *Type, const string Section) c return URI + "dists/" + Dist + "/" + SourceIndexURISuffix(Type, Section); } -debReleaseIndex::debReleaseIndex(string URI,string Dist) -{ - this->URI = URI; - this->Dist = Dist; - this->Indexes = NULL; - this->Type = "deb"; +debReleaseIndex::debReleaseIndex(string const &URI, string const &Dist) { + this->URI = URI; + this->Dist = Dist; + this->Indexes = NULL; + this->Type = "deb"; } -debReleaseIndex::~debReleaseIndex() -{ - for (vector::const_iterator I = SectionEntries.begin(); - I != SectionEntries.end(); I++) - delete *I; +debReleaseIndex::~debReleaseIndex() { + for (map >::const_iterator A = ArchEntries.begin(); + A != ArchEntries.end(); ++A) + for (vector::const_iterator S = A->second.begin(); + S != A->second.end(); ++S) + delete *S; } -vector * debReleaseIndex::ComputeIndexTargets() const -{ - vector * IndexTargets = new vector ; - for (vector ::const_iterator I = SectionEntries.begin(); - I != SectionEntries.end(); - I++) - { - IndexTarget * Target = new IndexTarget(); - Target->ShortDesc = (*I)->IsSrc ? "Sources" : "Packages"; - Target->MetaKey - = (*I)->IsSrc ? SourceIndexURISuffix(Target->ShortDesc.c_str(), (*I)->Section) - : IndexURISuffix(Target->ShortDesc.c_str(), (*I)->Section); - Target->URI - = (*I)->IsSrc ? SourceIndexURI(Target->ShortDesc.c_str(), (*I)->Section) - : IndexURI(Target->ShortDesc.c_str(), (*I)->Section); - - Target->Description = Info (Target->ShortDesc.c_str(), (*I)->Section); - IndexTargets->push_back (Target); - } - return IndexTargets; +vector * debReleaseIndex::ComputeIndexTargets() const { + vector * IndexTargets = new vector ; + + map >::const_iterator const src = ArchEntries.find("source"); + if (src != ArchEntries.end()) { + vector const SectionEntries = src->second; + for (vector::const_iterator I = SectionEntries.begin(); + I != SectionEntries.end(); ++I) { + IndexTarget * Target = new IndexTarget(); + Target->ShortDesc = "Sources"; + Target->MetaKey = SourceIndexURISuffix(Target->ShortDesc.c_str(), (*I)->Section); + Target->URI = SourceIndexURI(Target->ShortDesc.c_str(), (*I)->Section); + Target->Description = Info (Target->ShortDesc.c_str(), (*I)->Section); + IndexTargets->push_back (Target); + } + } + + // Only source release + if (IndexTargets->empty() == false && ArchEntries.size() == 1) + return IndexTargets; + + for (map >::const_iterator a = ArchEntries.begin(); + a != ArchEntries.end(); ++a) { + if (a->first == "source") + continue; + for (vector ::const_iterator I = a->second.begin(); + I != a->second.end(); ++I) { + IndexTarget * Target = new IndexTarget(); + Target->ShortDesc = "Packages"; + Target->MetaKey = IndexURISuffix(Target->ShortDesc.c_str(), (*I)->Section, a->first); + Target->URI = IndexURI(Target->ShortDesc.c_str(), (*I)->Section, a->first); + Target->Description = Info (Target->ShortDesc.c_str(), (*I)->Section, a->first); + IndexTargets->push_back (Target); + } + } + + return IndexTargets; } /*}}}*/ -bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool GetAll) const +bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll) const { // special case for --print-uris if (GetAll) { @@ -170,23 +198,27 @@ bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool GetAll) const ComputeIndexTargets(), new indexRecords (Dist)); - // Queue the translations - std::vector const lang = APT::Configuration::getLanguages(true); - for (vector::const_iterator I = SectionEntries.begin(); - I != SectionEntries.end(); I++) { - - if((*I)->IsSrc) - continue; - - for (vector::const_iterator l = lang.begin(); - l != lang.end(); l++) - { - debTranslationsIndex i = debTranslationsIndex(URI,Dist,(*I)->Section,(*l).c_str()); - i.GetIndexes(Owner); - } - } - - return true; + // Queue the translations + std::vector const lang = APT::Configuration::getLanguages(true); + map > sections; + for (map >::const_iterator a = ArchEntries.begin(); + a != ArchEntries.end(); ++a) { + if (a->first == "source") + continue; + for (vector::const_iterator I = a->second.begin(); + I != a->second.end(); I++) + sections[(*I)->Section].insert(lang.begin(), lang.end()); + } + + for (map >::const_iterator s = sections.begin(); + s != sections.end(); ++s) + for (set::const_iterator l = s->second.begin(); + l != s->second.end(); l++) { + debTranslationsIndex i = debTranslationsIndex(URI,Dist,s->first,(*l).c_str()); + i.GetIndexes(Owner); + } + + return true; } bool debReleaseIndex::IsTrusted() const @@ -203,71 +235,111 @@ bool debReleaseIndex::IsTrusted() const return false; } -vector *debReleaseIndex::GetIndexFiles() -{ - if (Indexes != NULL) - return Indexes; - - Indexes = new vector ; - std::vector const lang = APT::Configuration::getLanguages(true); - for (vector::const_iterator I = SectionEntries.begin(); - I != SectionEntries.end(); I++) { - if ((*I)->IsSrc) - Indexes->push_back(new debSourcesIndex (URI, Dist, (*I)->Section, IsTrusted())); - else - { - Indexes->push_back(new debPackagesIndex (URI, Dist, (*I)->Section, IsTrusted())); - - for (vector::const_iterator l = lang.begin(); - l != lang.end(); l++) - Indexes->push_back(new debTranslationsIndex(URI,Dist,(*I)->Section,(*l).c_str())); - } - } +vector *debReleaseIndex::GetIndexFiles() { + if (Indexes != NULL) + return Indexes; + + Indexes = new vector ; + map >::const_iterator const src = ArchEntries.find("source"); + if (src != ArchEntries.end()) { + vector const SectionEntries = src->second; + for (vector::const_iterator I = SectionEntries.begin(); + I != SectionEntries.end(); I++) + Indexes->push_back(new debSourcesIndex (URI, Dist, (*I)->Section, IsTrusted())); + } + + // Only source release + if (Indexes->empty() == false && ArchEntries.size() == 1) + return Indexes; + + std::vector const lang = APT::Configuration::getLanguages(true); + map > sections; + for (map >::const_iterator a = ArchEntries.begin(); + a != ArchEntries.end(); ++a) { + if (a->first == "source") + continue; + for (vector::const_iterator I = a->second.begin(); + I != a->second.end(); I++) { + Indexes->push_back(new debPackagesIndex (URI, Dist, (*I)->Section, IsTrusted(), a->first)); + sections[(*I)->Section].insert(lang.begin(), lang.end()); + } + } + + for (map >::const_iterator s = sections.begin(); + s != sections.end(); ++s) + for (set::const_iterator l = s->second.begin(); + l != s->second.end(); l++) + Indexes->push_back(new debTranslationsIndex(URI,Dist,s->first,(*l).c_str())); + + return Indexes; +} - return Indexes; +void debReleaseIndex::PushSectionEntry(vector const &Archs, const debSectionEntry *Entry) { + for (vector::const_iterator a = Archs.begin(); + a != Archs.end(); ++a) + ArchEntries[*a].push_back(new debSectionEntry(Entry->Section, Entry->IsSrc)); + delete Entry; } -void debReleaseIndex::PushSectionEntry(const debSectionEntry *Entry) -{ - SectionEntries.push_back(Entry); +void debReleaseIndex::PushSectionEntry(string const &Arch, const debSectionEntry *Entry) { + ArchEntries[Arch].push_back(Entry); } -debReleaseIndex::debSectionEntry::debSectionEntry (string Section, bool IsSrc): Section(Section) -{ - this->IsSrc = IsSrc; +void debReleaseIndex::PushSectionEntry(const debSectionEntry *Entry) { + if (Entry->IsSrc == true) + PushSectionEntry("source", Entry); + else { + for (map >::iterator a = ArchEntries.begin(); + a != ArchEntries.end(); ++a) { + a->second.push_back(Entry); + } + } } +debReleaseIndex::debSectionEntry::debSectionEntry (string const &Section, + bool const &IsSrc): Section(Section), IsSrc(IsSrc) +{} + class debSLTypeDebian : public pkgSourceList::Type { protected: - bool CreateItemInternal(vector &List,string URI, - string Dist,string Section, - bool IsSrc) const + bool CreateItemInternal(vector &List, string const &URI, + string const &Dist, string const &Section, + bool const &IsSrc, map const &Options) const { - for (vector::const_iterator I = List.begin(); + map::const_iterator const arch = Options.find("arch"); + vector const Archs = + (arch != Options.end()) ? ExplodeString(arch->second) : + APT::Configuration::getArchitectures(); + + for (vector::const_iterator I = List.begin(); I != List.end(); I++) { - // This check insures that there will be only one Release file - // queued for all the Packages files and Sources files it - // corresponds to. - if (strcmp((*I)->GetType(), "deb") == 0) + // We only worry about debian entries here + if (strcmp((*I)->GetType(), "deb") != 0) + continue; + + debReleaseIndex *Deb = (debReleaseIndex *) (*I); + /* This check insures that there will be only one Release file + queued for all the Packages files and Sources files it + corresponds to. */ + if (Deb->GetURI() == URI && Deb->GetDist() == Dist) { - debReleaseIndex *Deb = (debReleaseIndex *) (*I); - // This check insures that there will be only one Release file - // queued for all the Packages files and Sources files it - // corresponds to. - if (Deb->GetURI() == URI && Deb->GetDist() == Dist) - { - Deb->PushSectionEntry(new debReleaseIndex::debSectionEntry(Section, IsSrc)); - return true; - } + if (IsSrc == true) + Deb->PushSectionEntry("source", new debReleaseIndex::debSectionEntry(Section, IsSrc)); + else + Deb->PushSectionEntry(Archs, new debReleaseIndex::debSectionEntry(Section, IsSrc)); + return true; } } // No currently created Release file indexes this entry, so we create a new one. // XXX determine whether this release is trusted or not - debReleaseIndex *Deb = new debReleaseIndex(URI,Dist); - Deb->PushSectionEntry (new debReleaseIndex::debSectionEntry(Section, IsSrc)); + debReleaseIndex *Deb = new debReleaseIndex(URI, Dist); + if (IsSrc == true) + Deb->PushSectionEntry ("source", new debReleaseIndex::debSectionEntry(Section, IsSrc)); + else + Deb->PushSectionEntry (Archs, new debReleaseIndex::debSectionEntry(Section, IsSrc)); List.push_back(Deb); return true; } @@ -277,10 +349,11 @@ class debSLTypeDeb : public debSLTypeDebian { public: - bool CreateItem(vector &List,string URI, - string Dist,string Section) const + bool CreateItem(vector &List, string const &URI, + string const &Dist, string const &Section, + std::map const &Options) const { - return CreateItemInternal(List, URI, Dist, Section, false); + return CreateItemInternal(List, URI, Dist, Section, false, Options); } debSLTypeDeb() @@ -294,10 +367,11 @@ class debSLTypeDebSrc : public debSLTypeDebian { public: - bool CreateItem(vector &List,string URI, - string Dist,string Section) const + bool CreateItem(vector &List, string const &URI, + string const &Dist, string const &Section, + std::map const &Options) const { - return CreateItemInternal(List, URI, Dist, Section, true); + return CreateItemInternal(List, URI, Dist, Section, true, Options); } debSLTypeDebSrc() diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h index 8e6a1463b..360fa5419 100644 --- a/apt-pkg/deb/debmetaindex.h +++ b/apt-pkg/deb/debmetaindex.h @@ -5,40 +5,44 @@ #include #include +#include + class debReleaseIndex : public metaIndex { public: class debSectionEntry { public: - debSectionEntry (string Section, bool IsSrc); - bool IsSrc; - string Section; + debSectionEntry (string const &Section, bool const &IsSrc); + string const Section; + bool const IsSrc; }; private: - vector SectionEntries; + std::map > ArchEntries; public: - debReleaseIndex(string URI, string Dist); + debReleaseIndex(string const &URI, string const &Dist); ~debReleaseIndex(); - virtual string ArchiveURI(string File) const {return URI + File;}; - virtual bool GetIndexes(pkgAcquire *Owner, bool GetAll=false) const; + virtual string ArchiveURI(string const &File) const {return URI + File;}; + virtual bool GetIndexes(pkgAcquire *Owner, bool const &GetAll=false) const; vector * ComputeIndexTargets() const; - string Info(const char *Type, const string Section) const; + string Info(const char *Type, string const &Section, string const &Arch="") const; string MetaIndexInfo(const char *Type) const; string MetaIndexFile(const char *Types) const; string MetaIndexURI(const char *Type) const; - string IndexURI(const char *Type, const string Section) const; - string IndexURISuffix(const char *Type, const string Section) const; - string SourceIndexURI(const char *Type, const string Section) const; - string SourceIndexURISuffix(const char *Type, const string Section) const; + string IndexURI(const char *Type, string const &Section, string const &Arch="native") const; + string IndexURISuffix(const char *Type, string const &Section, string const &Arch="native") const; + string SourceIndexURI(const char *Type, const string &Section) const; + string SourceIndexURISuffix(const char *Type, const string &Section) const; virtual vector *GetIndexFiles(); virtual bool IsTrusted() const; + void PushSectionEntry(vector const &Archs, const debSectionEntry *Entry); + void PushSectionEntry(string const &Arch, const debSectionEntry *Entry); void PushSectionEntry(const debSectionEntry *Entry); }; diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h index 779b6ab14..1d2140799 100644 --- a/apt-pkg/metaindex.h +++ b/apt-pkg/metaindex.h @@ -33,8 +33,8 @@ class metaIndex virtual const char* GetType() const {return Type;} // Interface for acquire - virtual string ArchiveURI(string /*File*/) const = 0; - virtual bool GetIndexes(pkgAcquire *Owner, bool GetAll=false) const = 0; + virtual string ArchiveURI(string const& /*File*/) const = 0; + virtual bool GetIndexes(pkgAcquire *Owner, bool const &GetAll=false) const = 0; virtual vector *GetIndexFiles() = 0; virtual bool IsTrusted() const = 0; diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 2b5f53f6f..c945c59bf 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -406,7 +406,7 @@ operator<<(ostream& out, pkgCache::PkgIterator Pkg) string candidate = string(Pkg.CandVersion() == 0 ? "none" : Pkg.CandVersion()); string newest = string(Pkg.VersionList().end() ? "none" : Pkg.VersionList().VerStr()); - out << Pkg.Name() << " < " << current; + out << Pkg.Name() << " [ " << Pkg.Arch() << " ] < " << current; if (current != candidate) out << " -> " << candidate; if ( newest != "none" && candidate != newest) @@ -699,7 +699,9 @@ string pkgCache::VerIterator::RelStr() else Res += File.Site(); } - } + } + if (S->Arch != 0) + Res.append(" [").append(Arch()).append("]"); return Res; } /*}}}*/ @@ -738,6 +740,8 @@ string pkgCache::PkgFileIterator::RelStr() Res = Res + (Res.empty() == true?"l=":",l=") + Label(); if (Component() != 0) Res = Res + (Res.empty() == true?"c=":",c=") + Component(); + if (Architecture() != 0) + Res = Res + (Res.empty() == true?"b=":",b=") + Architecture(); return Res; } /*}}}*/ diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 4b3abe918..6b7a299d6 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -79,13 +79,51 @@ bool pkgSourceList::Type::FixupURI(string &URI) const Weird types may override this. */ bool pkgSourceList::Type::ParseLine(vector &List, const char *Buffer, - unsigned long CurLine, - string File) const + unsigned long const &CurLine, + string const &File) const { + for (;Buffer != 0 && isspace(*Buffer); ++Buffer); // Skip whitespaces + + // Parse option field if it exists + // e.g.: [ option1=value1 option2=value2 ] + map Options; + if (Buffer != 0 && Buffer[0] == '[') + { + ++Buffer; // ignore the [ + for (;Buffer != 0 && isspace(*Buffer); ++Buffer); // Skip whitespaces + while (*Buffer != ']') + { + // get one option, e.g. option1=value1 + string option; + if (ParseQuoteWord(Buffer,option) == false) + return _error->Error(_("Malformed line %lu in source list %s ([option] unparseable)"),CurLine,File.c_str()); + + if (option.length() < 3) + return _error->Error(_("Malformed line %lu in source list %s ([option] too short)"),CurLine,File.c_str()); + + size_t const needle = option.find('='); + if (needle == string::npos) + return _error->Error(_("Malformed line %lu in source list %s ([%s] is not an assignment)"),CurLine,File.c_str(), option.c_str()); + + string const key = string(option, 0, needle); + string const value = string(option, needle + 1, option.length()); + + if (key.empty() == true) + return _error->Error(_("Malformed line %lu in source list %s ([%s] has no key)"),CurLine,File.c_str(), option.c_str()); + + if (value.empty() == true) + return _error->Error(_("Malformed line %lu in source list %s ([%s] key %s has no value)"),CurLine,File.c_str(),option.c_str(),key.c_str()); + + Options[key] = value; + } + ++Buffer; // ignore the ] + for (;Buffer != 0 && isspace(*Buffer); ++Buffer); // Skip whitespaces + } + string URI; string Dist; - string Section; - + string Section; + if (ParseQuoteWord(Buffer,URI) == false) return _error->Error(_("Malformed line %lu in source list %s (URI)"),CurLine,File.c_str()); if (ParseQuoteWord(Buffer,Dist) == false) @@ -100,7 +138,7 @@ bool pkgSourceList::Type::ParseLine(vector &List, if (ParseQuoteWord(Buffer,Section) == true) return _error->Error(_("Malformed line %lu in source list %s (absolute dist)"),CurLine,File.c_str()); Dist = SubstVar(Dist,"$(ARCH)",_config->Find("APT::Architecture")); - return CreateItem(List,URI,Dist,Section); + return CreateItem(List, URI, Dist, Section, Options); } // Grab the rest of the dists @@ -109,7 +147,7 @@ bool pkgSourceList::Type::ParseLine(vector &List, do { - if (CreateItem(List,URI,Dist,Section) == false) + if (CreateItem(List, URI, Dist, Section, Options) == false) return false; } while (ParseQuoteWord(Buffer,Section) == true); @@ -246,36 +284,7 @@ bool pkgSourceList::ReadAppend(string File) if (Parse == 0) return _error->Error(_("Type '%s' is not known on line %u in source list %s"),LineType.c_str(),CurLine,File.c_str()); - // Vendor name specified - if (C[0] == '[') - { - string VendorID; - - if (ParseQuoteWord(C,VendorID) == false) - return _error->Error(_("Malformed line %u in source list %s (vendor id)"),CurLine,File.c_str()); - - if (VendorID.length() < 2 || VendorID.end()[-1] != ']') - return _error->Error(_("Malformed line %u in source list %s (vendor id)"),CurLine,File.c_str()); - VendorID = string(VendorID,1,VendorID.size()-2); - -// for (vector::const_iterator iter = VendorList.begin(); -// iter != VendorList.end(); iter++) -// { -// if ((*iter)->GetVendorID() == VendorID) -// { -// if (_config->FindB("Debug::sourceList", false)) -// std::cerr << "Comparing VendorID \"" << VendorID << "\" with \"" << (*iter)->GetVendorID() << '"' << std::endl; -// Verifier = *iter; -// break; -// } -// } - -// if (Verifier == 0) -// return _error->Error(_("Unknown vendor ID '%s' in line %u of source list %s"), -// VendorID.c_str(),CurLine,File.c_str()); - } - - if (Parse->ParseLine(SrcList,C,CurLine,File) == false) + if (Parse->ParseLine(SrcList, C, CurLine, File) == false) return false; } return true; diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h index b9e4389ed..e15314a5e 100644 --- a/apt-pkg/sourcelist.h +++ b/apt-pkg/sourcelist.h @@ -29,6 +29,7 @@ #include #include +#include #include #include @@ -57,9 +58,10 @@ class pkgSourceList bool FixupURI(string &URI) const; virtual bool ParseLine(vector &List, const char *Buffer, - unsigned long CurLine,string File) const; - virtual bool CreateItem(vector &List,string URI, - string Dist,string Section) const = 0; + unsigned long const &CurLine,string const &File) const; + virtual bool CreateItem(vector &List,string const &URI, + string const &Dist,string const &Section, + std::map const &Options) const = 0; Type(); virtual ~Type() {}; }; diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc index b4d1d4696..e5f0fafd2 100644 --- a/apt-pkg/versionmatch.cc +++ b/apt-pkg/versionmatch.cc @@ -100,6 +100,8 @@ pkgVersionMatch::pkgVersionMatch(string Data,MatchType Type) : Type(Type) RelLabel = Fragments[J]+2; else if (stringcasecmp(Fragments[J],Fragments[J]+2,"c=") == 0) RelComponent = Fragments[J]+2; + else if (stringcasecmp(Fragments[J],Fragments[J]+2,"b=") == 0) + RelArchitecture = Fragments[J]+2; } if (RelVerStr.end()[-1] == '*') @@ -178,7 +180,7 @@ bool pkgVersionMatch::FileMatch(pkgCache::PkgFileIterator File) if (RelVerStr.empty() == true && RelOrigin.empty() == true && RelArchive.empty() == true && RelLabel.empty() == true && RelRelease.empty() == true && RelCodename.empty() == true && - RelComponent.empty() == true) + RelComponent.empty() == true && RelArchitecture.empty() == true) return false; if (RelVerStr.empty() == false) @@ -211,6 +213,10 @@ bool pkgVersionMatch::FileMatch(pkgCache::PkgFileIterator File) if (File->Component == 0 || stringcasecmp(RelComponent,File.Component()) != 0) return false; + if (RelArchitecture.empty() == false) + if (File->Architecture == 0 || + stringcasecmp(RelArchitecture,File.Architecture()) != 0) + return false; return true; } diff --git a/apt-pkg/versionmatch.h b/apt-pkg/versionmatch.h index a8f3c84ac..a8da072ae 100644 --- a/apt-pkg/versionmatch.h +++ b/apt-pkg/versionmatch.h @@ -23,6 +23,7 @@ Codename (n=) e.g. etch, lenny, squeeze, sid Label (l=) Component (c=) + Binary Architecture (b=) If there are no equals signs in the string then it is scanned in short form - if it starts with a number it is Version otherwise it is an Archive or a Codename. @@ -55,6 +56,7 @@ class pkgVersionMatch string RelArchive; string RelLabel; string RelComponent; + string RelArchitecture; bool MatchAll; // Origin Matching -- cgit v1.2.3 From 25396fb06350344996a20d05423562f08a4165db Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 27 Dec 2009 19:39:47 +0100 Subject: Split ListParser::NewDepends into two methods to use these new method for creating the dependencies needed for our groups: For now for all groups only one package can be installed at the same time which conflicts with each other packages in the group. The exceptions are architecture all package. Also, the Multi-Arch field is now parsed, but not used for now. --- apt-pkg/cacheiterators.h | 14 ++++- apt-pkg/deb/deblistparser.cc | 24 ++++++++ apt-pkg/pkgcache.cc | 27 +++++++++ apt-pkg/pkgcache.h | 12 +++- apt-pkg/pkgcachegen.cc | 133 ++++++++++++++++++++++++++++++++----------- apt-pkg/pkgcachegen.h | 6 +- 6 files changed, 176 insertions(+), 40 deletions(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 35d3aa228..33d2ed6be 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -81,13 +81,21 @@ template class pkgCache::Iterator { different architectures can be treated as of the "same" package (apt internally treat them as totally different packages) */ class pkgCache::GrpIterator: public Iterator { + long HashIndex; + protected: inline Group* OwnerPointer() const { return Owner->GrpP; }; public: - void operator ++(int) {if (S != Owner->GrpP) S = Owner->GrpP + S->Next;}; + // This constructor is the 'begin' constructor, never use it. + inline GrpIterator(pkgCache &Owner) : Iterator(Owner), HashIndex(-1) { + S = OwnerPointer(); + operator ++(0); + }; + + virtual void operator ++(int); virtual void operator ++() {operator ++(0);}; inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;}; @@ -96,11 +104,11 @@ class pkgCache::GrpIterator: public Iterator { PkgIterator NextPkg(PkgIterator const &Pkg); // Constructors - inline GrpIterator(pkgCache &Owner, Group *Trg) : Iterator(Owner, Trg) { + inline GrpIterator(pkgCache &Owner, Group *Trg) : Iterator(Owner, Trg), HashIndex(0) { if (S == 0) S = OwnerPointer(); }; - inline GrpIterator() : Iterator() {}; + inline GrpIterator() : Iterator(), HashIndex(0) {}; }; /*}}}*/ diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index b57eca813..f683de423 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -104,6 +104,30 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver) // Parse the architecture Ver->Arch = WriteUniqString(Architecture()); + // Parse multi-arch + if (Section.FindS("Architecture") == "all") + /* Arch all packages can't have a Multi-Arch field, + but we need a special treatment for them nonetheless */ + Ver->MultiArch = pkgCache::Version::All; + else + { + string const MultiArch = Section.FindS("Multi-Arch"); + if (MultiArch.empty() == true) + Ver->MultiArch = pkgCache::Version::None; + else if (MultiArch == "same") + Ver->MultiArch = pkgCache::Version::Same; + else if (MultiArch == "foreign") + Ver->MultiArch = pkgCache::Version::Foreign; + else if (MultiArch == "allowed") + Ver->MultiArch = pkgCache::Version::Allowed; + else + { + _error->Warning("Unknown Multi-Arch type »%s« for package »%s«", + MultiArch.c_str(), Section.FindS("Package").c_str()); + Ver->MultiArch = pkgCache::Version::None; + } + } + // Archive Size Ver->Size = (unsigned)Section.FindI("Size"); diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index c945c59bf..1e4c7edb3 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -182,6 +182,16 @@ unsigned long pkgCache::sHash(const char *Str) const // Cache::FindPkg - Locate a package by name /*{{{*/ // --------------------------------------------------------------------- /* Returns 0 on error, pointer to the package otherwise */ +pkgCache::PkgIterator pkgCache::FindPkg(const string &Name) { + size_t const found = Name.find(':'); + if (found == string::npos) + return FindPkg(Name, "native"); + return FindPkg(Name.substr(0, found), Name.substr(found+1, string::npos)); +} + /*}}}*/ +// Cache::FindPkg - Locate a package by name /*{{{*/ +// --------------------------------------------------------------------- +/* Returns 0 on error, pointer to the package otherwise */ pkgCache::PkgIterator pkgCache::FindPkg(const string &Name, string Arch) { /* We make a detour via the GrpIterator here as on a multi-arch environment a group is easier to @@ -322,6 +332,23 @@ pkgCache::PkgIterator pkgCache::GrpIterator::NextPkg(pkgCache::PkgIterator const return PkgIterator(*Owner, 0); } /*}}}*/ +// GrpIterator::operator ++ - Postfix incr /*{{{*/ +// --------------------------------------------------------------------- +/* This will advance to the next logical group in the hash table. */ +void pkgCache::GrpIterator::operator ++(int) +{ + // Follow the current links + if (S != Owner->GrpP) + S = Owner->GrpP + S->Next; + + // Follow the hash table + while (S == Owner->GrpP && (HashIndex+1) < (signed)_count(Owner->HeaderP->GrpHashTable)) + { + HashIndex++; + S = Owner->GrpP + Owner->HeaderP->GrpHashTable[HashIndex]; + } +}; + /*}}}*/ // PkgIterator::operator ++ - Postfix incr /*{{{*/ // --------------------------------------------------------------------- /* This will advance to the next logical package in the hash table. */ diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index b3d2752d2..5f50001d0 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -125,9 +125,12 @@ class pkgCache /*{{{*/ // Accessors GrpIterator FindGrp(const string &Name); - PkgIterator FindPkg(const string &Name, string Arch = "native"); + PkgIterator FindPkg(const string &Name); + PkgIterator FindPkg(const string &Name, string Arch); Header &Head() {return *HeaderP;}; + inline GrpIterator GrpBegin(); + inline GrpIterator GrpEnd(); inline PkgIterator PkgBegin(); inline PkgIterator PkgEnd(); inline PkgFileIterator FileBegin(); @@ -274,7 +277,8 @@ struct pkgCache::Version /*{{{*/ map_ptrloc VerStr; // Stringtable map_ptrloc Section; // StringTable (StringItem) map_ptrloc Arch; // StringTable - + enum {None, All, Foreign, Same, Allowed} MultiArch; + // Lists map_ptrloc FileList; // VerFile map_ptrloc NextVer; // Version @@ -337,6 +341,10 @@ struct pkgCache::StringItem /*{{{*/ /*}}}*/ #include +inline pkgCache::GrpIterator pkgCache::GrpBegin() + {return GrpIterator(*this);}; +inline pkgCache::GrpIterator pkgCache::GrpEnd() + {return GrpIterator(*this,GrpP);}; inline pkgCache::PkgIterator pkgCache::PkgBegin() {return PkgIterator(*this);}; inline pkgCache::PkgIterator pkgCache::PkgEnd() diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index c37f6f48e..2a4a30349 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -38,7 +39,7 @@ typedef vector::iterator FileIterator; // CacheGenerator::pkgCacheGenerator - Constructor /*{{{*/ // --------------------------------------------------------------------- -/* We set the diry flag and make sure that is written to the disk */ +/* We set the dirty flag and make sure that is written to the disk */ pkgCacheGenerator::pkgCacheGenerator(DynamicMMap *pMap,OpProgress *Prog) : Map(*pMap), Cache(pMap,false), Progress(Prog), FoundFileDeps(0) @@ -506,21 +507,58 @@ map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc, return Description; } /*}}}*/ -// ListParser::NewDepends - Create a dependency element /*{{{*/ +// CacheGenerator::FinishCache - do various finish operations /*{{{*/ +// --------------------------------------------------------------------- +/* This prepares the Cache for delivery */ +bool pkgCacheGenerator::FinishCache(OpProgress &Progress) { + // FIXME: add progress reporting for this operation + // Do we have different architectures in your groups ? + vector archs = APT::Configuration::getArchitectures(); + if (archs.size() > 1) { + // Create Conflicts in between the group + for (pkgCache::GrpIterator G = GetCache().GrpBegin(); G.end() != true; G++) { + string const PkgName = G.Name(); + for (pkgCache::PkgIterator P = G.PackageList(); P.end() != true; P = G.NextPkg(P)) { + for (pkgCache::VerIterator V = P.VersionList(); V.end() != true; V++) { + // Arch all packages are "co-installable" + if (V->MultiArch == pkgCache::Version::All) + continue; + string const Arch = V.Arch(); + map_ptrloc *OldDepLast = NULL; + for (vector::const_iterator A = archs.begin(); A != archs.end(); ++A) { + if (*A == Arch) + continue; + /* We allow only one installed arch at the time + per group, therefore each group member conflicts + with all other group members */ + pkgCache::PkgIterator D = G.FindPkg(*A); + if (D.end() == true) + continue; + // Conflicts: ${self}:other + NewDepends(D, V, "", + pkgCache::Dep::NoOp, pkgCache::Dep::Conflicts, + OldDepLast); + } + } + } + } + } + return true; +} + /*}}}*/ +// CacheGenerator::NewDepends - Create a dependency element /*{{{*/ // --------------------------------------------------------------------- /* This creates a dependency element in the tree. It is linked to the version and to the package that it is pointing to. */ -bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, - const string &PackageName, - const string &Arch, - const string &Version, - unsigned int Op, - unsigned int Type) +bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg, + pkgCache::VerIterator &Ver, + string const &Version, + unsigned int const &Op, + unsigned int const &Type, + map_ptrloc *OldDepLast) { - pkgCache &Cache = Owner->Cache; - // Get a structure - unsigned long const Dependency = Owner->Map.Allocate(sizeof(pkgCache::Dependency)); + unsigned long const Dependency = Map.Allocate(sizeof(pkgCache::Dependency)); if (unlikely(Dependency == 0)) return false; @@ -530,17 +568,6 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, Dep->Type = Type; Dep->CompareOp = Op; Dep->ID = Cache.HeaderP->DependsCount++; - - pkgCache::GrpIterator Grp; - if (unlikely(Owner->NewGroup(Grp, PackageName) == false)) - return false; - - // Locate the target package - pkgCache::PkgIterator Pkg = Grp.FindPkg(Arch); - if (Pkg.end() == true) { - if (unlikely(Owner->NewPackage(Pkg, PackageName, Arch) == false)) - return false; - } // Probe the reverse dependency list for a version string that matches if (Version.empty() == false) @@ -549,29 +576,23 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, if (I->Version != 0 && I.TargetVer() == Version) Dep->Version = I->Version;*/ if (Dep->Version == 0) - if (unlikely((Dep->Version = WriteString(Version)) == 0)) + if (unlikely((Dep->Version = Map.WriteString(Version)) == 0)) return false; } - + // Link it to the package Dep->Package = Pkg.Index(); Dep->NextRevDepends = Pkg->RevDepends; Pkg->RevDepends = Dep.Index(); - - /* Link it to the version (at the end of the list) - Caching the old end point speeds up generation substantially */ - if (OldDepVer != Ver) + + // Do we know where to link the Dependency to? + if (OldDepLast == NULL) { OldDepLast = &Ver->DependsList; for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; D++) OldDepLast = &D->NextDepends; - OldDepVer = Ver; } - // Is it a file dependency? - if (unlikely(PackageName[0] == '/')) - FoundFileDeps = true; - Dep->NextDepends = *OldDepLast; *OldDepLast = Dep.Index(); OldDepLast = &Dep->NextDepends; @@ -579,6 +600,41 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, return true; } /*}}}*/ +// ListParser::NewDepends - Create the environment for a new dependency /*{{{*/ +// --------------------------------------------------------------------- +/* This creates a Group and the Package to link this dependency to if + needed and handles also the caching of the old endpoint */ +bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, + const string &PackageName, + const string &Arch, + const string &Version, + unsigned int Op, + unsigned int Type) +{ + pkgCache::GrpIterator Grp; + if (unlikely(Owner->NewGroup(Grp, PackageName) == false)) + return false; + + // Locate the target package + pkgCache::PkgIterator Pkg = Grp.FindPkg(Arch); + if (Pkg.end() == true) { + if (unlikely(Owner->NewPackage(Pkg, PackageName, Arch) == false)) + return false; + } + + // Is it a file dependency? + if (unlikely(PackageName[0] == '/')) + FoundFileDeps = true; + + /* Caching the old end point speeds up generation substantially */ + if (OldDepVer != Ver) { + OldDepLast = NULL; + OldDepVer = Ver; + } + + return Owner->NewDepends(Pkg, Ver, Version, Op, Type, OldDepLast); +} + /*}}}*/ // ListParser::NewProvides - Create a Provides element /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -925,6 +981,9 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, if (BuildCache(Gen,Progress,CurrentSize,TotalSize, Files.begin()+EndOfSource,Files.end()) == false) return false; + + // FIXME: move me to a better place + Gen.FinishCache(Progress); } else { @@ -965,6 +1024,9 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, if (BuildCache(Gen,Progress,CurrentSize,TotalSize, Files.begin()+EndOfSource,Files.end()) == false) return false; + + // FIXME: move me to a better place + Gen.FinishCache(Progress); } if (_error->PendingError() == true) @@ -1010,7 +1072,10 @@ bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap) if (BuildCache(Gen,Progress,CurrentSize,TotalSize, Files.begin()+EndOfSource,Files.end()) == false) return false; - + + // FIXME: move me to a better place + Gen.FinishCache(Progress); + if (_error->PendingError() == true) return false; *OutMap = Map.UnGuard(); diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index 4a2419b24..53f09b991 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -55,6 +55,9 @@ class pkgCacheGenerator /*{{{*/ bool NewPackage(pkgCache::PkgIterator &Pkg,const string &Name, const string &Arch); bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List); bool NewFileDesc(pkgCache::DescIterator &Desc,ListParser &List); + bool NewDepends(pkgCache::PkgIterator &Pkg, pkgCache::VerIterator &Ver, + string const &Version, unsigned int const &Op, + unsigned int const &Type, map_ptrloc *OldDepLast); unsigned long NewVersion(pkgCache::VerIterator &Ver,const string &VerStr,unsigned long Next); map_ptrloc NewDescription(pkgCache::DescIterator &Desc,const string &Lang,const MD5SumValue &md5sum,map_ptrloc Next); @@ -73,7 +76,8 @@ class pkgCacheGenerator /*{{{*/ bool HasFileDeps() {return FoundFileDeps;}; bool MergeFileProvides(ListParser &List); - + bool FinishCache(OpProgress &Progress); + pkgCacheGenerator(DynamicMMap *Map,OpProgress *Progress); ~pkgCacheGenerator(); }; -- cgit v1.2.3 From a29b2c0b9c4e7b1c36433c9c6dd5d24697f9c4b6 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 26 Jan 2010 11:57:29 +0100 Subject: Change history branch so that it does not break the apt ABI for the pkgPackageManager interface (can be reverted on the next ABI break) --- apt-pkg/deb/dpkgpm.cc | 34 +++++++++++++++++++++++----------- apt-pkg/deb/dpkgpm.h | 4 +--- apt-pkg/packagemanager.h | 6 +++++- debian/changelog | 8 ++++++++ 4 files changed, 37 insertions(+), 15 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 2f84a5a87..e928776af 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -562,7 +562,7 @@ void pkgDPkgPM::DoDpkgStatusFd(int statusfd, int OutStatusFd) } /*}}}*/ // DPkgPM::WriteHistoryTag /*{{{*/ -void pkgDPkgPM::WriteHistoryTag(string tag, string value) +void pkgDPkgPM::WriteHistoryTag(FILE *history_out, string tag, string value) { if (value.size() > 0) { @@ -602,7 +602,7 @@ bool pkgDPkgPM::OpenLog() _config->Find("Dir::Log::History")); if (!history_name.empty()) { - history_out = fopen(history_name.c_str(),"a"); + FILE *history_out = fopen(history_name.c_str(),"a"); chmod(history_name.c_str(), 0644); fprintf(history_out, "\nStart-Date: %s\n", timestr); string remove, purge, install, upgrade, downgrade; @@ -622,12 +622,12 @@ bool pkgDPkgPM::OpenLog() remove += I.Name() + string(" (") + Cache[I].CurVersion + string("), "); } } - WriteHistoryTag("Install", install); - WriteHistoryTag("Upgrade", upgrade); - WriteHistoryTag("Downgrade",downgrade); - WriteHistoryTag("Remove",remove); - WriteHistoryTag("Purge",purge); - fflush(history_out); + WriteHistoryTag(history_out, "Install", install); + WriteHistoryTag(history_out, "Upgrade", upgrade); + WriteHistoryTag(history_out, "Downgrade",downgrade); + WriteHistoryTag(history_out, "Remove",remove); + WriteHistoryTag(history_out, "Purge",purge); + fclose(history_out); } return true; @@ -650,10 +650,11 @@ bool pkgDPkgPM::CloseLog() } term_out = NULL; - if(history_out) + string history_name = flCombine(_config->FindDir("Dir::Log"), + _config->Find("Dir::Log::History")); + if (!history_name.empty()) { - if (dpkg_error.size() > 0) - fprintf(history_out, "Error: %s\n", dpkg_error.c_str()); + FILE *history_out = fopen(history_name.c_str(),"a"); fprintf(history_out, "End-Date: %s\n", timestr); fclose(history_out); } @@ -1125,6 +1126,7 @@ bool pkgDPkgPM::Go(int OutStatusFd) if(stopOnError) RunScripts("DPkg::Post-Invoke"); + string dpkg_error; if (WIFSIGNALED(Status) != 0 && WTERMSIG(Status) == SIGSEGV) strprintf(dpkg_error, "Sub-process %s received a segmentation fault.",Args[0]); else if (WIFEXITED(Status) != 0) @@ -1133,7 +1135,17 @@ bool pkgDPkgPM::Go(int OutStatusFd) strprintf(dpkg_error, "Sub-process %s exited unexpectedly",Args[0]); if(dpkg_error.size() > 0) + { _error->Error(dpkg_error.c_str()); + string history_name = flCombine(_config->FindDir("Dir::Log"), + _config->Find("Dir::Log::History")); + if (!history_name.empty()) + { + FILE *history_out = fopen(history_name.c_str(),"a"); + fprintf(history_out, "Error: %s\n", dpkg_error.c_str()); + fclose(history_out); + } + } if(stopOnError) { diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index ce3e20f2e..160486bf9 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -29,8 +29,6 @@ class pkgDPkgPM : public pkgPackageManager char dpkgbuf[1024]; int dpkgbuf_pos; FILE *term_out; - FILE *history_out; - string dpkg_error; protected: int pkgFailures; @@ -70,7 +68,7 @@ class pkgDPkgPM : public pkgPackageManager // Helpers bool RunScriptsWithPkgs(const char *Cnf); bool SendV2Pkgs(FILE *F); - void WriteHistoryTag(string tag, string value); + void WriteHistoryTag(FILE* history_out, string tag, string value); // apport integration void WriteApportReport(const char *pkgpath, const char *errormsg); diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h index af1476b7a..44f5d5ef7 100644 --- a/apt-pkg/packagemanager.h +++ b/apt-pkg/packagemanager.h @@ -49,7 +49,11 @@ class pkgPackageManager : protected pkgCache::Namespace bool Debug; bool DepAdd(pkgOrderList &Order,PkgIterator P,int Depth = 0); - void ImmediateAdd(PkgIterator P, bool UseInstallVer, unsigned const int &Depth = 0); + // binary-compat change, fix on next abi break + void ImmediateAdd(PkgIterator P, bool UseInstallVer) { + ImmediateAdd(P, UseInstallVer, 0); + } + void ImmediateAdd(PkgIterator P, bool UseInstallVer, unsigned const int &Depth); virtual OrderResult OrderInstall(); bool CheckRConflicts(PkgIterator Pkg,DepIterator Dep,const char *Ver); bool CreateOrderList(); diff --git a/debian/changelog b/debian/changelog index e6afafe99..9615201b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.25ubuntu2) lucid; urgency=low + + * Change history branch so that it does not break the + apt ABI for the pkgPackageManager interface + (can be reverted on the next ABI break) + + -- Michael Vogt Wed, 23 Dec 2009 10:14:16 +0100 + apt (0.7.25ubuntu1) lucid; urgency=low * Merged from the mvo branch -- cgit v1.2.3 From 844b9d125c2a0c0d4c96d8801f11cb7b8b6b1583 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 2 Feb 2010 16:57:55 -0800 Subject: debian/changelog: sync with the upload --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4647c0e24..e6417c53c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.7.25ubuntu3) UNRELEASED; urgency=low +apt (0.7.25ubuntu3) lucid; urgency=low * cmdline/apt-get.cc: - fix apt-get source pkg=version regression (closes: #561971) @@ -15,7 +15,7 @@ apt (0.7.25ubuntu3) UNRELEASED; urgency=low - add new --auto-detect option that uses libudev to figure out the cdrom/mount-point - -- Michael Vogt Wed, 27 Jan 2010 12:12:16 +0100 + -- Michael Vogt Wed, 27 Jan 2010 16:11:32 +0100 apt (0.7.25ubuntu2) lucid; urgency=low -- cgit v1.2.3 From 4df70e7528c21f948dfb7032271c499c53a21515 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 3 Feb 2010 09:42:36 -0800 Subject: * cmdline/apt-cdrom.cc: - make Acquire::cdrom::AutoDetect default, this can be turned off with "--no-auto-detect" --- cmdline/apt-cdrom.cc | 2 +- debian/changelog | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index 0c9aab28c..8b9eacae6 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -147,7 +147,7 @@ bool DoAdd(CommandLine &) pkgCdrom cdrom; bool res = true; - bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect"); + bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", true); unsigned int count = 0; if (AutoDetect && UdevCdroms.Dlopen()) diff --git a/debian/changelog b/debian/changelog index e6417c53c..a290d0389 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.25ubuntu4) lucid; urgency=low + + * cmdline/apt-cdrom.cc: + - make Acquire::cdrom::AutoDetect default, this can be + turned off with "--no-auto-detect" + + -- Michael Vogt Tue, 02 Feb 2010 16:58:59 -0800 + apt (0.7.25ubuntu3) lucid; urgency=low * cmdline/apt-get.cc: -- cgit v1.2.3 From 857e9c13d8d9808fcd1ac8ff3469f6c0b90b7fea Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 7 Feb 2010 12:38:13 +0100 Subject: Drop the Arch information from the Version structure as we can get the information from the parent package now --- apt-pkg/cacheiterators.h | 2 +- apt-pkg/deb/deblistparser.cc | 10 +++++++--- apt-pkg/deb/deblistparser.h | 1 + apt-pkg/pkgcache.cc | 4 ++-- apt-pkg/pkgcache.h | 1 - apt-pkg/pkgcachegen.h | 1 + 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 33d2ed6be..d8e044f88 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -178,7 +178,7 @@ class pkgCache::VerIterator : public Iterator { // Accessors inline const char *VerStr() const {return S->VerStr == 0?0:Owner->StrP + S->VerStr;}; inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;}; - inline const char *Arch() const {return S->Arch == 0?0:Owner->StrP + S->Arch;}; + inline const char *Arch() const {return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch;}; inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);}; inline DescIterator DescriptionList() const; diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index f683de423..26841d3d2 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -83,6 +83,13 @@ string debListParser::Architecture() { return Result; } /*}}}*/ +// ListParser::ArchitectureAll /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool debListParser::ArchitectureAll() { + return Section.FindS("Architecture") == "all"; +} + /*}}}*/ // ListParser::Version - Return the version string /*{{{*/ // --------------------------------------------------------------------- /* This is to return the string describing the version in debian form, @@ -101,9 +108,6 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver) // Parse the section Ver->Section = UniqFindTagWrite("Section"); - // Parse the architecture - Ver->Arch = WriteUniqString(Architecture()); - // Parse multi-arch if (Section.FindS("Architecture") == "all") /* Arch all packages can't have a Multi-Arch field, diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index cba4f8e5d..8da051530 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -47,6 +47,7 @@ class debListParser : public pkgCacheGenerator::ListParser // These all operate against the current section virtual string Package(); virtual string Architecture(); + virtual bool ArchitectureAll(); virtual string Version(); virtual bool NewVersion(pkgCache::VerIterator Ver); virtual string Description(); diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 1e4c7edb3..7d98869ea 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -399,7 +399,7 @@ const char * pkgCache::PkgIterator::CandVersion() const { //TargetVer is empty, so don't use it. - VerIterator version = pkgPolicy::pkgPolicy(Owner).GetCandidateVer(*this); + VerIterator version = pkgPolicy(Owner).GetCandidateVer(*this); if (version.IsGood()) return version.VerStr(); return 0; @@ -727,7 +727,7 @@ string pkgCache::VerIterator::RelStr() Res += File.Site(); } } - if (S->Arch != 0) + if (S->ParentPkg != 0) Res.append(" [").append(Arch()).append("]"); return Res; } diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 5f50001d0..5edeedfd1 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -276,7 +276,6 @@ struct pkgCache::Version /*{{{*/ { map_ptrloc VerStr; // Stringtable map_ptrloc Section; // StringTable (StringItem) - map_ptrloc Arch; // StringTable enum {None, All, Foreign, Same, Allowed} MultiArch; // Lists diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index 53f09b991..ca5d74a9f 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -112,6 +112,7 @@ class pkgCacheGenerator::ListParser // These all operate against the current section virtual string Package() = 0; virtual string Architecture() = 0; + virtual bool ArchitectureAll() = 0; virtual string Version() = 0; virtual bool NewVersion(pkgCache::VerIterator Ver) = 0; virtual string Description() = 0; -- cgit v1.2.3 From 8b32e9209ecfab776f064e3c4ccab249307ae49d Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 10 Feb 2010 17:42:39 +0100 Subject: Pre-MultiArch a package which depends on a package with architecture "all" can be sure that a package comeing in as a dependency of this package will be of the same architecture as itself (or all). We don't want to break this, so internal an arch all package is represented as many arch depending packages. The only problem we have now is that we only know that a arch all package is installed or not - we don't know for which architecture it was installed: So we will look at all these broken arch all pseudo packages and "remove" them. --- apt-pkg/depcache.cc | 93 +++++++++++++++++++++++++++++++++++++++++++++++--- apt-pkg/depcache.h | 12 ++++--- apt-pkg/pkgcachegen.cc | 16 +++++++-- 3 files changed, 110 insertions(+), 11 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 228750b74..b04181d76 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -596,6 +597,57 @@ void pkgDepCache::UpdateVerState(PkgIterator Pkg) } } /*}}}*/ +// DepCache::RemovePseudoInstalledPkg - MultiArch helper for Update() /*{{{*/ +// --------------------------------------------------------------------- +/* We "install" arch all packages for all archs if it is installed. Many + of these will be broken. This method will look at these broken Pkg and + "remove" it. */ +bool pkgDepCache::RemovePseudoInstalledPkg(PkgIterator &Pkg, std::set &recheck) { + if (unlikely(Pkg->CurrentVer == 0)) + return false; + + VerIterator V = Pkg.CurrentVer(); + if (V->MultiArch != Version::All) + return false; + + unsigned char const DepState = VersionState(V.DependsList(),DepInstall,DepInstMin,DepInstPolicy); + if ((DepState & DepInstMin) == DepInstMin) + return false; + + // Dependencies for this arch all are not statisfied + // so we installed it only for our convenience: get right of it now. + RemoveSizes(Pkg); + RemoveStates(Pkg); + + Pkg->CurrentVer = 0; + PkgState[Pkg->ID].InstallVer = 0; + + AddStates(Pkg); + Update(Pkg); + AddSizes(Pkg); + + // After the remove previously satisfied pseudo pkg could be now + // no longer satisfied, so we need to recheck the reverse dependencies + for (DepIterator d = Pkg.RevDependsList(); d.end() != true; ++d) + { + PkgIterator const P = d.ParentPkg(); + if (P->CurrentVer != 0) + recheck.insert(P.Index()); + } + + if (V.end() != true) + for (PrvIterator Prv = V.ProvidesList(); Prv.end() != true; Prv++) + for (DepIterator d = Prv.ParentPkg().RevDependsList(); + d.end() != true; ++d) + { + PkgIterator const P = d.ParentPkg(); + if (P->CurrentVer != 0) + recheck.insert(P.Index()); + } + + return true; +} + /*}}}*/ // DepCache::Update - Figure out all the state information /*{{{*/ // --------------------------------------------------------------------- /* This will figure out the state of all the packages and all the @@ -609,9 +661,13 @@ void pkgDepCache::Update(OpProgress *Prog) iKeepCount = 0; iBrokenCount = 0; iBadCount = 0; - + + std::set recheck; + // Perform the depends pass int Done = 0; + bool const checkMultiArch = APT::Configuration::getArchitectures().size() > 1; + unsigned long killed = 0; for (PkgIterator I = PkgBegin(); I.end() != true; I++,Done++) { if (Prog != 0 && Done%20 == 0) @@ -619,7 +675,7 @@ void pkgDepCache::Update(OpProgress *Prog) for (VerIterator V = I.VersionList(); V.end() != true; V++) { unsigned char Group = 0; - + for (DepIterator D = V.DependsList(); D.end() != true; D++) { // Build the dependency state. @@ -637,16 +693,43 @@ void pkgDepCache::Update(OpProgress *Prog) D->Type == Dep::DpkgBreaks || D->Type == Dep::Obsoletes) State = ~State; - } + } } - // Compute the pacakge dependency state and size additions + // Compute the package dependency state and size additions AddSizes(I); UpdateVerState(I); AddStates(I); + + if (checkMultiArch != true || I->CurrentVer == 0) + continue; + + VerIterator const V = I.CurrentVer(); + if (V->MultiArch != Version::All) + continue; + + recheck.insert(I.Index()); + --Done; // no progress if we need to recheck the package } - if (Prog != 0) + if (checkMultiArch == true) { + /* FIXME: recheck breaks proper progress reporting as we don't know + how many packages we need to recheck. To lower the effect + a bit we increase with a kill, but we should do something more clever… */ + for(std::set::const_iterator p = recheck.begin(); + p != recheck.end(); ++p) { + if (Prog != 0 && Done%20 == 0) + Prog->Progress(Done); + PkgIterator P = PkgIterator(*Cache, Cache->PkgP + *p); + if (RemovePseudoInstalledPkg(P, recheck) == true) { + ++killed; + ++Done; + } + recheck.erase(p); + } + } + + if (Prog != 0) Prog->Progress(Done); readStateFile(Prog); diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 0306861a1..63cd954ad 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -46,6 +46,7 @@ #include #include +#include class pkgDepCache : protected pkgCache::Namespace { @@ -442,9 +443,6 @@ class pkgDepCache : protected pkgCache::Namespace virtual bool IsDeleteOk(const PkgIterator &Pkg,bool Purge = false, unsigned long Depth = 0, bool FromUser = true); - // This is for debuging - void Update(OpProgress *Prog = 0); - // read persistent states bool readStateFile(OpProgress *prog); bool writeStateFile(OpProgress *prog, bool InstalledOnly=false); @@ -460,9 +458,15 @@ class pkgDepCache : protected pkgCache::Namespace inline unsigned long BadCount() {return iBadCount;}; bool Init(OpProgress *Prog); - + // Generate all state information + void Update(OpProgress *Prog = 0); + pkgDepCache(pkgCache *Cache,Policy *Plcy = 0); virtual ~pkgDepCache(); + + private: + // Helper for Update(OpProgress) to remove pseudoinstalled arch all packages + bool RemovePseudoInstalledPkg(PkgIterator &Pkg, std::set &recheck); }; #endif diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 2a4a30349..a4ca9dfe4 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -108,13 +108,24 @@ bool pkgCacheGenerator::MergeList(ListParser &List, unsigned int Counter = 0; while (List.Step() == true) { - // Get a pointer to the package structure string const PackageName = List.Package(); if (PackageName.empty() == true) return false; + /* As we handle Arch all packages as architecture bounded + we add all information to every (simulated) arch package */ + std::vector genArch; + if (List.ArchitectureAll() == true) + genArch = APT::Configuration::getArchitectures(); + else + genArch.push_back(List.Architecture()); + + for (std::vector::const_iterator arch = genArch.begin(); + arch != genArch.end(); ++arch) + { + // Get a pointer to the package structure pkgCache::PkgIterator Pkg; - if (NewPackage(Pkg, PackageName, List.Architecture()) == false) + if (NewPackage(Pkg, PackageName, *arch) == false) return _error->Error(_("Error occurred while processing %s (NewPackage)"),PackageName.c_str()); Counter++; if (Counter % 100 == 0 && Progress != 0) @@ -257,6 +268,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List, if ((*LastDesc == 0 && _error->PendingError()) || NewFileDesc(Desc,List) == false) return _error->Error(_("Error occurred while processing %s (NewFileDesc2)"),PackageName.c_str()); + } } FoundFileDeps |= List.HasFileDeps(); -- cgit v1.2.3 From 302578f3b286540a327c822d8be3ccbb4fa47d0a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 10 Feb 2010 21:23:39 +0100 Subject: Create implicit dependencies needed for Multi-Arch handling --- apt-pkg/pkgcachegen.cc | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index a4ca9dfe4..037c0cb63 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -532,11 +532,14 @@ bool pkgCacheGenerator::FinishCache(OpProgress &Progress) { string const PkgName = G.Name(); for (pkgCache::PkgIterator P = G.PackageList(); P.end() != true; P = G.NextPkg(P)) { for (pkgCache::VerIterator V = P.VersionList(); V.end() != true; V++) { - // Arch all packages are "co-installable" - if (V->MultiArch == pkgCache::Version::All) - continue; string const Arch = V.Arch(); map_ptrloc *OldDepLast = NULL; + /* MultiArch handling introduces a lot of implicit Dependencies: + - MultiArch: same → Co-Installable if they have the same version + - Architecture: all → Need to be Co-Installable for internal reasons + - All others conflict with all other group members */ + bool const coInstall = (V->MultiArch == pkgCache::Version::All || + V->MultiArch == pkgCache::Version::Same); for (vector::const_iterator A = archs.begin(); A != archs.end(); ++A) { if (*A == Arch) continue; @@ -546,10 +549,24 @@ bool pkgCacheGenerator::FinishCache(OpProgress &Progress) { pkgCache::PkgIterator D = G.FindPkg(*A); if (D.end() == true) continue; - // Conflicts: ${self}:other - NewDepends(D, V, "", - pkgCache::Dep::NoOp, pkgCache::Dep::Conflicts, - OldDepLast); + if (coInstall == true) { + // Replaces: ${self}:other ( << ${binary:Version}) + NewDepends(D, V, V.VerStr(), + pkgCache::Dep::Less, pkgCache::Dep::Replaces, + OldDepLast); + // Breaks: ${self}:other (!= ${binary:Version}) + NewDepends(D, V, V.VerStr(), + pkgCache::Dep::Less, pkgCache::Dep::DpkgBreaks, + OldDepLast); + NewDepends(D, V, V.VerStr(), + pkgCache::Dep::Greater, pkgCache::Dep::DpkgBreaks, + OldDepLast); + } else { + // Conflicts: ${self}:other + NewDepends(D, V, "", + pkgCache::Dep::NoOp, pkgCache::Dep::Conflicts, + OldDepLast); + } } } } -- cgit v1.2.3 From 67e0766f0eab85ce1aeacee75fc6b200f36996c9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 10 Feb 2010 22:45:58 +0100 Subject: Foreign Versions add an implicit Provides to the other packages in the group --- apt-pkg/deb/deblistparser.cc | 55 +++++++++++++++++++++++++++++--------------- apt-pkg/pkgcachegen.cc | 7 +++--- apt-pkg/pkgcachegen.h | 4 ++-- 3 files changed, 42 insertions(+), 24 deletions(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 26841d3d2..b6082cdd5 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -618,29 +618,46 @@ bool debListParser::ParseProvides(pkgCache::VerIterator Ver) { const char *Start; const char *Stop; - if (Section.Find("Provides",Start,Stop) == false) - return true; - - string Package; - string Version; - unsigned int Op; - - while (1) + if (Section.Find("Provides",Start,Stop) == true) { - Start = ParseDepends(Start,Stop,Package,Version,Op); - if (Start == 0) - return _error->Error("Problem parsing Provides line"); - if (Op != pkgCache::Dep::NoOp) { - _error->Warning("Ignoring Provides line with DepCompareOp for package %s", Package.c_str()); - } else { - if (NewProvides(Ver,Package,Version) == false) - return false; + string Package; + string Version; + string const Arch = Ver.Arch(); + unsigned int Op; + + while (1) + { + Start = ParseDepends(Start,Stop,Package,Version,Op); + if (Start == 0) + return _error->Error("Problem parsing Provides line"); + if (Op != pkgCache::Dep::NoOp) { + _error->Warning("Ignoring Provides line with DepCompareOp for package %s", Package.c_str()); + } else { + if (NewProvides(Ver, Package, Arch, Version) == false) + return false; + } + + if (Start == Stop) + break; } + } - if (Start == Stop) - break; + if (Ver->MultiArch != pkgCache::Version::Foreign) + return true; + + std::vector const archs = APT::Configuration::getArchitectures(); + if (archs.size() <= 1) + return true; + + string const Package = Ver.ParentPkg().Name(); + string const Version = Ver.VerStr(); + for (std::vector::const_iterator a = archs.begin(); + a != archs.end(); ++a) + { + if (NewProvides(Ver, Package, *a, Version) == false) + return false; } - + return true; } /*}}}*/ diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 037c0cb63..ebda325f7 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -668,13 +668,14 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, // --------------------------------------------------------------------- /* */ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver, - const string &PackageName, + const string &PkgName, + const string &PkgArch, const string &Version) { pkgCache &Cache = Owner->Cache; // We do not add self referencing provides - if (unlikely(Ver.ParentPkg().Name() == PackageName)) + if (Ver.ParentPkg().Name() == PkgName && PkgArch == Ver.Arch()) return true; // Get a structure @@ -693,7 +694,7 @@ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver, // Locate the target package pkgCache::PkgIterator Pkg; - if (unlikely(Owner->NewPackage(Pkg,PackageName,string(Ver.Arch())) == false)) + if (unlikely(Owner->NewPackage(Pkg,PkgName, PkgArch) == false)) return false; // Link it to the package diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index ca5d74a9f..46d0cd893 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -104,8 +104,8 @@ class pkgCacheGenerator::ListParser bool NewDepends(pkgCache::VerIterator Ver,const string &Package, const string &Arch, const string &Version,unsigned int Op, unsigned int Type); - bool NewProvides(pkgCache::VerIterator Ver,const string &Package, - const string &Version); + bool NewProvides(pkgCache::VerIterator Ver,const string &PkgName, + const string &PkgArch, const string &Version); public: -- cgit v1.2.3 From 4d174dc84ea184b5afa81abb3b94e2ef3380ece8 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 11 Feb 2010 12:19:48 +0100 Subject: Add Multi-Arch: allowed support by creating an implicit provide of name:any for such packages, so dependencies in this style can be easily resolved. --- apt-pkg/deb/deblistparser.cc | 6 ++++++ apt-pkg/pkgcache.cc | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index b6082cdd5..3726a6a04 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -642,6 +642,12 @@ bool debListParser::ParseProvides(pkgCache::VerIterator Ver) } } + if (Ver->MultiArch == pkgCache::Version::Allowed) + { + string const Package = string(Ver.ParentPkg().Name()).append(":").append("any"); + NewProvides(Ver, Package, "any", Ver.VerStr()); + } + if (Ver->MultiArch != pkgCache::Version::Foreign) return true; diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 7d98869ea..2d4ee1010 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -186,7 +186,10 @@ pkgCache::PkgIterator pkgCache::FindPkg(const string &Name) { size_t const found = Name.find(':'); if (found == string::npos) return FindPkg(Name, "native"); - return FindPkg(Name.substr(0, found), Name.substr(found+1, string::npos)); + string const Arch = Name.substr(found+1); + if (Arch == "any") + return FindPkg(Name, "any"); + return FindPkg(Name.substr(0, found), Arch); } /*}}}*/ // Cache::FindPkg - Locate a package by name /*{{{*/ -- cgit v1.2.3 From 6293e04ff36cd1cb4756fc30a4777ad6aaf8ffac Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 11 Feb 2010 15:41:04 +0100 Subject: display the architecture of the package if it is not the default architecture in apt-get, display policy for all available architectures and use GrpIterator in apt-cache pkgnames --- cmdline/apt-cache.cc | 46 +++++++++++++++++++++++++++++++--------------- cmdline/apt-get.cc | 33 ++++++++++++++++++++++----------- 2 files changed, 53 insertions(+), 26 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 7d7f58a62..cd806286c 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1417,11 +1417,15 @@ bool ShowPackage(CommandLine &CmdL) for (const char **I = CmdL.FileList + 1; *I != 0; I++) { + // FIXME: Handle the case in which pkgname name:arch is not found pkgCache::PkgIterator Pkg = Cache.FindPkg(*I); if (Pkg.end() == true) { - _error->Warning(_("Unable to locate package %s"),*I); - continue; + Pkg = Cache.FindPkg(*I, "any"); + if (Pkg.end() == true) { + _error->Warning(_("Unable to locate package %s"),*I); + continue; + } } ++found; @@ -1457,16 +1461,17 @@ bool ShowPackage(CommandLine &CmdL) bool ShowPkgNames(CommandLine &CmdL) { pkgCache &Cache = *GCache; - pkgCache::PkgIterator I = Cache.PkgBegin(); - bool All = _config->FindB("APT::Cache::AllNames","false"); - + pkgCache::GrpIterator I = Cache.GrpBegin(); + bool const All = _config->FindB("APT::Cache::AllNames","false"); + if (CmdL.FileList[1] != 0) { for (;I.end() != true; I++) { - if (All == false && I->VersionList == 0) + if (All == false && I->FirstPackage == 0) + continue; + if (I.FindPkg("any")->VersionList == 0) continue; - if (strncmp(I.Name(),CmdL.FileList[1],strlen(CmdL.FileList[1])) == 0) cout << I.Name() << endl; } @@ -1477,7 +1482,9 @@ bool ShowPkgNames(CommandLine &CmdL) // Show all pkgs for (;I.end() != true; I++) { - if (All == false && I->VersionList == 0) + if (All == false && I->FirstPackage == 0) + continue; + if (I.FindPkg("any")->VersionList == 0) continue; cout << I.Name() << endl; } @@ -1565,19 +1572,27 @@ bool Policy(CommandLine &CmdL) return true; } - + + string const myArch = _config->Find("APT::Architecture"); + // Print out detailed information for each package for (const char **I = CmdL.FileList + 1; *I != 0; I++) { - pkgCache::PkgIterator Pkg = Cache.FindPkg(*I); + pkgCache::GrpIterator Grp = Cache.FindGrp(*I); + pkgCache::PkgIterator Pkg = Grp.FindPkg("any"); if (Pkg.end() == true) { _error->Warning(_("Unable to locate package %s"),*I); continue; } - - cout << Pkg.Name() << ":" << endl; - + + for (; Pkg.end() != true; Pkg = Grp.NextPkg(Pkg)) { + + if (myArch == Pkg.Arch()) + cout << Pkg.Name() << ":" << endl; + else + cout << Pkg.Name() << ": [" << Pkg.Arch() << "]" << endl; + // Installed version cout << _(" Installed: "); if (Pkg->CurrentVer == 0) @@ -1622,8 +1637,9 @@ bool Policy(CommandLine &CmdL) return _error->Error(_("Cache is out of sync, can't x-ref a package file")); printf(_(" %4i %s\n"),Plcy.GetPriority(VF.File()), Indx->Describe(true).c_str()); - } - } + } + } + } } return true; diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 7325bbf22..2597a6acb 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -227,6 +227,17 @@ bool ShowList(ostream &out,string Title,string List,string VersionsList) return false; } /*}}}*/ +// ShowPkg - display a package name /*{{{*/ +// --------------------------------------------------------------------- +/* Displays the package name and maybe also the architecture + if it is not the main architecture */ +string ShowPkg(pkgCache::PkgIterator const Pkg) { + string p = Pkg.Name(); + if (_config->Find("APT::Architecture") != Pkg.Arch()) + p.append(":").append(Pkg.Arch()); + return p; +} + /*}}}*/ // ShowBroken - Debugging aide /*{{{*/ // --------------------------------------------------------------------- /* This prints out the names of all the packages that are broken along @@ -258,8 +269,8 @@ void ShowBroken(ostream &out,CacheFile &Cache,bool Now) } // Print out each package and the failed dependencies - out <<" " << I.Name() << ":"; - unsigned Indent = strlen(I.Name()) + 3; + out << " " << ShowPkg(I) << " :"; + unsigned const Indent = ShowPkg(I).size() + 3; bool First = true; pkgCache::VerIterator Ver; @@ -312,7 +323,7 @@ void ShowBroken(ostream &out,CacheFile &Cache,bool Now) out << ' ' << End.DepType() << ": "; FirstOr = false; - out << Start.TargetPkg().Name(); + out << ShowPkg(Start.TargetPkg()); // Show a quick summary of the version requirements if (Start.TargetVer() != 0) @@ -374,7 +385,7 @@ void ShowNew(ostream &out,CacheFile &Cache) { pkgCache::PkgIterator I(Cache,Cache.List[J]); if (Cache[I].NewInstall() == true) { - List += string(I.Name()) + " "; + List += ShowPkg(I) + " "; VersionsList += string(Cache[I].CandVersion) + "\n"; } } @@ -397,9 +408,9 @@ void ShowDel(ostream &out,CacheFile &Cache) if (Cache[I].Delete() == true) { if ((Cache[I].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge) - List += string(I.Name()) + "* "; + List += ShowPkg(I) + "* "; else - List += string(I.Name()) + " "; + List += ShowPkg(I) + " "; VersionsList += string(Cache[I].CandVersion)+ "\n"; } @@ -424,7 +435,7 @@ void ShowKept(ostream &out,CacheFile &Cache) I->CurrentVer == 0 || Cache[I].Delete() == true) continue; - List += string(I.Name()) + " "; + List += ShowPkg(I) + " "; VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n"; } ShowList(out,_("The following packages have been kept back:"),List,VersionsList); @@ -445,7 +456,7 @@ void ShowUpgraded(ostream &out,CacheFile &Cache) if (Cache[I].Upgrade() == false || Cache[I].NewInstall() == true) continue; - List += string(I.Name()) + " "; + List += ShowPkg(I) + " "; VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n"; } ShowList(out,_("The following packages will be upgraded:"),List,VersionsList); @@ -466,7 +477,7 @@ bool ShowDowngraded(ostream &out,CacheFile &Cache) if (Cache[I].Downgrade() == false || Cache[I].NewInstall() == true) continue; - List += string(I.Name()) + " "; + List += ShowPkg(I) + " "; VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n"; } return ShowList(out,_("The following packages will be DOWNGRADED:"),List,VersionsList); @@ -484,7 +495,7 @@ bool ShowHold(ostream &out,CacheFile &Cache) pkgCache::PkgIterator I(Cache,Cache.List[J]); if (Cache[I].InstallVer != (pkgCache::Version *)I.CurrentVer() && I->SelectedState == pkgCache::State::Hold) { - List += string(I.Name()) + " "; + List += ShowPkg(I) + " "; VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n"; } } @@ -518,7 +529,7 @@ bool ShowEssential(ostream &out,CacheFile &Cache) if (Added[I->ID] == false) { Added[I->ID] = true; - List += string(I.Name()) + " "; + List += ShowPkg(I) + " "; //VersionsList += string(Cache[I].CurVersion) + "\n"; ??? } } -- cgit v1.2.3 From c5dac10c3dd6d8f54d97d3105803d07fa891fcd4 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 11 Feb 2010 18:20:02 +0100 Subject: Arch() on a MultiArch:all version should return "all" to be compatible with previous usecases. You now need to requested with Arch(true) the return of the architecture this version (and pseudo package) was created for. --- apt-pkg/cacheiterators.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index d8e044f88..e8cf28496 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -178,7 +178,16 @@ class pkgCache::VerIterator : public Iterator { // Accessors inline const char *VerStr() const {return S->VerStr == 0?0:Owner->StrP + S->VerStr;}; inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;}; - inline const char *Arch() const {return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch;}; + inline const char *Arch() const { + if(S->MultiArch == pkgCache::Version::All) + return "all"; + return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch; + }; + inline const char *Arch(bool const pseudo) const { + if(pseudo == false) + return Arch(); + return S->ParentPkg == 0?0:Owner->StrP + ParentPkg()->Arch; + }; inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);}; inline DescIterator DescriptionList() const; -- cgit v1.2.3 From 803ea2a87f81252b2c0d541b8502ed206ce57c84 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 12 Feb 2010 00:04:31 +0100 Subject: Add yet another pseudo package which isn't as pseudo as the others: Arch all packages are now represented by arch depending packages which all depend on a package with the same name and the special arch "all". This packages has NO dependencies, but beside this the same information. It is the only package which has a size, the arch depending ones all have a zero size. While the arch depending pseudo packages are used for dependency resolution the arch "all" package is used for downloading and ordering of the package. --- apt-pkg/algorithms.cc | 52 ++++++++++++++++++++++++++++++++++++++++---- apt-pkg/cacheiterators.h | 1 + apt-pkg/deb/deblistparser.cc | 22 +++++++++++++++++-- apt-pkg/depcache.cc | 4 ++++ apt-pkg/depcache.h | 1 + apt-pkg/orderlist.cc | 4 ++++ apt-pkg/packagemanager.cc | 23 +++++++++++++++----- apt-pkg/pkgcache.cc | 12 ++++++++++ apt-pkg/pkgcache.h | 2 +- apt-pkg/pkgcachegen.cc | 20 +++++++++++++---- cmdline/apt-cache.cc | 2 ++ cmdline/apt-get.cc | 14 +++++++++--- 12 files changed, 137 insertions(+), 20 deletions(-) diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 34da745de..c905cffa9 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -83,13 +83,28 @@ void pkgSimulate::Describe(PkgIterator Pkg,ostream &out,bool Current,bool Candid bool pkgSimulate::Install(PkgIterator iPkg,string /*File*/) { // Adapt the iterator - PkgIterator Pkg = Sim.FindPkg(iPkg.Name()); + PkgIterator Pkg = Sim.FindPkg(iPkg.Name(), iPkg.Arch()); Flags[Pkg->ID] = 1; cout << "Inst "; Describe(Pkg,cout,true,true); Sim.MarkInstall(Pkg,false); - + + if (strcmp(Pkg.Arch(),"all") == 0) + { + pkgCache::GrpIterator G = Pkg.Group(); + pkgCache::GrpIterator iG = iPkg.Group(); + for (pkgCache::PkgIterator P = G.FindPkg("any"); P.end() != true; P = G.NextPkg(P)) + { + if (strcmp(P.Arch(), "all") == 0) + continue; + if (iG.FindPkg(P.Arch())->CurrentVer == 0) + continue; + Flags[P->ID] = 1; + Sim.MarkInstall(P, false); + } + } + // Look for broken conflicts+predepends. for (PkgIterator I = Sim.PkgBegin(); I.end() == false; I++) { @@ -131,9 +146,22 @@ bool pkgSimulate::Install(PkgIterator iPkg,string /*File*/) bool pkgSimulate::Configure(PkgIterator iPkg) { // Adapt the iterator - PkgIterator Pkg = Sim.FindPkg(iPkg.Name()); + PkgIterator Pkg = Sim.FindPkg(iPkg.Name(), iPkg.Arch()); Flags[Pkg->ID] = 2; + + if (strcmp(Pkg.Arch(),"all") == 0) + { + pkgCache::GrpIterator G = Pkg.Group(); + for (pkgCache::PkgIterator P = G.FindPkg("any"); P.end() != true; P = G.NextPkg(P)) + { + if (strcmp(P.Arch(), "all") == 0) + continue; + if (Flags[P->ID] == 1) + Flags[P->ID] = 2; + } + } + // Sim.MarkInstall(Pkg,false); if (Sim[Pkg].InstBroken() == true) { @@ -181,10 +209,26 @@ bool pkgSimulate::Configure(PkgIterator iPkg) bool pkgSimulate::Remove(PkgIterator iPkg,bool Purge) { // Adapt the iterator - PkgIterator Pkg = Sim.FindPkg(iPkg.Name()); + PkgIterator Pkg = Sim.FindPkg(iPkg.Name(), iPkg.Arch()); Flags[Pkg->ID] = 3; Sim.MarkDelete(Pkg); + + if (strcmp(Pkg.Arch(),"all") == 0) + { + pkgCache::GrpIterator G = Pkg.Group(); + pkgCache::GrpIterator iG = iPkg.Group(); + for (pkgCache::PkgIterator P = G.FindPkg("any"); P.end() != true; P = G.NextPkg(P)) + { + if (strcmp(P.Arch(), "all") == 0) + continue; + if (iG.FindPkg(P.Arch())->CurrentVer == 0) + continue; + Flags[P->ID] = 3; + Sim.MarkDelete(P); + } + } + if (Purge == true) cout << "Purg "; else diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index e8cf28496..43cbe1377 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -200,6 +200,7 @@ class pkgCache::VerIterator : public Iterator { string RelStr(); bool Automatic() const; + bool Pseudo() const; VerFileIterator NewestFile() const; inline VerIterator(pkgCache &Owner,Version *Trg = 0) : Iterator(Owner, Trg) { diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 3726a6a04..b3d95164a 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -148,6 +148,24 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver) Ver->Priority = pkgCache::State::Extra; } + if (Ver->MultiArch == pkgCache::Version::All) + { + /* We maintain a "pseudo" arch=all package for architecture all versions + on which these versions can depend on. This pseudo package is many used + for downloading/installing: The other pseudo-packages will degenerate + to a NOP in the download/install step - this package will ensure that + it is downloaded only one time and installed only one time -- even if + the architecture bound versions coming in and out on regular basis. */ + if (strcmp(Ver.Arch(true),"all") == 0) + return true; + else + { + // our pseudo packages have no size to not confuse the fetcher + Ver->Size = 0; + Ver->InstalledSize = 0; + } + } + if (ParseDepends(Ver,"Depends",pkgCache::Dep::Depends) == false) return false; if (ParseDepends(Ver,"Pre-Depends",pkgCache::Dep::PreDepends) == false) @@ -593,7 +611,7 @@ bool debListParser::ParseDepends(pkgCache::VerIterator Ver, return true; string Package; - string const pkgArch = Ver.Arch(); + string const pkgArch = Ver.Arch(true); string Version; unsigned int Op; @@ -622,7 +640,7 @@ bool debListParser::ParseProvides(pkgCache::VerIterator Ver) { string Package; string Version; - string const Arch = Ver.Arch(); + string const Arch = Ver.Arch(true); unsigned int Op; while (1) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index b04181d76..e817adb77 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -896,6 +896,10 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge, AddStates(Pkg); Update(Pkg); AddSizes(Pkg); + + // if we remove the pseudo package, we also need to remove the "real" + if (Pkg->CurrentVer != 0 && Pkg.CurrentVer().Pseudo() == true) + MarkDelete(Pkg.Group().FindPkg("all"), rPurge, Depth+1, FromUser); } /*}}}*/ // DepCache::IsDeleteOk - check if it is ok to remove this package /*{{{*/ diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 63cd954ad..ab1021a44 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -333,6 +333,7 @@ class pkgDepCache : protected pkgCache::Namespace inline Header &Head() {return *Cache->HeaderP;}; inline PkgIterator PkgBegin() {return Cache->PkgBegin();}; inline PkgIterator FindPkg(string const &Name) {return Cache->FindPkg(Name);}; + inline PkgIterator FindPkg(string const &Name, string const &Arch) {return Cache->FindPkg(Name, Arch);}; inline pkgCache &GetCache() {return *Cache;}; inline pkgVersioningSystem &VS() {return *Cache->VS;}; diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index 0ee2e2bc8..2e7618b55 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -126,6 +126,10 @@ bool pkgOrderList::IsMissing(PkgIterator Pkg) if (FileList[Pkg->ID].empty() == false) return false; + + if (pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == true) + return false; + return true; } /*}}}*/ diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 1ab3203a1..08e7fc00f 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -80,7 +80,10 @@ bool pkgPackageManager::GetArchives(pkgAcquire *Owner,pkgSourceList *Sources, // Skip already processed packages if (List->IsNow(Pkg) == false) continue; - + + if (pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == true) + continue; + new pkgAcqArchive(Owner,Sources,Recs,Cache[Pkg].InstVerIter(Cache), FileNames[Pkg->ID]); } @@ -277,8 +280,10 @@ bool pkgPackageManager::ConfigureAll() for (pkgOrderList::iterator I = OList.begin(); I != OList.end(); I++) { PkgIterator Pkg(Cache,*I); - - if (ConfigurePkgs == true && Configure(Pkg) == false) + + if (ConfigurePkgs == true && + pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == false && + Configure(Pkg) == false) return false; List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States); @@ -310,7 +315,9 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg) { PkgIterator Pkg(Cache,*I); - if (ConfigurePkgs == true && Configure(Pkg) == false) + if (ConfigurePkgs == true && + pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == false && + Configure(Pkg) == false) return false; List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States); @@ -457,7 +464,10 @@ bool pkgPackageManager::SmartRemove(PkgIterator Pkg) return true; List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States); - return Remove(Pkg,(Cache[Pkg].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge); + + if (pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == false) + return Remove(Pkg,(Cache[Pkg].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge); + return true; } /*}}}*/ // PM::SmartUnPack - Install helper /*{{{*/ @@ -565,7 +575,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg) P.end() == false; P++) CheckRConflicts(Pkg,P.ParentPkg().RevDependsList(),P.ProvideVersion()); - if (Install(Pkg,FileNames[Pkg->ID]) == false) + if (pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == false && + Install(Pkg,FileNames[Pkg->ID]) == false) return false; List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States); diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 2d4ee1010..04a2c7234 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -649,6 +649,18 @@ bool pkgCache::VerIterator::Automatic() const return false; } /*}}}*/ +// VerIterator::Pseudo - Check if this version is a pseudo one /*{{{*/ +// --------------------------------------------------------------------- +/* Sometimes you have the need to express dependencies with versions + which doesn't really exist or exist multiply times for "different" + packages. We need these versions for dependency resolution but they + are a problem everytime we need to download/install something. */ +bool pkgCache::VerIterator::Pseudo() const +{ + return (S->MultiArch == pkgCache::Version::All && + strcmp(Arch(true),"all") != 0); +} + /*}}}*/ // VerIterator::NewestFile - Return the newest file version relation /*{{{*/ // --------------------------------------------------------------------- /* This looks at the version numbers associated with all of the sources diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 5edeedfd1..012caac76 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -357,7 +357,7 @@ inline pkgCache::PkgFileIterator pkgCache::FileEnd() class pkgCache::Namespace /*{{{*/ { public: - + typedef pkgCache::GrpIterator GrpIterator; typedef pkgCache::PkgIterator PkgIterator; typedef pkgCache::VerIterator VerIterator; typedef pkgCache::DescIterator DescIterator; diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index ebda325f7..c1b546a00 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -115,9 +115,10 @@ bool pkgCacheGenerator::MergeList(ListParser &List, /* As we handle Arch all packages as architecture bounded we add all information to every (simulated) arch package */ std::vector genArch; - if (List.ArchitectureAll() == true) + if (List.ArchitectureAll() == true) { genArch = APT::Configuration::getArchitectures(); - else + genArch.push_back("all"); + } else genArch.push_back(List.Architecture()); for (std::vector::const_iterator arch = genArch.begin(); @@ -531,8 +532,11 @@ bool pkgCacheGenerator::FinishCache(OpProgress &Progress) { for (pkgCache::GrpIterator G = GetCache().GrpBegin(); G.end() != true; G++) { string const PkgName = G.Name(); for (pkgCache::PkgIterator P = G.PackageList(); P.end() != true; P = G.NextPkg(P)) { + if (strcmp(P.Arch(),"all") == 0) + continue; + pkgCache::PkgIterator allPkg; for (pkgCache::VerIterator V = P.VersionList(); V.end() != true; V++) { - string const Arch = V.Arch(); + string const Arch = V.Arch(true); map_ptrloc *OldDepLast = NULL; /* MultiArch handling introduces a lot of implicit Dependencies: - MultiArch: same → Co-Installable if they have the same version @@ -540,6 +544,8 @@ bool pkgCacheGenerator::FinishCache(OpProgress &Progress) { - All others conflict with all other group members */ bool const coInstall = (V->MultiArch == pkgCache::Version::All || V->MultiArch == pkgCache::Version::Same); + if (V->MultiArch == pkgCache::Version::All && allPkg.end() == true) + allPkg = G.FindPkg("all"); for (vector::const_iterator A = archs.begin(); A != archs.end(); ++A) { if (*A == Arch) continue; @@ -561,6 +567,12 @@ bool pkgCacheGenerator::FinishCache(OpProgress &Progress) { NewDepends(D, V, V.VerStr(), pkgCache::Dep::Greater, pkgCache::Dep::DpkgBreaks, OldDepLast); + if (V->MultiArch == pkgCache::Version::All) { + // Depend on ${self}:all which does depend on nothing + NewDepends(allPkg, V, V.VerStr(), + pkgCache::Dep::Equals, pkgCache::Dep::Depends, + OldDepLast); + } } else { // Conflicts: ${self}:other NewDepends(D, V, "", @@ -675,7 +687,7 @@ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver, pkgCache &Cache = Owner->Cache; // We do not add self referencing provides - if (Ver.ParentPkg().Name() == PkgName && PkgArch == Ver.Arch()) + if (Ver.ParentPkg().Name() == PkgName && PkgArch == Ver.Arch(true)) return true; // Get a structure diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index cd806286c..275daa187 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1587,6 +1587,8 @@ bool Policy(CommandLine &CmdL) } for (; Pkg.end() != true; Pkg = Grp.NextPkg(Pkg)) { + if (strcmp(Pkg.Arch(),"all") == 0) + continue; if (myArch == Pkg.Arch()) cout << Pkg.Name() << ":" << endl; diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 2597a6acb..93065004c 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -233,7 +233,7 @@ bool ShowList(ostream &out,string Title,string List,string VersionsList) if it is not the main architecture */ string ShowPkg(pkgCache::PkgIterator const Pkg) { string p = Pkg.Name(); - if (_config->Find("APT::Architecture") != Pkg.Arch()) + if (strcmp(Pkg.Arch(),"all") != 0 && _config->Find("APT::Architecture") != Pkg.Arch()) p.append(":").append(Pkg.Arch()); return p; } @@ -385,6 +385,8 @@ void ShowNew(ostream &out,CacheFile &Cache) { pkgCache::PkgIterator I(Cache,Cache.List[J]); if (Cache[I].NewInstall() == true) { + if (Cache[I].CandidateVerIter(Cache).Pseudo() == true) + continue; List += ShowPkg(I) + " "; VersionsList += string(Cache[I].CandVersion) + "\n"; } @@ -407,6 +409,8 @@ void ShowDel(ostream &out,CacheFile &Cache) pkgCache::PkgIterator I(Cache,Cache.List[J]); if (Cache[I].Delete() == true) { + if (Cache[I].CandidateVerIter(Cache).Pseudo() == true) + continue; if ((Cache[I].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge) List += ShowPkg(I) + "* "; else @@ -455,7 +459,9 @@ void ShowUpgraded(ostream &out,CacheFile &Cache) // Not interesting if (Cache[I].Upgrade() == false || Cache[I].NewInstall() == true) continue; - + if (Cache[I].CandidateVerIter(Cache).Pseudo() == true) + continue; + List += ShowPkg(I) + " "; VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n"; } @@ -476,7 +482,9 @@ bool ShowDowngraded(ostream &out,CacheFile &Cache) // Not interesting if (Cache[I].Downgrade() == false || Cache[I].NewInstall() == true) continue; - + if (Cache[I].CandidateVerIter(Cache).Pseudo() == true) + continue; + List += ShowPkg(I) + " "; VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n"; } -- cgit v1.2.3 From 42d71ab5fe58953a680bd300a99d173e23430d7c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 12 Feb 2010 17:17:16 +0100 Subject: In SingleArch environments we don't need the arch "all" pseudo package for handling arch:all packages, so we create only one package and stop calling it a pseudo package. --- apt-pkg/deb/deblistparser.cc | 2 +- apt-pkg/pkgcache.cc | 9 +++++++-- apt-pkg/pkgcachegen.cc | 3 ++- cmdline/apt-get.cc | 3 +++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index b3d95164a..1948aedf3 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -158,7 +158,7 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver) the architecture bound versions coming in and out on regular basis. */ if (strcmp(Ver.Arch(true),"all") == 0) return true; - else + else if (Ver.Pseudo() == true) { // our pseudo packages have no size to not confuse the fetcher Ver->Size = 0; diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 04a2c7234..d4268b31c 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -657,8 +657,13 @@ bool pkgCache::VerIterator::Automatic() const are a problem everytime we need to download/install something. */ bool pkgCache::VerIterator::Pseudo() const { - return (S->MultiArch == pkgCache::Version::All && - strcmp(Arch(true),"all") != 0); + if (S->MultiArch == pkgCache::Version::All && + strcmp(Arch(true),"all") != 0) + { + GrpIterator const Grp = ParentPkg().Group(); + return (Grp->LastPackage != Grp->FirstPackage); + } + return false; } /*}}}*/ // VerIterator::NewestFile - Return the newest file version relation /*{{{*/ diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index c1b546a00..6d103c6b6 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -117,7 +117,8 @@ bool pkgCacheGenerator::MergeList(ListParser &List, std::vector genArch; if (List.ArchitectureAll() == true) { genArch = APT::Configuration::getArchitectures(); - genArch.push_back("all"); + if (genArch.size() != 1) + genArch.push_back("all"); } else genArch.push_back(List.Architecture()); diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 93065004c..343226bc3 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -585,6 +585,9 @@ void Stats(ostream &out,pkgDepCache &Dep) unsigned long ReInstall = 0; for (pkgCache::PkgIterator I = Dep.PkgBegin(); I.end() == false; I++) { + if (pkgCache::VerIterator(Dep, Dep[I].CandidateVer).Pseudo() == true) + continue; + if (Dep[I].NewInstall() == true) Install++; else -- cgit v1.2.3 From 9a230738b2287dc5316f601ff0b4765eff9d898d Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 13 Feb 2010 00:39:10 +0100 Subject: Add a more or less useful README file for everything related to MultiArch and install it in the apt-doc package. --- README.MultiArch | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++ debian/apt-doc.docs | 3 +- 2 files changed, 108 insertions(+), 1 deletion(-) create mode 100644 README.MultiArch diff --git a/README.MultiArch b/README.MultiArch new file mode 100644 index 000000000..92491631e --- /dev/null +++ b/README.MultiArch @@ -0,0 +1,106 @@ +Before we start with this topic: Note that MultiArch is not yet ready for +prime time and/or for the casual user. The implementation is so far widely +untested and only useful for developers of packagemanagment tools which +use APT and his friends and maintainers of (upcoming) MultiArch packages. +This README is especially NOT written for the casual user and is NOT a +usage guide - you have been warned. It is assumed that the reader has +at least a bit of knowledge about APT internals, dependency relations +and the MultiArch spec [0]. + + +The implementation is focused on NOT breaking existing singleArch-only +applications and/or systems as this is the current status-quo for all +systems. Also, many systems don't need (or can't make use of) MultiArch, +so APT will proceed in thinking SingleArch as long as it is not explicitly +told to handle MultiArch: +To activate MultiArch handling you need to specify architectures you +want to be considered by APT with the config list APT::Architectures +(Insert architectures in order of preference). +APT will download Packages files for all these architectures in the +update step. Exception: In the sourcelist is the optionfield used: +deb [ arch=amd64,i386 ] http://example.org/ experimental main +(This optionfield is a NOP in previous apt versions) + +Internally in APT a package is represented as a PkgIterator - +before MultiArch this PkgIterator was architecture unaware, +only VerIterators include the architecture they came from. +This is/was a big problem as all versions in a package are +considered for dependency resolution, so pinning will not work in all cases. + +The problem is solved by a conceptional change: +A PkgIterator is now architecture aware, so the packages +of foobar for amd64 and for i386 are now for apt internal totally +different packages. That is a good thing for e.g. pinning, but +sometimes you need the information that such packages are belonging together: +All these foobar packages therefore form a Group accessible with GrpIterators. +Note that the GrpIterator has the same name as all the packages in this group, +so e.g. apt-cache pkgnames iterates over GrpIterator to get the package names: +This is compatible to SingleArch as a Group consists only of a single package +and also to MultiArch as a Group consists of possible many packages which +all have the same name and are therefore out of interest for pkgnames. + + +Caused by the paragraph "Dependencies involving Architecture: all packages" +in the MultiArch spec we have a second major conceptional change +which could even break existing applications, but we hope for the best… +An Architecture: all package is internally split into pseudo packages +for all MultiArch Architectures and additional a package with the +architecture "all" with no dependencies which is a dependency of all +these architecture depending packages. While the architecture depending +packages are mainly used for dependency resolution (a package of arch A which +depends on an arch all package assumes that the dependencies of this package +are also from arch A. Packages also sometimes change from any to all or v.v.) +the arch "all" package is used for scheduling download/installation of the +underlying "real" package. Note that the architecture depending packages can +be detected with Pseudo() while the "all" package reports exactly this arch +as package architecture and as pseudo architecture of the versions of this pkg. +Beware: All versions of a "real" architecture all package will be report "all" +as their architecture if asked with Arch() regardless if they are the "all" or +the architecture depending packages. If you want to know the architecture this +pseudo package was created for call Arch(true). Also, while the spec say that +arch:all packages are not allowed to have a MultiArch flag APT assigns a +special value to them: MultiArch: all. + + +As you might guess this arch:all handling has a few problems (but we think so +far that the problems are minor compared to the problems we would have with +other implementations.) +APT doesn't know which pseudo packages of such an arch all package are +"installed" (to satisfy dependencies), so APT will generate a Cache in which +all these pseudo packages are installed (e.g. apt-cache policy will display +them all as installed). Later in the DepCache step it will "remove" +all pseudo packages whose dependencies are not satisfied. +The expense is that if the package state is broken APT could come to the +conclusion to "remove" too many pseudo packages, but in a stable environment +APT should never end up in a broken system state… + + +Given all these internal changes it is quite interesting that the actual +implementation of MultiArch is trivial: Some implicit dependencies and a few +more provides are all changes needed to get it working. Especially noteworthy +is that it wasn't needed to change the resolver in any way and other parts only +need to be told about ignoring pseudo packages or using GrpIterator instead of +PkgIterator, so chances are good that libapt-applications will proceed to work +without or at least only require minor changes, but your mileage may vary… + + +Known Issues and/or noteworthy stuff: +* The implementation is mostly untested, so it is very likely that APT will + eat your kids if you aren't as lucky as the author of these patches. +* the (install)size of a pseudo package is always NULL - if you want to know + the (install)size you need to get the info from the arch "all" package. +* It is maybe confusing, but the arch "all" package does have the same versions + and in general roughly the same information with one subtil difference: + It doesn't have any dependency, regardless of the type. The pseudo packages + depend on this package. +* apt-cache policy foobar on installed architecture all package foobar will + report all architecture depending packages as installed. Displaying here the + correct information would require to build the complete DepCache… +* [BUG] An installed package which changes the architecture from any to all + (and v.v.) shows up in the NEW packages section instead of UPGRADE. +* [TODO] Investigate the DepCache pseudo-package killer heuristic: + e.g. add more safety guards… +* [FIXME] a few corner cases/missing features marked as FIXME in the code + + +[0] https://wiki.ubuntu.com/MultiarchSpec diff --git a/debian/apt-doc.docs b/debian/apt-doc.docs index a7507f4e7..86aa69ceb 100644 --- a/debian/apt-doc.docs +++ b/debian/apt-doc.docs @@ -1 +1,2 @@ -README.progress-reporting \ No newline at end of file +README.progress-reporting +README.MultiArch -- cgit v1.2.3 From 4cc6f8dc52144f773b96ee99070d1be0821b984e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 13 Feb 2010 01:59:22 +0100 Subject: * apt-pkg/deb/dpkgpm.cc: - stdin redirected to /dev/null takes all CPU (Closes: #569488) Thanks to Aurelien Jarno for providing (again) a patch! --- apt-pkg/deb/dpkgpm.cc | 2 +- debian/changelog | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 565f01b84..3dca2b209 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1005,7 +1005,7 @@ bool pkgDPkgPM::Go(int OutStatusFd) // wait for input or output here FD_ZERO(&rfds); - if (!stdin_is_dev_null) + if (master >= 0 && !stdin_is_dev_null) FD_SET(0, &rfds); FD_SET(_dpkgin, &rfds); if(master >= 0) diff --git a/debian/changelog b/debian/changelog index a81a2abd0..5d2527cbd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,9 @@ apt (0.7.26) UNRELEASED; urgency=low - add APT::FTPArchive::AlwaysStat to disable the too aggressive caching if versions are build multiply times (not recommend) Patch by Christoph Goehre, thanks! (Closes: #463260) + * apt-pkg/deb/dpkgpm.cc: + - stdin redirected to /dev/null takes all CPU (Closes: #569488) + Thanks to Aurelien Jarno for providing (again) a patch! [ Ivan Masár ] * Slovak translation update. Closes: #568294 -- cgit v1.2.3 From 584fb392715b4e6f6c08b0c59352b1c20de8ff99 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 13 Feb 2010 17:22:34 +0100 Subject: - add --arch option for apt-ftparchive packages and contents commands - if an arch is given accept only *_all.deb and *_arch.deb instead of *.deb. Thanks Stephan Bosch for the patch! (Closes: #319710) --- debian/changelog | 3 +++ doc/apt-ftparchive.1.xml | 12 ++++++++++-- ftparchive/apt-ftparchive.cc | 7 ++++--- ftparchive/writer.cc | 30 ++++++++++++++---------------- ftparchive/writer.h | 6 +++--- 5 files changed, 34 insertions(+), 24 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5d2527cbd..addee11cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,9 @@ apt (0.7.26) UNRELEASED; urgency=low - allow also to skip the last patch if target is reached, thanks Bernhard R. Link! (Closes: #545699) * ftparchive/writer.{cc,h}: + - add --arch option for packages and contents commands + - if an arch is given accept only *_all.deb and *_arch.deb instead + of *.deb. Thanks Stephan Bosch for the patch! (Closes: #319710) - add APT::FTPArchive::AlwaysStat to disable the too aggressive caching if versions are build multiply times (not recommend) Patch by Christoph Goehre, thanks! (Closes: #463260) diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index eb61eae51..f88dbe631 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -39,6 +39,7 @@ + @@ -542,11 +543,18 @@ for i in Sections do Make the caching databases read only. Configuration Item: APT::FTPArchive::ReadOnlyDB. - + + + + Accept in the packages and contents + commands only package files matching *_arch.deb or + *_all.deb instead of all package files in the given path. + Configuration Item: APT::FTPArchive::Architecture. + - &apt-ftparchive; caches as much as possible of metadata in it is cachedb. If packages + &apt-ftparchive; caches as much as possible of metadata in a cachedb. If packages are recompiled and/or republished with the same version again, this will lead to problems as the now outdated cached metadata like size and checksums will be used. With this option enabled this will no longer happen as it will be checked if the file was changed. diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index 5b6b3940c..f1a182e52 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -333,7 +333,7 @@ bool PackageMap::GenContents(Configuration &Setup, gettimeofday(&StartTime,0); // Create a package writer object. - ContentsWriter Contents(""); + ContentsWriter Contents("", Arch); if (PkgExt.empty() == false && Contents.SetExts(PkgExt) == false) return _error->Error(_("Package extension list is too long")); if (_error->PendingError() == true) @@ -606,7 +606,7 @@ bool SimpleGenPackages(CommandLine &CmdL) // Create a package writer object. PackagesWriter Packages(_config->Find("APT::FTPArchive::DB"), - Override, ""); + Override, "", _config->Find("APT::FTPArchive::Architecture")); if (_error->PendingError() == true) return false; @@ -629,7 +629,7 @@ bool SimpleGenContents(CommandLine &CmdL) return ShowHelp(CmdL); // Create a package writer object. - ContentsWriter Contents(_config->Find("APT::FTPArchive::DB")); + ContentsWriter Contents(_config->Find("APT::FTPArchive::DB"), _config->Find("APT::FTPArchive::Architecture")); if (_error->PendingError() == true) return false; @@ -910,6 +910,7 @@ int main(int argc, const char *argv[]) {0,"delink","APT::FTPArchive::DeLinkAct",0}, {0,"readonly","APT::FTPArchive::ReadOnlyDB",0}, {0,"contents","APT::FTPArchive::Contents",0}, + {'a',"arch","APT::FTPArchive::Architecture",CommandLine::HasArg}, {'c',"config-file",0,CommandLine::ConfigFile}, {'o',"option",0,CommandLine::ArbItem}, {0,0,0,0}}; diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index 18a3de0c2..9e5b7d4f3 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -54,7 +54,7 @@ inline void SetTFRewriteData(struct TFRewriteData &tfrd, // FTWScanner::FTWScanner - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -FTWScanner::FTWScanner() +FTWScanner::FTWScanner(string const &Arch): Arch(Arch) { ErrorPrinted = false; NoLinkAct = !_config->FindB("APT::FTPArchive::DeLinkAct",true); @@ -299,12 +299,11 @@ bool FTWScanner::Delink(string &FileName,const char *OriginalPath, // --------------------------------------------------------------------- /* */ PackagesWriter::PackagesWriter(string const &DB,string const &Overrides,string const &ExtOverrides, - string const &aArch) : - Db(DB),Stats(Db.Stats), Arch(aArch) + string const &Arch) : + FTWScanner(Arch), Db(DB), Stats(Db.Stats) { Output = stdout; - SetExts(".deb .udeb .foo .bar .baz"); - AddPattern("*.deb"); + SetExts(".deb .udeb"); DeLinkLimit = 0; // Process the command line options @@ -340,17 +339,16 @@ bool FTWScanner::SetExts(string const &Vals) string::size_type Start = 0; while (Start <= Vals.length()-1) { - string::size_type Space = Vals.find(' ',Start); - string::size_type Length; - if (Space == string::npos) + string::size_type const Space = Vals.find(' ',Start); + string::size_type const Length = ((Space == string::npos) ? Vals.length() : Space) - Start; + if ( Arch.empty() == false ) { - Length = Vals.length()-Start; + AddPattern(string("*_") + Arch + Vals.substr(Start, Length)); + AddPattern(string("*_all") + Vals.substr(Start, Length)); } else - { - Length = Space-Start; - } - AddPattern(string("*") + Vals.substr(Start, Length)); + AddPattern(string("*") + Vals.substr(Start, Length)); + Start += Length + 1; } @@ -767,11 +765,11 @@ bool SourcesWriter::DoPackage(string FileName) // ContentsWriter::ContentsWriter - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -ContentsWriter::ContentsWriter(string const &DB) : - Db(DB), Stats(Db.Stats) +ContentsWriter::ContentsWriter(string const &DB, string const &Arch) : + FTWScanner(Arch), Db(DB), Stats(Db.Stats) { - AddPattern("*.deb"); + SetExts(".deb"); Output = stdout; } /*}}}*/ diff --git a/ftparchive/writer.h b/ftparchive/writer.h index 520e91dd6..af7ba4edd 100644 --- a/ftparchive/writer.h +++ b/ftparchive/writer.h @@ -34,6 +34,7 @@ class FTWScanner { protected: vector Patterns; + string Arch; const char *OriginalPath; bool ErrorPrinted; @@ -68,7 +69,7 @@ class FTWScanner void AddPattern(string const &Pattern) { Patterns.push_back(Pattern); }; bool SetExts(string const &Vals); - FTWScanner(); + FTWScanner(string const &Arch = string()); }; class PackagesWriter : public FTWScanner @@ -92,7 +93,6 @@ class PackagesWriter : public FTWScanner string DirStrip; FILE *Output; struct CacheDB::Stats &Stats; - string Arch; inline bool ReadOverride(string const &File) {return Over.ReadOverride(File);}; inline bool ReadExtraOverride(string const &File) @@ -125,7 +125,7 @@ class ContentsWriter : public FTWScanner void Finish() {Gen.Print(Output);}; inline bool ReadyDB(string const &DB) {return Db.ReadyDB(DB);}; - ContentsWriter(string const &DB); + ContentsWriter(string const &DB, string const &Arch = string()); virtual ~ContentsWriter() {}; }; -- cgit v1.2.3 From ee60a63480f7d1a963d7ef2a8e399d0f9b651d71 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 14 Feb 2010 22:24:55 +0100 Subject: Pseudo() doesn't work in the Cache generation step as the check if only one package is in the group will generate false positives - as the others will (maybe) added a little time later in the process. --- apt-pkg/deb/deblistparser.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index bfc0e762e..84eab44a7 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -155,9 +155,10 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver) to a NOP in the download/install step - this package will ensure that it is downloaded only one time and installed only one time -- even if the architecture bound versions coming in and out on regular basis. */ + bool const static multiArch = APT::Configuration::getArchitectures().size() > 1; if (strcmp(Ver.Arch(true),"all") == 0) return true; - else if (Ver.Pseudo() == true) + else if (multiArch == true) { // our pseudo packages have no size to not confuse the fetcher Ver->Size = 0; -- cgit v1.2.3 From 83742b3cf4b541fd61533dfecdc97e0e4502a7a4 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 14 Feb 2010 23:34:56 +0100 Subject: Add support for the LANGUAGE environment variable --- apt-pkg/aptconfiguration.cc | 91 ++++++++++++++++++++++++++-------------- apt-pkg/aptconfiguration.h | 2 +- apt-pkg/contrib/strutl.cc | 2 +- test/libapt/getlanguages_test.cc | 61 ++++++++++++++++++++------- 4 files changed, 108 insertions(+), 48 deletions(-) diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 0fe84db74..f1989599b 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -8,10 +8,11 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#include #include #include +#include #include +#include #include #include @@ -97,7 +98,7 @@ const Configuration::getCompressionTypes(bool const &Cached) { will result in "de_DE, de, en". The special word "none" is the stopcode for the not-All code vector */ std::vector const Configuration::getLanguages(bool const &All, - bool const &Cached, char const * const Locale) { + bool const &Cached, char const ** const Locale) { using std::string; // The detection is boring and has a lot of cornercases, @@ -118,27 +119,29 @@ std::vector const Configuration::getLanguages(bool const &All, } } - // get the environment language code + // get the environment language codes: LC_MESSAGES (and later LANGUAGE) // we extract both, a long and a short code and then we will // check if we actually need both (rare) or if the short is enough - string const envMsg = string(Locale == 0 ? std::setlocale(LC_MESSAGES, NULL) : Locale); + string const envMsg = string(Locale == 0 ? std::setlocale(LC_MESSAGES, NULL) : *Locale); size_t const lenShort = (envMsg.find('_') != string::npos) ? envMsg.find('_') : 2; - size_t const lenLong = (envMsg.find('.') != string::npos) ? envMsg.find('.') : (lenShort + 3); + size_t const lenLong = (envMsg.find_first_of(".@") != string::npos) ? envMsg.find_first_of(".@") : (lenShort + 3); string envLong = envMsg.substr(0,lenLong); string const envShort = envLong.substr(0,lenShort); - bool envLongIncluded = true, envShortIncluded = false; + bool envLongIncluded = true; // first cornercase: LANG=C, so we use only "en" Translation if (envLong == "C") { codes.push_back("en"); + allCodes = codes; return codes; } + // to save the servers from unneeded queries, we only try also long codes + // for languages it is realistic to have a long code translation file… + // TODO: Improve translation acquire system to drop them dynamic + char const *needLong[] = { "cs", "en", "pt", "sv", "zh", NULL }; if (envLong != envShort) { - // to save the servers from unneeded queries, we only try also long codes - // for languages it is realistic to have a long code translation file... - char const *needLong[] = { "cs", "en", "pt", "sv", "zh", NULL }; for (char const **l = needLong; *l != NULL; l++) if (envShort.compare(*l) == 0) { envLongIncluded = false; @@ -156,33 +159,64 @@ std::vector const Configuration::getLanguages(bool const &All, if (oldAcquire.empty() == false && oldAcquire != "environment") { if (oldAcquire != "none") codes.push_back(oldAcquire); + allCodes = codes; return codes; } + // It is very likely we will need to environment codes later, + // so let us generate them now from LC_MESSAGES and LANGUAGE + std::vector environment; + // take care of LC_MESSAGES + if (envLongIncluded == false) + environment.push_back(envLong); + environment.push_back(envShort); + // take care of LANGUAGE + string envLang = Locale == 0 ? getenv("LANGUAGE") : *(Locale+1); + if (envLang.empty() == false) { + std::vector env = ExplodeString(envLang,':'); + short addedLangs = 0; // add a maximum of 3 fallbacks from the environment + for (std::vector::const_iterator e = env.begin(); + e != env.end() && addedLangs < 3; ++e) { + if (unlikely(e->empty() == true) || *e == "en") + continue; + if (*e == envLong || *e == envShort) + continue; + if (std::find(environment.begin(), environment.end(), *e) != environment.end()) + continue; + if (e->find('_') != string::npos) { + // Drop LongCodes here - ShortCodes are also included + string const shorty = e->substr(0, e->find('_')); + char const **n = needLong; + for (; *n != NULL; ++n) + if (shorty == *n) + break; + if (*n == NULL) + continue; + } + ++addedLangs; + environment.push_back(*e); + } + } + // Support settings like Acquire::Translation=none on the command line to // override the configuration settings vector of languages. string const forceLang = _config->Find("Acquire::Languages",""); if (forceLang.empty() == false) { if (forceLang == "environment") { - if (envLongIncluded == false) - codes.push_back(envLong); - if (envShortIncluded == false) - codes.push_back(envShort); - return codes; + codes = environment; } else if (forceLang != "none") codes.push_back(forceLang); + allCodes = codes; return codes; } std::vector const lang = _config->FindVector("Acquire::Languages"); // the default setting -> "environment, en" if (lang.empty() == true) { - if (envLongIncluded == false) - codes.push_back(envLong); - if (envShortIncluded == false) - codes.push_back(envShort); + codes = environment; if (envShort != "en") codes.push_back("en"); + allCodes = codes; return codes; } @@ -192,26 +226,19 @@ std::vector const Configuration::getLanguages(bool const &All, for (std::vector::const_iterator l = lang.begin(); l != lang.end(); l++) { if (*l == "environment") { - if (envLongIncluded == true && envShortIncluded == true) - continue; - if (envLongIncluded == false) { - envLongIncluded = true; - if (noneSeen == false) - codes.push_back(envLong); - allCodes.push_back(envLong); - } - if (envShortIncluded == false) { - envShortIncluded = true; + for (std::vector::const_iterator e = environment.begin(); + e != environment.end(); ++e) { + if (std::find(allCodes.begin(), allCodes.end(), *e) != allCodes.end()) + continue; if (noneSeen == false) - codes.push_back(envShort); - allCodes.push_back(envShort); + codes.push_back(*e); + allCodes.push_back(*e); } continue; } else if (*l == "none") { noneSeen = true; continue; - } else if ((envLongIncluded == true && *l == envLong) || - (envShortIncluded == true && *l == envShort)) + } else if (std::find(allCodes.begin(), allCodes.end(), *l) != allCodes.end()) continue; if (noneSeen == false) diff --git a/apt-pkg/aptconfiguration.h b/apt-pkg/aptconfiguration.h index b6650e20c..dd339d841 100644 --- a/apt-pkg/aptconfiguration.h +++ b/apt-pkg/aptconfiguration.h @@ -64,7 +64,7 @@ public: /*{{{*/ * \return a vector of (all) Language Codes in the prefered usage order */ std::vector static const getLanguages(bool const &All = false, - bool const &Cached = true, char const * const Locale = 0); + bool const &Cached = true, char const ** const Locale = 0); /** \brief Returns a vector of Architectures we support * diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index b285a9f2e..d3d6e2739 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -1012,7 +1012,7 @@ vector ExplodeString(string const &haystack, char const &split) { do { for (; end != haystack.end() && *end != split; ++end); exploded.push_back(string(start, end)); - start = end; + start = end + 1; } while (end != haystack.end() && (++end) != haystack.end()); return exploded; } diff --git a/test/libapt/getlanguages_test.cc b/test/libapt/getlanguages_test.cc index fd3c8269f..fb7afb4ef 100644 --- a/test/libapt/getlanguages_test.cc +++ b/test/libapt/getlanguages_test.cc @@ -16,75 +16,108 @@ void dumpVector(std::vector vec) { int main(int argc,char *argv[]) { - std::vector vec = APT::Configuration::getLanguages(false, false, "de_DE.UTF-8"); + char const* env[2]; + env[0] = "de_DE.UTF-8"; + env[1] = ""; + std::vector vec = APT::Configuration::getLanguages(false, false, env); equals(vec.size(), 2); equals(vec[0], "de"); equals(vec[1], "en"); // Special: Check if the cache is actually in use - vec = APT::Configuration::getLanguages(false, true, "en_GB.UTF-8"); + env[0] = "en_GB.UTF-8"; + vec = APT::Configuration::getLanguages(false, true, env); equals(vec.size(), 2); equals(vec[0], "de"); equals(vec[1], "en"); - vec = APT::Configuration::getLanguages(false, false, "en_GB.UTF-8"); + env[0] = "en_GB.UTF-8"; + vec = APT::Configuration::getLanguages(false, false, env); equals(vec.size(), 2); equals(vec[0], "en_GB"); equals(vec[1], "en"); - vec = APT::Configuration::getLanguages(false, false, "pt_PR.UTF-8"); + env[0] = "tr_DE@euro"; + vec = APT::Configuration::getLanguages(false, false, env); + equals(vec.size(), 2); + equals(vec[0], "tr"); + equals(vec[1], "en"); + + env[0] = "de_NO"; + env[1] = "se_NO:en_GB:nb_NO:nb:no_NO:no:nn_NO:nn:da:sv:en"; + vec = APT::Configuration::getLanguages(false, false, env); + equals(vec.size(), 5); + equals(vec[0], "de"); + equals(vec[1], "en_GB"); + equals(vec[2], "nb"); + equals(vec[3], "no"); + equals(vec[4], "en"); + + env[0] = "pt_PR.UTF-8"; + env[1] = ""; + vec = APT::Configuration::getLanguages(false, false, env); equals(vec.size(), 3); equals(vec[0], "pt_PR"); equals(vec[1], "pt"); equals(vec[2], "en"); - vec = APT::Configuration::getLanguages(false, false, "ast_DE.UTF-8"); // bogus, but syntactical correct + env[0] = "ast_DE.UTF-8"; + vec = APT::Configuration::getLanguages(false, false, env); // bogus, but syntactical correct equals(vec.size(), 2); equals(vec[0], "ast"); equals(vec[1], "en"); - vec = APT::Configuration::getLanguages(false, false, "C"); + env[0] = "C"; + vec = APT::Configuration::getLanguages(false, false, env); equals(vec.size(), 1); equals(vec[0], "en"); _config->Set("Acquire::Languages::1", "environment"); _config->Set("Acquire::Languages::2", "en"); - vec = APT::Configuration::getLanguages(false, false, "de_DE.UTF-8"); + env[0] = "de_DE.UTF-8"; + vec = APT::Configuration::getLanguages(false, false, env); equals(vec.size(), 2); equals(vec[0], "de"); equals(vec[1], "en"); _config->Set("Acquire::Languages::3", "de"); - vec = APT::Configuration::getLanguages(false, false, "de_DE.UTF-8"); + env[0] = "de_DE.UTF-8"; + vec = APT::Configuration::getLanguages(false, false, env); equals(vec.size(), 2); equals(vec[0], "de"); equals(vec[1], "en"); _config->Set("Acquire::Languages::1", "none"); - vec = APT::Configuration::getLanguages(false, false, "de_DE.UTF-8"); + env[0] = "de_DE.UTF-8"; + vec = APT::Configuration::getLanguages(false, false, env); equals(vec.size(), 0); - vec = APT::Configuration::getLanguages(true, false, "de_DE.UTF-8"); + env[0] = "de_DE.UTF-8"; + vec = APT::Configuration::getLanguages(true, false, env); equals(vec[0], "en"); equals(vec[1], "de"); _config->Set("Acquire::Languages::1", "fr"); _config->Set("Acquire::Languages", "de_DE"); - vec = APT::Configuration::getLanguages(false, false, "de_DE.UTF-8"); + env[0] = "de_DE.UTF-8"; + vec = APT::Configuration::getLanguages(false, false, env); equals(vec.size(), 1); equals(vec[0], "de_DE"); _config->Set("Acquire::Languages", "none"); - vec = APT::Configuration::getLanguages(true, false, "de_DE.UTF-8"); + env[0] = "de_DE.UTF-8"; + vec = APT::Configuration::getLanguages(true, false, env); equals(vec.size(), 0); _config->Set("Acquire::Languages", ""); //FIXME: Remove support for this deprecated setting _config->Set("APT::Acquire::Translation", "ast_DE"); - vec = APT::Configuration::getLanguages(true, false, "de_DE.UTF-8"); + env[0] = "de_DE.UTF-8"; + vec = APT::Configuration::getLanguages(true, false, env); equals(vec.size(), 1); equals(vec[0], "ast_DE"); _config->Set("APT::Acquire::Translation", "none"); - vec = APT::Configuration::getLanguages(true, false, "de_DE.UTF-8"); + env[0] = "de_DE.UTF-8"; + vec = APT::Configuration::getLanguages(true, false, env); equals(vec.size(), 0); return 0; -- cgit v1.2.3 From af3f8112590edf58cab36e72bca6d5f8e161fbc3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 15 Feb 2010 00:01:36 +0100 Subject: Activate support of :any and stuff in apt-get build-dep as we have now support for MultiArch, so Multi-Arch: allowed packages should already provide package:any --- cmdline/apt-get.cc | 2 +- debian/changelog | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 5ef5533e2..216383bc6 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2458,7 +2458,7 @@ bool DoBuildDep(CommandLine &CmdL) // Process the build-dependencies vector BuildDeps; - if (Last->BuildDepends(BuildDeps, _config->FindB("APT::Get::Arch-Only",false)) == false) + if (Last->BuildDepends(BuildDeps, _config->FindB("APT::Get::Arch-Only",true)) == false) return _error->Error(_("Unable to get build-dependency information for %s"),Src.c_str()); // Also ensure that build-essential packages are present diff --git a/debian/changelog b/debian/changelog index addee11cd..948846a6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,9 +8,10 @@ apt (0.7.26) UNRELEASED; urgency=low but we support the usage of the new ABI so libapt users can start to prepare for MultiArch (Closes: #536029) * Ignore :qualifiers after package name in build dependencies - for now as long we don't understand them (Closes: #558103) + in the library by default, but try to honour them in apt-get + as we have some sort of MultiArch support ready (Closes: #558103) * apt-pkg/contrib/mmap.{cc,h}: - - extend it to have a growable flag - unused now but maybe... + - extend it to have a growable flag - unused now but maybe… * apt-pkg/pkgcache.h: - use long instead of short for {Ver,Desc}File size, patch from Víctor Manuel Jáquez Leal, thanks! (Closes: #538917) -- cgit v1.2.3 From d44b437bd2897bf7fbfbde07a4511c6f7b9ef6a2 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 15 Feb 2010 13:02:27 +0100 Subject: * buildlib/apti18n.h.in, po/makefile: - add ngettext support with P_() --- buildlib/apti18n.h.in | 3 +++ cmdline/apt-get.cc | 12 +++++++----- debian/changelog | 2 ++ po/makefile | 1 + 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/buildlib/apti18n.h.in b/buildlib/apti18n.h.in index e7beceb09..6928d626c 100644 --- a/buildlib/apti18n.h.in +++ b/buildlib/apti18n.h.in @@ -11,8 +11,10 @@ # include # ifdef APT_DOMAIN # define _(x) dgettext(APT_DOMAIN,x) +# define P_(msg,plural,n) dngettext(APT_DOMAIN,msg,plural,n) # else # define _(x) gettext(x) +# define P_(msg,plural,n) ngettext(msg,plural,n) # endif # define N_(x) x #else @@ -21,5 +23,6 @@ # define textdomain(a) # define bindtextdomain(a, b) # define _(x) x +# define P_(msg,plural,n) (n == 1 ? msg : plural) # define N_(x) x #endif diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 216383bc6..c8c733716 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1526,10 +1526,9 @@ bool DoAutomaticRemove(CacheFile &Cache) // only show stuff in the list that is not yet marked for removal if(Cache[Pkg].Delete() == false) { + ++autoRemoveCount; // we don't need to fill the strings if we don't need them - if (smallList == true) - ++autoRemoveCount; - else + if (smallList == false) { autoremovelist += string(Pkg.Name()) + " "; autoremoveversions += string(Cache[Pkg].CandVersion) + "\n"; @@ -1542,9 +1541,12 @@ bool DoAutomaticRemove(CacheFile &Cache) if (doAutoRemove == false && (autoremovelist.empty() == false || autoRemoveCount != 0)) { if (smallList == false) - ShowList(c1out, _("The following packages were automatically installed and are no longer required:"), autoremovelist, autoremoveversions); + ShowList(c1out, P_("The following package is automatically installed and is no longer required:", + "The following packages were automatically installed and are no longer required:", + autoRemoveCount), autoremovelist, autoremoveversions); else - ioprintf(c1out, _("%lu packages were automatically installed and are no longer required.\n"), autoRemoveCount); + ioprintf(c1out, P_("%lu package was automatically installed and is no longer required.\n", + "%lu packages were automatically installed and are no longer required.\n", autoRemoveCount), autoRemoveCount); c1out << _("Use 'apt-get autoremove' to remove them.") << std::endl; } // Now see if we had destroyed anything (if we had done anything) diff --git a/debian/changelog b/debian/changelog index 948846a6c..f328b11a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,8 @@ apt (0.7.26) UNRELEASED; urgency=low * apt-pkg/deb/dpkgpm.cc: - stdin redirected to /dev/null takes all CPU (Closes: #569488) Thanks to Aurelien Jarno for providing (again) a patch! + * buildlib/apti18n.h.in, po/makefile: + - add ngettext support with P_() [ Ivan Masár ] * Slovak translation update. Closes: #568294 diff --git a/po/makefile b/po/makefile index 07dc51c07..9f8b7b22e 100644 --- a/po/makefile +++ b/po/makefile @@ -37,6 +37,7 @@ $(POTFILES) : $(PO)/%.pot : cat $(PO)/domains/$*/*.srclist > $(PO)/POTFILES_$*.in $(XGETTEXT) --default-domain=$* --directory=$(BASE) \ --add-comments --foreign --keyword=_ --keyword=N_ \ + --keyword=P_:1,2 \ --files-from=$(PO)/POTFILES_$*.in -o $(PO)/domains/$*/c.pot rm -f $(PO)/POTFILES_$*.in $(MSGCOMM) --more-than=0 $(PO)/domains/$*/c.pot $(PO)/domains/$*/sh.pot --output=$@ -- cgit v1.2.3 From 1a31359bfe4fdbf9ac1a25ab0b9f013d37099ac4 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 15 Feb 2010 13:05:53 +0100 Subject: * aptconfiguration.cc: - include all existing Translation files in the Cache (Closes: 564137) Previously if APT was executed with a different LC_* all these invocations needed to rebuild the Cache as too many files were included or missing: Now the lists-directory is checked for Translation-files and all these included in getLanguages() regardless of the environment setting (after a "none" so APT will not use them for displaying information). --- apt-pkg/aptconfiguration.cc | 78 ++++++++++++++++++++++++++++++++++++---- apt-pkg/deb/debmetaindex.cc | 5 ++- debian/changelog | 2 ++ test/libapt/getlanguages_test.cc | 22 ++++++++++-- test/libapt/run-tests.sh | 7 ++++ 5 files changed, 105 insertions(+), 9 deletions(-) diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index f1989599b..429219cbd 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -14,9 +14,12 @@ #include #include -#include -#include +#include +#include + #include +#include +#include /*}}}*/ namespace APT { // getCompressionTypes - Return Vector of usbale compressiontypes /*{{{*/ @@ -119,6 +122,37 @@ std::vector const Configuration::getLanguages(bool const &All, } } + // Include all Language codes we have a Translation file for in /var/lib/apt/lists + // so they will be all included in the Cache. + std::vector builtin; + DIR *D = opendir(_config->FindDir("Dir::State::lists").c_str()); + if (D != 0) { + builtin.push_back("none"); + for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D)) { + string const name = Ent->d_name; + size_t const foundDash = name.rfind("-"); + size_t const foundUnderscore = name.rfind("_"); + if (foundDash == string::npos || foundUnderscore == string::npos || + foundDash <= foundUnderscore || + name.substr(foundUnderscore+1, foundDash-(foundUnderscore+1)) != "Translation") + continue; + string const c = name.substr(foundDash+1); + if (unlikely(c.empty() == true) || c == "en") + continue; + // Skip unusual files, like backups or that alike + string::const_iterator s = c.begin(); + for (;s != c.end(); ++s) { + if (isalpha(*s) == 0) + break; + } + if (s != c.end()) + continue; + if (std::find(builtin.begin(), builtin.end(), c) != builtin.end()) + continue; + builtin.push_back(c); + } + } + // get the environment language codes: LC_MESSAGES (and later LANGUAGE) // we extract both, a long and a short code and then we will // check if we actually need both (rare) or if the short is enough @@ -134,7 +168,11 @@ std::vector const Configuration::getLanguages(bool const &All, if (envLong == "C") { codes.push_back("en"); allCodes = codes; - return codes; + allCodes.insert(allCodes.end(), builtin.begin(), builtin.end()); + if (All == true) + return allCodes; + else + return codes; } // to save the servers from unneeded queries, we only try also long codes @@ -159,8 +197,16 @@ std::vector const Configuration::getLanguages(bool const &All, if (oldAcquire.empty() == false && oldAcquire != "environment") { if (oldAcquire != "none") codes.push_back(oldAcquire); + codes.push_back("en"); allCodes = codes; - return codes; + for (std::vector::const_iterator b = builtin.begin(); + b != builtin.end(); ++b) + if (std::find(allCodes.begin(), allCodes.end(), *b) == allCodes.end()) + allCodes.push_back(*b); + if (All == true) + return allCodes; + else + return codes; } // It is very likely we will need to environment codes later, @@ -207,7 +253,14 @@ std::vector const Configuration::getLanguages(bool const &All, } else if (forceLang != "none") codes.push_back(forceLang); allCodes = codes; - return codes; + for (std::vector::const_iterator b = builtin.begin(); + b != builtin.end(); ++b) + if (std::find(allCodes.begin(), allCodes.end(), *b) == allCodes.end()) + allCodes.push_back(*b); + if (All == true) + return allCodes; + else + return codes; } std::vector const lang = _config->FindVector("Acquire::Languages"); @@ -217,7 +270,14 @@ std::vector const Configuration::getLanguages(bool const &All, if (envShort != "en") codes.push_back("en"); allCodes = codes; - return codes; + for (std::vector::const_iterator b = builtin.begin(); + b != builtin.end(); ++b) + if (std::find(allCodes.begin(), allCodes.end(), *b) == allCodes.end()) + allCodes.push_back(*b); + if (All == true) + return allCodes; + else + return codes; } // the configs define the order, so add the environment @@ -245,6 +305,12 @@ std::vector const Configuration::getLanguages(bool const &All, codes.push_back(*l); allCodes.push_back(*l); } + + for (std::vector::const_iterator b = builtin.begin(); + b != builtin.end(); ++b) + if (std::find(allCodes.begin(), allCodes.end(), *b) == allCodes.end()) + allCodes.push_back(*b); + if (All == true) return allCodes; else diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index eb01a0156..0e4e6df9e 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -214,6 +214,7 @@ bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll) const s != sections.end(); ++s) for (set::const_iterator l = s->second.begin(); l != s->second.end(); l++) { + if (*l == "none") continue; debTranslationsIndex i = debTranslationsIndex(URI,Dist,s->first,(*l).c_str()); i.GetIndexes(Owner); } @@ -268,8 +269,10 @@ vector *debReleaseIndex::GetIndexFiles() { for (map >::const_iterator s = sections.begin(); s != sections.end(); ++s) for (set::const_iterator l = s->second.begin(); - l != s->second.end(); l++) + l != s->second.end(); l++) { + if (*l == "none") continue; Indexes->push_back(new debTranslationsIndex(URI,Dist,s->first,(*l).c_str())); + } return Indexes; } diff --git a/debian/changelog b/debian/changelog index f328b11a7..fdce01098 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,8 @@ apt (0.7.26) UNRELEASED; urgency=low Thanks to Aurelien Jarno for providing (again) a patch! * buildlib/apti18n.h.in, po/makefile: - add ngettext support with P_() + * aptconfiguration.cc: + - include all existing Translation files in the Cache (Closes: 564137) [ Ivan Masár ] * Slovak translation update. Closes: #568294 diff --git a/test/libapt/getlanguages_test.cc b/test/libapt/getlanguages_test.cc index fb7afb4ef..0db190b50 100644 --- a/test/libapt/getlanguages_test.cc +++ b/test/libapt/getlanguages_test.cc @@ -16,9 +16,15 @@ void dumpVector(std::vector vec) { int main(int argc,char *argv[]) { + if (argc != 2) { + std::cout << "One parameter expected - given " << argc << std::endl; + return 100; + } + char const* env[2]; env[0] = "de_DE.UTF-8"; env[1] = ""; + std::vector vec = APT::Configuration::getLanguages(false, false, env); equals(vec.size(), 2); equals(vec[0], "de"); @@ -87,6 +93,16 @@ int main(int argc,char *argv[]) equals(vec[0], "de"); equals(vec[1], "en"); + _config->Set("Dir::State::lists", argv[1]); + vec = APT::Configuration::getLanguages(true, false, env); + equals(vec.size(), 5); + equals(vec[0], "de"); + equals(vec[1], "en"); + equals(vec[2], "none"); + equals(vec[3], "pt"); + equals(vec[4], "tr"); + + _config->Set("Dir::State::lists", "/non-existing-dir"); _config->Set("Acquire::Languages::1", "none"); env[0] = "de_DE.UTF-8"; vec = APT::Configuration::getLanguages(false, false, env); @@ -113,12 +129,14 @@ int main(int argc,char *argv[]) _config->Set("APT::Acquire::Translation", "ast_DE"); env[0] = "de_DE.UTF-8"; vec = APT::Configuration::getLanguages(true, false, env); - equals(vec.size(), 1); + equals(vec.size(), 2); equals(vec[0], "ast_DE"); + equals(vec[1], "en"); _config->Set("APT::Acquire::Translation", "none"); env[0] = "de_DE.UTF-8"; vec = APT::Configuration::getLanguages(true, false, env); - equals(vec.size(), 0); + equals(vec.size(), 1); + equals(vec[0], "en"); return 0; } diff --git a/test/libapt/run-tests.sh b/test/libapt/run-tests.sh index 1fcfb6861..f9df1af5f 100755 --- a/test/libapt/run-tests.sh +++ b/test/libapt/run-tests.sh @@ -39,6 +39,13 @@ do "${tmppath}/01invalíd" ln -s "${tmppath}/anormalfile" "${tmppath}/linkedfile.list" ln -s "${tmppath}/non-existing-file" "${tmppath}/brokenlink.list" + elif [ $name = "getLanguages${EXT}" ]; then + echo "Prepare Testarea for \033[1;35m$name\033[0m ..." + tmppath=$(mktemp -d) + touch "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-tr" \ + "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-pt" \ + "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-se~" \ + "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-st.bak" fi echo -n "Testing with \033[1;35m${name}\033[0m ... " -- cgit v1.2.3 From d6b69b51004b9418478c8d5d5a5c59d5813f1289 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 16 Feb 2010 22:05:10 +0100 Subject: * debian/control: - update with no changes to debian policy 3.8.4 --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fdce01098..9cc632c37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,8 @@ apt (0.7.26) UNRELEASED; urgency=low - add ngettext support with P_() * aptconfiguration.cc: - include all existing Translation files in the Cache (Closes: 564137) + * debian/control: + - update with no changes to debian policy 3.8.4 [ Ivan Masár ] * Slovak translation update. Closes: #568294 diff --git a/debian/control b/debian/control index d756871d1..de2bf6544 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: APT Development Team Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , Luca Bruno , Julian Andres Klode -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ -- cgit v1.2.3 From f1a5db64ad03910c2a401af8baa80fe2354beaa7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 17 Feb 2010 22:05:15 +0100 Subject: add a note about the uncomplete toolchain to sound a bit more scary --- README.MultiArch | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.MultiArch b/README.MultiArch index 92491631e..b2964ac38 100644 --- a/README.MultiArch +++ b/README.MultiArch @@ -7,6 +7,13 @@ usage guide - you have been warned. It is assumed that the reader has at least a bit of knowledge about APT internals, dependency relations and the MultiArch spec [0]. +Note also that the toolchain isn't ready yet, e.g. while you can simulate +the installation of MultiArch packages they will more sooner than later +cause enormous problems if really installed as dpkg can't handle MultiArch +yet (no, --force-{overwrite,architecture} aren't good options here). +Other parts of the big picture are missing and/or untested too. +You have been warned! + The implementation is focused on NOT breaking existing singleArch-only applications and/or systems as this is the current status-quo for all -- cgit v1.2.3 From a1af1f3b1b7700d1108ee7648bce7b9d2c2c506b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 17 Feb 2010 22:09:02 +0100 Subject: * doc/apt_preferences.5.xml: - explicitly warn against careless use (Closes: #567669) --- debian/changelog | 2 ++ doc/apt_preferences.5.xml | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9cc632c37..8a4e2ac20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,8 @@ apt (0.7.26) UNRELEASED; urgency=low - include all existing Translation files in the Cache (Closes: 564137) * debian/control: - update with no changes to debian policy 3.8.4 + * doc/apt_preferences.5.xml: + - explicitly warn against careless use (Closes: #567669) [ Ivan Masár ] * Slovak translation update. Closes: #568294 diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index 9a4791c08..3d7896226 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -14,7 +14,7 @@ &apt-email; &apt-product; - 04 May 2009 + 16 February 2010 @@ -53,6 +53,14 @@ earliest in the &sources-list; file. The APT preferences file does not affect the choice of instance, only the choice of version. +Preferences are a strong power in the hands of a system administrator +but they can become also their biggest nightmare if used without care! +APT will not questioning the preferences so wrong settings will therefore +lead to uninstallable packages or wrong decisions while upgrading packages. +Even more problems will arise if multiply distribution releases are mixed +without a good understanding of the following paragraphs. +You have been warned. + Note that the files in the /etc/apt/preferences.d directory are parsed in alphanumeric ascending order and need to obey the following naming convention: The files have no or "pref" -- cgit v1.2.3 From a536b36571406f1be39a040a25dee4d9cb96bdd6 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 17 Feb 2010 23:40:36 +0100 Subject: releasing version 0.7.25.3ubuntu1 --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index da4885345..f89dc62d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,12 @@ -apt (0.7.25.4ubuntu1) UNRELEASED; urgency=low +apt (0.7.25.3ubuntu1) lucid; urgency=low [ Michael Vogt ] - * merged from the debian-sid branch + * merged with the debian-sid branch [ Ivan Masár ] * Slovak translation update. Closes: #568294 - -- Christian Perrier Wed, 03 Feb 2010 20:08:19 +0100 + -- Michael Vogt Wed, 17 Feb 2010 23:33:32 +0100 apt (0.7.25.3) unstable; urgency=low -- cgit v1.2.3 From b7044b4b7483259f6dbca4fce56320dbde6da02a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 18 Feb 2010 00:55:35 +0100 Subject: doesn't use a default separator in ExplodeString (halfway losted in merge) --- apt-pkg/deb/debmetaindex.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index 0e4e6df9e..947a7f04b 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -313,7 +313,7 @@ class debSLTypeDebian : public pkgSourceList::Type { map::const_iterator const arch = Options.find("arch"); vector const Archs = - (arch != Options.end()) ? ExplodeString(arch->second) : + (arch != Options.end()) ? ExplodeString(arch->second, ',') : APT::Configuration::getArchitectures(); for (vector::const_iterator I = List.begin(); -- cgit v1.2.3 From 6563d0d4899d5b787842f16135fd05da878cfb45 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 19 Feb 2010 21:21:53 +0100 Subject: "Switch" to dpkg-source 3.0 (native) format --- debian/changelog | 6 ++++++ debian/source/format | 1 + 2 files changed, 7 insertions(+) create mode 100644 debian/source/format diff --git a/debian/changelog b/debian/changelog index ca731d11b..2b5f6fd25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apt (0.7.26) UNRELEASED; urgency=low + + * Switch to dpkg-source 3.0 (native) format + + -- David Kalnischkies Fri, 19 Feb 2010 21:21:43 +0100 + apt (0.7.26~exp2) experimental; urgency=low * fix crash when LANGUAGE is not set diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) -- cgit v1.2.3 From a94263ba750c561ecf40241104970bc303cbc0b7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 25 Feb 2010 19:51:05 +0100 Subject: * cmdline/apt-mark: - don't crash if no arguments are given (Closes: #570962) --- cmdline/apt-mark | 4 ++++ debian/changelog | 2 ++ 2 files changed, 6 insertions(+) diff --git a/cmdline/apt-mark b/cmdline/apt-mark index 2326ece38..f4f6aa576 100755 --- a/cmdline/apt-mark +++ b/cmdline/apt-mark @@ -76,6 +76,10 @@ if __name__ == "__main__": help="print verbose status messages to stdout") (options, args) = parser.parse_args() + if not args: + parser.print_help() + sys.exit(1) + # get the state-file if not options.filename: STATE_FILE = apt_pkg.Config.FindDir("Dir::State") + "extended_states" diff --git a/debian/changelog b/debian/changelog index 2b5f6fd25..c59b81af5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ apt (0.7.26) UNRELEASED; urgency=low * Switch to dpkg-source 3.0 (native) format + * cmdline/apt-mark: + - don't crash if no arguments are given (Closes: #570962) -- David Kalnischkies Fri, 19 Feb 2010 21:21:43 +0100 -- cgit v1.2.3 From d1082b44827dc90ddeffb246f3eacfff387a9c5e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Feb 2010 20:19:06 +0100 Subject: * debian/control: - remove some years old and obsolete Replaces --- debian/changelog | 2 ++ debian/control | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index c59b81af5..9fc481276 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ apt (0.7.26) UNRELEASED; urgency=low * Switch to dpkg-source 3.0 (native) format * cmdline/apt-mark: - don't crash if no arguments are given (Closes: #570962) + * debian/control: + - remove some years old and obsolete Replaces -- David Kalnischkies Fri, 19 Feb 2010 21:21:43 +0100 diff --git a/debian/control b/debian/control index de2bf6544..daff242f0 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,6 @@ Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Package: apt Architecture: any Depends: ${shlibs:Depends}, debian-archive-keyring, ${misc:Depends} -Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt Description: Advanced front-end for dpkg @@ -27,7 +26,6 @@ Package: apt-doc Architecture: all Priority: optional Depends: ${misc:Depends} -Replaces: apt (<< 0.5.4.9) Section: doc Description: Documentation for APT This package contains the user guide and offline guide, for APT, an @@ -56,7 +54,6 @@ Package: apt-utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Provides: ${libapt-inst:provides} -Replaces: apt (<< 0.5.9) Description: APT utility programs This package contains some APT utility programs such as apt-ftparchive, apt-sortpkgs and apt-extracttemplates. -- cgit v1.2.3 From 75ce206243e409b170d06723430eb85a4a747882 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Feb 2010 20:47:19 +0100 Subject: move ShowPkg() from apt-get to the PkgIterator and rename it to FullName() responseable for displaying a package name and the architecture in a uniform way. Pretty option can be used to not append the architecture if it is the native architecture or all - and use it all over the place in the commandline tools. --- apt-pkg/cacheiterators.h | 1 + apt-pkg/pkgcache.cc | 12 ++++++++ cmdline/apt-cache.cc | 59 +++++++++++++++++------------------ cmdline/apt-get.cc | 80 ++++++++++++++++++++---------------------------- 4 files changed, 75 insertions(+), 77 deletions(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 43cbe1377..a64326a44 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -151,6 +151,7 @@ class pkgCache::PkgIterator: public Iterator { //Nice printable representation friend std::ostream& operator <<(std::ostream& out, PkgIterator i); + std::string FullName(bool const &Pretty = false) const; // Constructors inline PkgIterator(pkgCache &Owner,Package *Trg) : Iterator(Owner, Trg), HashIndex(0) { diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 29c27b58e..24d9e0329 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -445,6 +445,18 @@ operator<<(ostream& out, pkgCache::PkgIterator Pkg) return out; } /*}}}*/ +// PkgIterator::FullName - Returns Name and (maybe) Architecture /*{{{*/ +// --------------------------------------------------------------------- +/* Returns a name:arch string */ +std::string pkgCache::PkgIterator::FullName(bool const &Pretty) const +{ + string fullname = Name(); + if (Pretty == false || + (strcmp(Arch(), "all") != 0 && _config->Find("APT::Architecture") != Arch())) + return fullname.append(":").append(Arch()); + return fullname; +} + /*}}}*/ // DepIterator::IsCritical - Returns true if the dep is important /*{{{*/ // --------------------------------------------------------------------- /* Currently critical deps are defined as depends, predepends and diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 8323a740e..355e9aefb 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -139,7 +139,7 @@ bool UnMet(CommandLine &CmdL) // Oops, it failed.. if (Header == false) ioprintf(cout,_("Package %s version %s has an unmet dep:\n"), - P.Name(),V.VerStr()); + P.FullName(true).c_str(),V.VerStr()); Header = true; // Print out the dep type @@ -149,7 +149,7 @@ bool UnMet(CommandLine &CmdL) Start = RealStart; do { - cout << Start.TargetPkg().Name(); + cout << Start.TargetPkg().FullName(true); if (Start.TargetVer() != 0) cout << " (" << Start.CompType() << " " << Start.TargetVer() << ")"; @@ -182,7 +182,7 @@ bool DumpPackage(CommandLine &CmdL) continue; } - cout << "Package: " << Pkg.Name() << endl; + cout << "Package: " << Pkg.FullName(true) << endl; cout << "Versions: " << endl; for (pkgCache::VerIterator Cur = Pkg.VersionList(); Cur.end() != true; Cur++) { @@ -204,7 +204,7 @@ bool DumpPackage(CommandLine &CmdL) cout << "Reverse Depends: " << endl; for (pkgCache::DepIterator D = Pkg.RevDependsList(); D.end() != true; D++) { - cout << " " << D.ParentPkg().Name() << ',' << D.TargetPkg().Name(); + cout << " " << D.ParentPkg().FullName(true) << ',' << D.TargetPkg().FullName(true); if (D->Version != 0) cout << ' ' << DeNull(D.TargetVer()) << endl; else @@ -216,7 +216,7 @@ bool DumpPackage(CommandLine &CmdL) { cout << Cur.VerStr() << " - "; for (pkgCache::DepIterator Dep = Cur.DependsList(); Dep.end() != true; Dep++) - cout << Dep.TargetPkg().Name() << " (" << (int)Dep->CompareOp << " " << DeNull(Dep.TargetVer()) << ") "; + cout << Dep.TargetPkg().FullName(true) << " (" << (int)Dep->CompareOp << " " << DeNull(Dep.TargetVer()) << ") "; cout << endl; } @@ -225,12 +225,12 @@ bool DumpPackage(CommandLine &CmdL) { cout << Cur.VerStr() << " - "; for (pkgCache::PrvIterator Prv = Cur.ProvidesList(); Prv.end() != true; Prv++) - cout << Prv.ParentPkg().Name() << " "; + cout << Prv.ParentPkg().FullName(true) << " "; cout << endl; } cout << "Reverse Provides: " << endl; for (pkgCache::PrvIterator Prv = Pkg.ProvidesList(); Prv.end() != true; Prv++) - cout << Prv.OwnerPkg().Name() << " " << Prv.OwnerVer().VerStr() << endl; + cout << Prv.OwnerPkg().FullName(true) << " " << Prv.OwnerVer().VerStr() << endl; } return true; @@ -353,13 +353,13 @@ bool Dump(CommandLine &Cmd) for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++) { - cout << "Package: " << P.Name() << endl; + cout << "Package: " << P.FullName(true) << endl; for (pkgCache::VerIterator V = P.VersionList(); V.end() == false; V++) { cout << " Version: " << V.VerStr() << endl; cout << " File: " << V.FileList().File().FileName() << endl; for (pkgCache::DepIterator D = V.DependsList(); D.end() == false; D++) - cout << " Depends: " << D.TargetPkg().Name() << ' ' << + cout << " Depends: " << D.TargetPkg().FullName(true) << ' ' << DeNull(D.TargetVer()) << endl; for (pkgCache::DescIterator D = V.DescriptionList(); D.end() == false; D++) { @@ -570,11 +570,11 @@ bool Depends(CommandLine &CmdL) pkgCache::VerIterator Ver = Pkg.VersionList(); if (Ver.end() == true) { - cout << '<' << Pkg.Name() << '>' << endl; + cout << '<' << Pkg.FullName(true) << '>' << endl; continue; } - cout << Pkg.Name() << endl; + cout << Pkg.FullName(true) << endl; for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; D++) { @@ -596,9 +596,9 @@ bool Depends(CommandLine &CmdL) // Show the package if (Trg->VersionList == 0) - cout << D.DepType() << ": <" << Trg.Name() << ">" << endl; + cout << D.DepType() << ": <" << Trg.FullName(true) << ">" << endl; else - cout << D.DepType() << ": " << Trg.Name() << endl; + cout << D.DepType() << ": " << Trg.FullName(true) << endl; if (Recurse == true) Colours[D.TargetPkg()->ID]++; @@ -614,7 +614,7 @@ bool Depends(CommandLine &CmdL) if (V != Cache.VerP + V.ParentPkg()->VersionList || V->ParentPkg == D->Package) continue; - cout << " " << V.ParentPkg().Name() << endl; + cout << " " << V.ParentPkg().FullName(true) << endl; if (Recurse == true) Colours[D.ParentPkg()->ID]++; @@ -663,11 +663,11 @@ bool RDepends(CommandLine &CmdL) pkgCache::VerIterator Ver = Pkg.VersionList(); if (Ver.end() == true) { - cout << '<' << Pkg.Name() << '>' << endl; + cout << '<' << Pkg.FullName(true) << '>' << endl; continue; } - cout << Pkg.Name() << endl; + cout << Pkg.FullName(true) << endl; cout << "Reverse Depends:" << endl; for (pkgCache::DepIterator D = Pkg.RevDependsList(); D.end() == false; D++) @@ -684,9 +684,9 @@ bool RDepends(CommandLine &CmdL) cout << " "; if (Trg->VersionList == 0) - cout << D.DepType() << ": <" << Trg.Name() << ">" << endl; + cout << D.DepType() << ": <" << Trg.FullName(true) << ">" << endl; else - cout << Trg.Name() << endl; + cout << Trg.FullName(true) << endl; if (Recurse == true) Colours[D.ParentPkg()->ID]++; @@ -702,7 +702,7 @@ bool RDepends(CommandLine &CmdL) if (V != Cache.VerP + V.ParentPkg()->VersionList || V->ParentPkg == D->Package) continue; - cout << " " << V.ParentPkg().Name() << endl; + cout << " " << V.ParentPkg().FullName(true) << endl; if (Recurse == true) Colours[D.ParentPkg()->ID]++; @@ -863,7 +863,7 @@ bool XVcg(CommandLine &CmdL) // Only graph critical deps if (D.IsCritical() == true) { - printf ("edge: { sourcename: \"%s\" targetname: \"%s\" class: 2 ",Pkg.Name(), D.TargetPkg().Name() ); + printf ("edge: { sourcename: \"%s\" targetname: \"%s\" class: 2 ",Pkg.FullName(true).c_str(), D.TargetPkg().FullName(true).c_str() ); // Colour the node for recursion if (Show[D.TargetPkg()->ID] <= DoneNR) @@ -922,10 +922,10 @@ bool XVcg(CommandLine &CmdL) continue; if (Show[Pkg->ID] == DoneNR) - printf("node: { title: \"%s\" label: \"%s\" color: orange shape: %s }\n", Pkg.Name(), Pkg.Name(), + printf("node: { title: \"%s\" label: \"%s\" color: orange shape: %s }\n", Pkg.FullName(true).c_str(), Pkg.FullName(true).c_str(), Shapes[ShapeMap[Pkg->ID]]); else - printf("node: { title: \"%s\" label: \"%s\" shape: %s }\n", Pkg.Name(), Pkg.Name(), + printf("node: { title: \"%s\" label: \"%s\" shape: %s }\n", Pkg.FullName(true).c_str(), Pkg.FullName(true).c_str(), Shapes[ShapeMap[Pkg->ID]]); } @@ -1084,7 +1084,7 @@ bool Dotty(CommandLine &CmdL) // Only graph critical deps if (D.IsCritical() == true) { - printf("\"%s\" -> \"%s\"",Pkg.Name(),D.TargetPkg().Name()); + printf("\"%s\" -> \"%s\"",Pkg.FullName(true).c_str(),D.TargetPkg().FullName(true).c_str()); // Colour the node for recursion if (Show[D.TargetPkg()->ID] <= DoneNR) @@ -1138,10 +1138,10 @@ bool Dotty(CommandLine &CmdL) // Orange box for early recursion stoppage if (Show[Pkg->ID] == DoneNR) - printf("\"%s\" [color=orange,shape=%s];\n",Pkg.Name(), + printf("\"%s\" [color=orange,shape=%s];\n",Pkg.FullName(true).c_str(), Shapes[ShapeMap[Pkg->ID]]); else - printf("\"%s\" [shape=%s];\n",Pkg.Name(), + printf("\"%s\" [shape=%s];\n",Pkg.FullName(true).c_str(), Shapes[ShapeMap[Pkg->ID]]); } @@ -1561,7 +1561,7 @@ bool Policy(CommandLine &CmdL) continue; // Print the package name and the version we are forcing to - cout << " " << I.Name() << " -> "; + cout << " " << I.FullName(true) << " -> "; pkgCache::VerIterator V = Plcy.GetMatch(I); if (V.end() == true) @@ -1590,10 +1590,7 @@ bool Policy(CommandLine &CmdL) if (strcmp(Pkg.Arch(),"all") == 0) continue; - if (myArch == Pkg.Arch()) - cout << Pkg.Name() << ":" << endl; - else - cout << Pkg.Name() << ": [" << Pkg.Arch() << "]" << endl; + cout << Pkg.FullName(true) << ":" << endl; // Installed version cout << _(" Installed: "); @@ -1691,7 +1688,7 @@ bool Madison(CommandLine &CmdL) { if ((*IF)->FindInCache(*(VF.File().Cache())) == VF.File()) { - cout << setw(10) << Pkg.Name() << " | " << setw(10) << V.VerStr() << " | " + cout << setw(10) << Pkg.FullName(true) << " | " << setw(10) << V.VerStr() << " | " << (*IF)->Describe(true) << endl; } } diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index c8c733716..4596c3d61 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -227,17 +227,6 @@ bool ShowList(ostream &out,string Title,string List,string VersionsList) return false; } /*}}}*/ -// ShowPkg - display a package name /*{{{*/ -// --------------------------------------------------------------------- -/* Displays the package name and maybe also the architecture - if it is not the main architecture */ -string ShowPkg(pkgCache::PkgIterator const Pkg) { - string p = Pkg.Name(); - if (strcmp(Pkg.Arch(),"all") != 0 && _config->Find("APT::Architecture") != Pkg.Arch()) - p.append(":").append(Pkg.Arch()); - return p; -} - /*}}}*/ // ShowBroken - Debugging aide /*{{{*/ // --------------------------------------------------------------------- /* This prints out the names of all the packages that are broken along @@ -269,8 +258,8 @@ void ShowBroken(ostream &out,CacheFile &Cache,bool Now) } // Print out each package and the failed dependencies - out << " " << ShowPkg(I) << " :"; - unsigned const Indent = ShowPkg(I).size() + 3; + out << " " << I.FullName(true) << " :"; + unsigned const Indent = I.FullName(true).size() + 3; bool First = true; pkgCache::VerIterator Ver; @@ -323,7 +312,7 @@ void ShowBroken(ostream &out,CacheFile &Cache,bool Now) out << ' ' << End.DepType() << ": "; FirstOr = false; - out << ShowPkg(Start.TargetPkg()); + out << Start.TargetPkg().FullName(true); // Show a quick summary of the version requirements if (Start.TargetVer() != 0) @@ -387,7 +376,7 @@ void ShowNew(ostream &out,CacheFile &Cache) if (Cache[I].NewInstall() == true) { if (Cache[I].CandidateVerIter(Cache).Pseudo() == true) continue; - List += ShowPkg(I) + " "; + List += I.FullName(true) + " "; VersionsList += string(Cache[I].CandVersion) + "\n"; } } @@ -412,9 +401,9 @@ void ShowDel(ostream &out,CacheFile &Cache) if (Cache[I].CandidateVerIter(Cache).Pseudo() == true) continue; if ((Cache[I].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge) - List += ShowPkg(I) + "* "; + List += I.FullName(true) + "* "; else - List += ShowPkg(I) + " "; + List += I.FullName(true) + " "; VersionsList += string(Cache[I].CandVersion)+ "\n"; } @@ -439,7 +428,7 @@ void ShowKept(ostream &out,CacheFile &Cache) I->CurrentVer == 0 || Cache[I].Delete() == true) continue; - List += ShowPkg(I) + " "; + List += I.FullName(true) + " "; VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n"; } ShowList(out,_("The following packages have been kept back:"),List,VersionsList); @@ -462,7 +451,7 @@ void ShowUpgraded(ostream &out,CacheFile &Cache) if (Cache[I].CandidateVerIter(Cache).Pseudo() == true) continue; - List += ShowPkg(I) + " "; + List += I.FullName(true) + " "; VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n"; } ShowList(out,_("The following packages will be upgraded:"),List,VersionsList); @@ -485,7 +474,7 @@ bool ShowDowngraded(ostream &out,CacheFile &Cache) if (Cache[I].CandidateVerIter(Cache).Pseudo() == true) continue; - List += ShowPkg(I) + " "; + List += I.FullName(true) + " "; VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n"; } return ShowList(out,_("The following packages will be DOWNGRADED:"),List,VersionsList); @@ -503,7 +492,7 @@ bool ShowHold(ostream &out,CacheFile &Cache) pkgCache::PkgIterator I(Cache,Cache.List[J]); if (Cache[I].InstallVer != (pkgCache::Version *)I.CurrentVer() && I->SelectedState == pkgCache::State::Hold) { - List += ShowPkg(I) + " "; + List += I.FullName(true) + " "; VersionsList += string(Cache[I].CurVersion) + " => " + Cache[I].CandVersion + "\n"; } } @@ -537,7 +526,7 @@ bool ShowEssential(ostream &out,CacheFile &Cache) if (Added[I->ID] == false) { Added[I->ID] = true; - List += ShowPkg(I) + " "; + List += I.FullName(true) + " "; //VersionsList += string(Cache[I].CurVersion) + "\n"; ??? } } @@ -561,7 +550,7 @@ bool ShowEssential(ostream &out,CacheFile &Cache) Added[P->ID] = true; char S[300]; - snprintf(S,sizeof(S),_("%s (due to %s) "),P.Name(),I.Name()); + snprintf(S,sizeof(S),_("%s (due to %s) "),P.FullName(true).c_str(),I.FullName(true).c_str()); List += S; //VersionsList += "\n"; ??? } @@ -1106,7 +1095,7 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, if (found_one == true) { ioprintf(c1out,_("Note, selecting %s instead of %s\n"), - Prov.Name(),Pkg.Name()); + Prov.FullName(true).c_str(),Pkg.FullName(true).c_str()); Pkg = Prov; } } @@ -1117,7 +1106,7 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, { if (AllowFail == true) ioprintf(c1out,_("Skipping %s, it is already installed and upgrade is not set.\n"), - Pkg.Name()); + Pkg.FullName(true).c_str()); return true; } @@ -1134,7 +1123,7 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, if (AllowFail == false) return false; - ioprintf(c1out,_("Package %s is not installed, so not removed\n"),Pkg.Name()); + ioprintf(c1out,_("Package %s is not installed, so not removed\n"),Pkg.FullName(true).c_str()); return true; } @@ -1146,7 +1135,7 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, if (Pkg->ProvidesList != 0) { ioprintf(c1out,_("Package %s is a virtual package provided by:\n"), - Pkg.Name()); + Pkg.FullName(true).c_str()); pkgCache::PrvIterator I = Pkg.ProvidesList(); for (; I.end() == false; I++) @@ -1156,10 +1145,10 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, if (Cache[Pkg].CandidateVerIter(Cache) == I.OwnerVer()) { if (Cache[Pkg].Install() == true && Cache[Pkg].NewInstall() == false) - c1out << " " << Pkg.Name() << " " << I.OwnerVer().VerStr() << + c1out << " " << Pkg.FullName(true) << " " << I.OwnerVer().VerStr() << _(" [Installed]") << endl; else - c1out << " " << Pkg.Name() << " " << I.OwnerVer().VerStr() << endl; + c1out << " " << Pkg.FullName(true) << " " << I.OwnerVer().VerStr() << endl; } } c1out << _("You should explicitly select one to install.") << endl; @@ -1169,7 +1158,7 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, ioprintf(c1out, _("Package %s is not available, but is referred to by another package.\n" "This may mean that the package is missing, has been obsoleted, or\n" - "is only available from another source\n"),Pkg.Name()); + "is only available from another source\n"),Pkg.FullName(true).c_str()); string List; string VersionsList; @@ -1183,13 +1172,13 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, if (Seen[Dep.ParentPkg()->ID] == true) continue; Seen[Dep.ParentPkg()->ID] = true; - List += string(Dep.ParentPkg().Name()) + " "; + List += Dep.ParentPkg().FullName(true) + " "; //VersionsList += string(Dep.ParentPkg().CurVersion) + "\n"; ??? } ShowList(c1out,_("However the following packages replace it:"),List,VersionsList); } - _error->Error(_("Package %s has no installation candidate"),Pkg.Name()); + _error->Error(_("Package %s has no installation candidate"),Pkg.FullName(true).c_str()); return false; } @@ -1210,7 +1199,7 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, { if (Pkg->CurrentVer == 0 || Pkg.CurrentVer().Downloadable() == false) ioprintf(c1out,_("Reinstallation of %s is not possible, it cannot be downloaded.\n"), - Pkg.Name()); + Pkg.FullName(true).c_str()); else Cache.SetReInstall(Pkg,true); } @@ -1218,7 +1207,7 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, { if (AllowFail == true) ioprintf(c1out,_("%s is already the newest version.\n"), - Pkg.Name()); + Pkg.FullName(true).c_str()); } } else @@ -1247,15 +1236,15 @@ bool TryToChangeVer(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, { if (IsRel == true) return _error->Error(_("Release '%s' for '%s' was not found"), - VerTag,Pkg.Name()); + VerTag,Pkg.FullName(true).c_str()); return _error->Error(_("Version '%s' for '%s' was not found"), - VerTag,Pkg.Name()); + VerTag,Pkg.FullName(true).c_str()); } if (strcmp(VerTag,Ver.VerStr()) != 0) { ioprintf(c1out,_("Selected version %s (%s) for %s\n"), - Ver.VerStr(),Ver.RelStr().c_str(),Pkg.Name()); + Ver.VerStr(),Ver.RelStr().c_str(),Pkg.FullName(true).c_str()); } Cache.SetCandidateVersion(Ver); @@ -1511,7 +1500,7 @@ bool DoAutomaticRemove(CacheFile &Cache) { if(Pkg.CurrentVer() != 0 || Cache[Pkg].Install()) if(Debug) - std::cout << "We could delete %s" << Pkg.Name() << std::endl; + std::cout << "We could delete %s" << Pkg.FullName(true).c_str() << std::endl; if (doAutoRemove) { @@ -1530,7 +1519,7 @@ bool DoAutomaticRemove(CacheFile &Cache) // we don't need to fill the strings if we don't need them if (smallList == false) { - autoremovelist += string(Pkg.Name()) + " "; + autoremovelist += Pkg.FullName(true) + " "; autoremoveversions += string(Cache[Pkg].CandVersion) + "\n"; } } @@ -1804,7 +1793,7 @@ bool DoInstall(CommandLine &CmdL) _config->FindB("APT::Get::Download-Only",false) == false) { ioprintf(c1out,_("%s set to manually installed.\n"), - Pkg.Name()); + Pkg.FullName(true).c_str()); Cache->MarkAuto(Pkg,false); AutoMarkChanged++; } @@ -1873,7 +1862,7 @@ bool DoInstall(CommandLine &CmdL) break; if (*J == 0) { - List += string(I.Name()) + " "; + List += I.FullName(true) + " "; VersionsList += string(Cache[I].CandVersion) + "\n"; } } @@ -1909,7 +1898,7 @@ bool DoInstall(CommandLine &CmdL) for(;;) { /* Skip if package is installed already, or is about to be */ - string target = string(Start.TargetPkg().Name()) + " "; + string target = Start.TargetPkg().FullName(true) + " "; if ((*Start.TargetPkg()).SelectedState == pkgCache::State::Install || Cache[Start.TargetPkg()].Install()) @@ -2559,7 +2548,7 @@ bool DoBuildDep(CommandLine &CmdL) for (; Prv.end() != true; Prv++) { if (_config->FindB("Debug::BuildDeps",false) == true) - cout << " Checking provider " << Prv.OwnerPkg().Name() << endl; + cout << " Checking provider " << Prv.OwnerPkg().FullName() << endl; if ((*Cache)[Prv.OwnerPkg()].InstVerIter(*Cache).end() == false) break; @@ -2600,7 +2589,7 @@ bool DoBuildDep(CommandLine &CmdL) if (Prv.end() == false) { if (_config->FindB("Debug::BuildDeps",false) == true) - cout << " Is provided by installed package " << Prv.OwnerPkg().Name() << endl; + cout << " Is provided by installed package " << Prv.OwnerPkg().FullName() << endl; skipAlternatives = hasAlternatives; continue; } @@ -2625,7 +2614,7 @@ bool DoBuildDep(CommandLine &CmdL) return _error->Error(_("Failed to satisfy %s dependency for %s: Installed package %s is too new"), Last->BuildDepType((*D).Type), Src.c_str(), - Pkg.Name()); + Pkg.FullName(true).c_str()); } } @@ -2674,7 +2663,6 @@ bool DoBuildDep(CommandLine &CmdL) return true; } /*}}}*/ - // DoMoo - Never Ask, Never Tell /*{{{*/ // --------------------------------------------------------------------- /* */ -- cgit v1.2.3 From 06afffcc24f339e8735acd4698af6e5995ad24aa Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 27 Feb 2010 02:02:25 +0100 Subject: =?UTF-8?q?*=20apt-pkg/contrib/mmap.{h,cc}:=20=20=20-=20add=20char?= =?UTF-8?q?[]=20fallback=20for=20filesystems=20without=20shared=20writable?= =?UTF-8?q?=20=20=20=20=20mmap()=20like=20JFFS2.=20Thanks=20to=20Marius=20?= =?UTF-8?q?Vollmer=20for=20writing=20=20=20=20=20and=20to=20Lo=C3=AFc=20Mi?= =?UTF-8?q?nier=20for=20pointing=20to=20the=20patch!=20(Closes:=20#314334)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apt-pkg/contrib/mmap.cc | 70 +++++++++++++++++++++++++++++++++++++++++-------- apt-pkg/contrib/mmap.h | 5 ++++ debian/changelog | 4 +++ 3 files changed, 68 insertions(+), 11 deletions(-) diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index f440f9489..b3f29032c 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -27,6 +27,7 @@ #include #include #include +#include #include /*}}}*/ @@ -35,7 +36,7 @@ // --------------------------------------------------------------------- /* */ MMap::MMap(FileFd &F,unsigned long Flags) : Flags(Flags), iSize(0), - Base(0) + Base(0), SyncToFd(NULL) { if ((Flags & NoImmMap) != NoImmMap) Map(F); @@ -45,7 +46,7 @@ MMap::MMap(FileFd &F,unsigned long Flags) : Flags(Flags), iSize(0), // --------------------------------------------------------------------- /* */ MMap::MMap(unsigned long Flags) : Flags(Flags), iSize(0), - Base(0) + Base(0), SyncToFd(NULL) { } /*}}}*/ @@ -78,7 +79,24 @@ bool MMap::Map(FileFd &Fd) // Map it. Base = mmap(0,iSize,Prot,Map,Fd.Fd(),0); if (Base == (void *)-1) - return _error->Errno("mmap",_("Couldn't make mmap of %lu bytes"),iSize); + { + if (errno == ENODEV || errno == EINVAL) + { + // The filesystem doesn't support this particular kind of mmap. + // So we allocate a buffer and read the whole file into it. + int const dupped_fd = dup(Fd.Fd()); + if (dupped_fd == -1) + return _error->Errno("mmap", _("Couldn't duplicate file descriptor %i"), Fd.Fd()); + + Base = new unsigned char[iSize]; + SyncToFd = new FileFd (dupped_fd); + if (!SyncToFd->Seek(0L) || !SyncToFd->Read(Base, iSize)) + return false; + } + else + return _error->Errno("mmap",_("Couldn't make mmap of %lu bytes"), + iSize); + } return true; } @@ -93,10 +111,19 @@ bool MMap::Close(bool DoSync) if (DoSync == true) Sync(); - - if (munmap((char *)Base,iSize) != 0) - _error->Warning("Unable to munmap"); - + + if (SyncToFd != NULL) + { + delete[] (char *)Base; + delete SyncToFd; + SyncToFd = NULL; + } + else + { + if (munmap((char *)Base, iSize) != 0) + _error->WarningE("mmap", _("Unable to close mmap")); + } + iSize = 0; Base = 0; return true; @@ -113,8 +140,18 @@ bool MMap::Sync() #ifdef _POSIX_SYNCHRONIZED_IO if ((Flags & ReadOnly) != ReadOnly) - if (msync((char *)Base,iSize,MS_SYNC) < 0) - return _error->Errno("msync","Unable to write mmap"); + { + if (SyncToFd != NULL) + { + if (!SyncToFd->Seek(0) || !SyncToFd->Write(Base, iSize)) + return false; + } + else + { + if (msync((char *)Base, iSize, MS_SYNC) < 0) + return _error->Errno("msync", _("Unable to synchronize mmap")); + } + } #endif return true; } @@ -130,8 +167,19 @@ bool MMap::Sync(unsigned long Start,unsigned long Stop) #ifdef _POSIX_SYNCHRONIZED_IO unsigned long PSize = sysconf(_SC_PAGESIZE); if ((Flags & ReadOnly) != ReadOnly) - if (msync((char *)Base+(int)(Start/PSize)*PSize,Stop - Start,MS_SYNC) < 0) - return _error->Errno("msync","Unable to write mmap"); + { + if (SyncToFd != 0) + { + if (!SyncToFd->Seek(0) || + !SyncToFd->Write (((char *)Base)+Start, Stop-Start)) + return false; + } + else + { + if (msync((char *)Base+(int)(Start/PSize)*PSize,Stop - Start,MS_SYNC) < 0) + return _error->Errno("msync", _("Unable to synchronize mmap")); + } + } #endif return true; } diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h index cd2b15ba2..5ca951204 100644 --- a/apt-pkg/contrib/mmap.h +++ b/apt-pkg/contrib/mmap.h @@ -44,6 +44,11 @@ class MMap unsigned long iSize; void *Base; + // In case mmap can not be used, we keep a dup of the file + // descriptor that should have been mmaped so that we can write to + // the file in Sync(). + FileFd *SyncToFd; + bool Map(FileFd &Fd); bool Close(bool DoSync = true); diff --git a/debian/changelog b/debian/changelog index 9fc481276..39cc70da9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,10 @@ apt (0.7.26) UNRELEASED; urgency=low - don't crash if no arguments are given (Closes: #570962) * debian/control: - remove some years old and obsolete Replaces + * apt-pkg/contrib/mmap.{h,cc}: + - add char[] fallback for filesystems without shared writable + mmap() like JFFS2. Thanks to Marius Vollmer for writing + and to Loïc Minier for pointing to the patch! (Closes: #314334) -- David Kalnischkies Fri, 19 Feb 2010 21:21:43 +0100 -- cgit v1.2.3 From e0b94b97b179812e5a0b3b72ea9fcae106d545c5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 27 Feb 2010 17:01:12 +0100 Subject: Enable the AutoRemover to talk "Multi-Arch" by marking all pseudo packages in a group if one is marked. The auto-installed flag is from now on Architecture bound: A section without an architecture tag will be treated as applying to all architectures - the next write operation will take care of this by creating separate sections for the architectures. --- apt-pkg/depcache.cc | 170 +++++++++++++++++++++++++++++++++------------------- apt-pkg/depcache.h | 4 +- 2 files changed, 109 insertions(+), 65 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index eeb74a434..45c614c6f 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -165,34 +165,46 @@ bool pkgDepCache::Init(OpProgress *Prog) bool pkgDepCache::readStateFile(OpProgress *Prog) /*{{{*/ { FileFd state_file; - string state = _config->FindDir("Dir::State") + "extended_states"; + string const state = _config->FindDir("Dir::State") + "extended_states"; if(FileExists(state)) { state_file.Open(state, FileFd::ReadOnly); - int file_size = state_file.Size(); + int const file_size = state_file.Size(); if(Prog != NULL) Prog->OverallProgress(0, file_size, 1, _("Reading state information")); pkgTagFile tagfile(&state_file); pkgTagSection section; - int amt=0; - bool debug_autoremove=_config->FindB("Debug::pkgAutoRemove",false); + int amt = 0; + bool const debug_autoremove = _config->FindB("Debug::pkgAutoRemove",false); while(tagfile.Step(section)) { - string pkgname = section.FindS("Package"); - pkgCache::PkgIterator pkg=Cache->FindPkg(pkgname); - // Silently ignore unknown packages and packages with no actual - // version. - if(!pkg.end() && !pkg.VersionList().end()) { - short reason = section.FindI("Auto-Installed", 0); - if(reason > 0) - PkgState[pkg->ID].Flags |= Flag::Auto; - if(debug_autoremove) - std::cout << "Auto-Installed : " << pkgname << std::endl; - amt+=section.size(); - if(Prog != NULL) - Prog->OverallProgress(amt, file_size, 1, - _("Reading state information")); + string const pkgname = section.FindS("Package"); + string pkgarch = section.FindS("Architecture"); + if (pkgarch.empty() == true) + pkgarch = "any"; + pkgCache::PkgIterator pkg = Cache->FindPkg(pkgname, pkgarch); + // Silently ignore unknown packages and packages with no actual version. + if(pkg.end() == true || pkg->VersionList == 0) + continue; + + short const reason = section.FindI("Auto-Installed", 0); + if(reason > 0) + { + PkgState[pkg->ID].Flags |= Flag::Auto; + if (unlikely(debug_autoremove)) + std::cout << "Auto-Installed : " << pkg.FullName() << std::endl; + if (pkgarch == "any") + { + pkgCache::GrpIterator G = pkg.Group(); + for (pkg = G.NextPkg(pkg); pkg.end() != true; pkg = G.NextPkg(pkg)) + if (pkg->VersionList != 0) + PkgState[pkg->ID].Flags |= Flag::Auto; + } } + amt += section.size(); + if(Prog != NULL) + Prog->OverallProgress(amt, file_size, 1, + _("Reading state information")); } if(Prog != NULL) Prog->OverallProgress(file_size, file_size, 1, @@ -204,13 +216,13 @@ bool pkgDepCache::readStateFile(OpProgress *Prog) /*{{{*/ /*}}}*/ bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly) /*{{{*/ { - bool debug_autoremove = _config->FindB("Debug::pkgAutoRemove",false); + bool const debug_autoremove = _config->FindB("Debug::pkgAutoRemove",false); if(debug_autoremove) std::clog << "pkgDepCache::writeStateFile()" << std::endl; FileFd StateFile; - string state = _config->FindDir("Dir::State") + "extended_states"; + string const state = _config->FindDir("Dir::State") + "extended_states"; // if it does not exist, create a empty one if(!FileExists(state)) @@ -225,7 +237,7 @@ bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly) /*{{{*/ state.c_str()); FILE *OutFile; - string outfile = state + ".tmp"; + string const outfile = state + ".tmp"; if((OutFile = fopen(outfile.c_str(),"w")) == NULL) return _error->Error(_("Failed to write temporary StateFile %s"), outfile.c_str()); @@ -236,46 +248,54 @@ bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly) /*{{{*/ std::set pkgs_seen; const char *nullreorderlist[] = {0}; while(tagfile.Step(section)) { - string pkgname = section.FindS("Package"); + string const pkgname = section.FindS("Package"); + string pkgarch = section.FindS("Architecture"); + if (pkgarch.empty() == true) + pkgarch = "native"; // Silently ignore unknown packages and packages with no actual // version. - pkgCache::PkgIterator pkg=Cache->FindPkg(pkgname); + pkgCache::PkgIterator pkg = Cache->FindPkg(pkgname, pkgarch); if(pkg.end() || pkg.VersionList().end()) continue; - bool newAuto = (PkgState[pkg->ID].Flags & Flag::Auto); + bool const newAuto = (PkgState[pkg->ID].Flags & Flag::Auto); if(_config->FindB("Debug::pkgAutoRemove",false)) std::clog << "Update existing AutoInstall info: " - << pkg.Name() << std::endl; - TFRewriteData rewrite[2]; - rewrite[0].Tag = "Auto-Installed"; - rewrite[0].Rewrite = newAuto ? "1" : "0"; + << pkg.FullName() << std::endl; + TFRewriteData rewrite[3]; + rewrite[0].Tag = "Architecture"; + rewrite[0].Rewrite = pkg.Arch(); rewrite[0].NewTag = 0; - rewrite[1].Tag = 0; + rewrite[1].Tag = "Auto-Installed"; + rewrite[1].Rewrite = newAuto ? "1" : "0"; + rewrite[1].NewTag = 0; + rewrite[2].Tag = 0; TFRewrite(OutFile, section, nullreorderlist, rewrite); fprintf(OutFile,"\n"); - pkgs_seen.insert(pkgname); + pkgs_seen.insert(pkg.FullName()); } // then write the ones we have not seen yet std::ostringstream ostr; for(pkgCache::PkgIterator pkg=Cache->PkgBegin(); !pkg.end(); pkg++) { if(PkgState[pkg->ID].Flags & Flag::Auto) { - if (pkgs_seen.find(pkg.Name()) != pkgs_seen.end()) { + if (pkgs_seen.find(pkg.FullName()) != pkgs_seen.end()) { if(debug_autoremove) - std::clog << "Skipping already written " << pkg.Name() << std::endl; + std::clog << "Skipping already written " << pkg.FullName() << std::endl; continue; } - // skip not installed ones if requested - if(InstalledOnly && pkg->CurrentVer == 0) - continue; + // skip not installed ones if requested + if(InstalledOnly && pkg->CurrentVer == 0) + continue; + const char* const pkgarch = pkg.Arch(); + if (strcmp(pkgarch, "all") == 0) + continue; if(debug_autoremove) - std::clog << "Writing new AutoInstall: " - << pkg.Name() << std::endl; + std::clog << "Writing new AutoInstall: " << pkg.FullName() << std::endl; ostr.str(string("")); - ostr << "Package: " << pkg.Name() + ostr << "Package: " << pkg.Name() + << "\nArchitecture: " << pkgarch << "\nAuto-Installed: 1\n\n"; fprintf(OutFile,"%s",ostr.str().c_str()); - fprintf(OutFile,"\n"); } } fclose(OutFile); @@ -1426,7 +1446,7 @@ bool pkgDepCache::MarkRequired(InRootSetFunc &userFunc) // debug output if(debug_autoremove && PkgState[p->ID].Flags & Flag::Auto) - std::clog << "AutoDep: " << p.Name() << std::endl; + std::clog << "AutoDep: " << p.FullName() << std::endl; } // init vars @@ -1460,13 +1480,18 @@ bool pkgDepCache::MarkRequired(InRootSetFunc &userFunc) // MarkPackage - mark a single package in Mark-and-Sweep /*{{{*/ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, const pkgCache::VerIterator &ver, - bool follow_recommends, - bool follow_suggests) + bool const &follow_recommends, + bool const &follow_suggests) { pkgDepCache::StateCache &state = PkgState[pkg->ID]; - VerIterator currver = pkg.CurrentVer(); - VerIterator candver = state.CandidateVerIter(*this); - VerIterator instver = state.InstVerIter(*this); + + // if we are marked already we are done + if(state.Marked) + return; + + VerIterator const currver = pkg.CurrentVer(); + VerIterator const candver = state.CandidateVerIter(*this); + VerIterator const instver = state.InstVerIter(*this); #if 0 // If a package was garbage-collected but is now being marked, we @@ -1492,15 +1517,11 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, !(ver == currver && instver.end() && !ver.end())) return; - // if we are marked already we are done - if(state.Marked) - return; + bool const debug_autoremove = _config->FindB("Debug::pkgAutoRemove", false); - bool debug_autoremove = _config->FindB("Debug::pkgAutoRemove", false); - if(debug_autoremove) { - std::clog << "Marking: " << pkg.Name(); + std::clog << "Marking: " << pkg.FullName(); if(!ver.end()) std::clog << " " << ver.VerStr(); if(!currver.end()) @@ -1512,8 +1533,34 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, state.Marked=true; - if(!ver.end()) + if(ver.end() == true) + return; + + // If the version belongs to a Multi-Arch all package + // we will mark all others in this Group with this version also + // Beware: We compare versions here the lazy way: string comparision + // this is bad if multiple repositories provide different versions + // of the package with an identical version number - but even in this + // case the dependencies are likely the same. + if (ver->MultiArch == pkgCache::Version::All && + strcmp(ver.Arch(true), "all") == 0) { + GrpIterator G = pkg.Group(); + const char* const VerStr = ver.VerStr(); + for (PkgIterator P = G.FindPkg("any"); + P.end() != true; P = G.NextPkg(P)) + { + for (VerIterator V = P.VersionList(); + V.end() != true; ++V) + { + if (strcmp(VerStr, V.VerStr()) != 0) + continue; + MarkPackage(P, V, follow_recommends, follow_suggests); + break; + } + } + } + for(DepIterator d = ver.DependsList(); !d.end(); ++d) { if(d->Type == Dep::Depends || @@ -1531,10 +1578,9 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, { if(debug_autoremove) { - std::clog << "Following dep: " << d.ParentPkg().Name() + std::clog << "Following dep: " << d.ParentPkg().FullName() << " " << d.ParentVer().VerStr() << " " - << d.DepType() << " " - << d.TargetPkg().Name(); + << d.DepType() << " " << d.TargetPkg().FullName(); if((d->CompareOp & ~pkgCache::Dep::Or) != pkgCache::Dep::NoOp) { std::clog << " (" << d.CompType() << " " @@ -1542,7 +1588,7 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, } std::clog << std::endl; } - MarkPackage(V.ParentPkg(), V, + MarkPackage(V.ParentPkg(), V, follow_recommends, follow_suggests); } } @@ -1555,17 +1601,16 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, { if(debug_autoremove) { - std::clog << "Following dep: " << d.ParentPkg().Name() - << " " << d.ParentVer().VerStr() << " " - << d.DepType() << " " - << d.TargetPkg().Name(); + std::clog << "Following dep: " << d.ParentPkg().FullName() << " " + << d.ParentVer().VerStr() << " " + << d.DepType() << " " << d.TargetPkg().FullName() << " "; if((d->CompareOp & ~pkgCache::Dep::Or) != pkgCache::Dep::NoOp) { std::clog << " (" << d.CompType() << " " << d.TargetVer() << ")"; } std::clog << ", provided by " - << prv.OwnerPkg().Name() << " " + << prv.OwnerPkg().FullName() << " " << prv.OwnerVer().VerStr() << std::endl; } @@ -1576,7 +1621,6 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, } } } - } } /*}}}*/ bool pkgDepCache::Sweep() /*{{{*/ @@ -1598,7 +1642,7 @@ bool pkgDepCache::Sweep() /*{{{*/ { state.Garbage=true; if(debug_autoremove) - std::cout << "Garbage: " << p.Name() << std::endl; + std::cout << "Garbage: " << p.FullName() << std::endl; } } diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index ab1021a44..23b29cc13 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -79,8 +79,8 @@ class pkgDepCache : protected pkgCache::Namespace */ void MarkPackage(const pkgCache::PkgIterator &pkg, const pkgCache::VerIterator &ver, - bool follow_recommends, - bool follow_suggests); + bool const &follow_recommends, + bool const &follow_suggests); /** \brief Update the Marked field of all packages. * -- cgit v1.2.3 From a04cd1f9a580867d65be8f1ecb3eac25a86eb953 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 28 Feb 2010 19:45:05 +0100 Subject: Fix the PkgFileIterator Constructor which defaults to the wrong value. (0 instead of the HeaderP) This breaks the Cache Validation functionality as the end() doesn't test for NULL. (The fault was introduced with the rewriting of the CacheIterators) --- apt-pkg/cacheiterators.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index a64326a44..28e062f3c 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -345,7 +345,8 @@ class pkgCache::PkgFileIterator : public Iterator // Constructors inline PkgFileIterator() : Iterator() {}; - inline PkgFileIterator(pkgCache &Owner,PackageFile *Trg = 0) : Iterator(Owner, Trg) {}; + inline PkgFileIterator(pkgCache &Owner) : Iterator(Owner, Owner.PkgFileP) {}; + inline PkgFileIterator(pkgCache &Owner,PackageFile *Trg) : Iterator(Owner, Trg) {}; }; /*}}}*/ // Version File /*{{{*/ -- cgit v1.2.3 From 4a6d21639f807ae82d5a51a92c4bbbd0ca2a4494 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 28 Feb 2010 22:45:34 +0100 Subject: Create Pins for all group members instead of only for native architecture --- apt-pkg/policy.cc | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc index f9901bc9a..0b8c1a81b 100644 --- a/apt-pkg/policy.cc +++ b/apt-pkg/policy.cc @@ -187,35 +187,38 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator Pkg) void pkgPolicy::CreatePin(pkgVersionMatch::MatchType Type,string Name, string Data,signed short Priority) { - Pin *P = 0; - if (Name.empty() == true) - P = &*Defaults.insert(Defaults.end(),PkgPin()); - else { - // Get a spot to put the pin - pkgCache::PkgIterator Pkg = Cache->FindPkg(Name); - if (Pkg.end() == true) + Pin *P = &*Defaults.insert(Defaults.end(),PkgPin()); + P->Type = Type; + P->Priority = Priority; + P->Data = Data; + return; + } + + // Get a spot to put the pin + pkgCache::GrpIterator Grp = Cache->FindGrp(Name); + for (pkgCache::PkgIterator Pkg = Grp.FindPkg("any"); + Pkg.end() != true; Pkg = Grp.NextPkg(Pkg)) + { + Pin *P = 0; + if (Pkg.end() == false) + P = Pins + Pkg->ID; + else { // Check the unmatched table - for (vector::iterator I = Unmatched.begin(); + for (vector::iterator I = Unmatched.begin(); I != Unmatched.end() && P == 0; I++) if (I->Pkg == Name) P = &*I; - + if (P == 0) - P = &*Unmatched.insert(Unmatched.end(),PkgPin()); + P = &*Unmatched.insert(Unmatched.end(),PkgPin()); } - else - { - P = Pins + Pkg->ID; - } + P->Type = Type; + P->Priority = Priority; + P->Data = Data; } - - // Set.. - P->Type = Type; - P->Priority = Priority; - P->Data = Data; } /*}}}*/ // Policy::GetMatch - Get the matching version for a package pin /*{{{*/ -- cgit v1.2.3 From 70ae240915df3ef89715d71d5fe7a6910cbf057e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 1 Mar 2010 15:27:55 +0100 Subject: Remove and Unpack operations should not be ignored for pseudo packages - they should trigger the remove/unpack of the "all" package. Otherwise - as this package has no dependencies - it will be triggered to late. The Configuration step doesn't need it as the "all" package is a dependency of the pseudo-package, so it will be configured before the pseudo packages are tried: So at this step the ignorance is okay. Also IsMissing() should report the status of the all package if an pseudo package is checked instead of always reporting no-miss. --- apt-pkg/orderlist.cc | 11 ++++++----- apt-pkg/packagemanager.cc | 13 +++++++++---- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index 2e7618b55..7c950292a 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -127,8 +127,9 @@ bool pkgOrderList::IsMissing(PkgIterator Pkg) if (FileList[Pkg->ID].empty() == false) return false; + // Missing Pseudo packages are missing if the real package is missing if (pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == true) - return false; + return IsMissing(Pkg.Group().FindPkg("all")); return true; } @@ -203,7 +204,7 @@ bool pkgOrderList::OrderCritical() { PkgIterator P(Cache,*I); if (IsNow(P) == true) - clog << " " << P.Name() << ' ' << IsMissing(P) << ',' << IsFlag(P,After) << endl; + clog << " " << P.FullName() << ' ' << IsMissing(P) << ',' << IsFlag(P,After) << endl; } } @@ -276,7 +277,7 @@ bool pkgOrderList::OrderUnpack(string *FileList) { PkgIterator P(Cache,*I); if (IsNow(P) == true) - clog << " " << P.Name() << ' ' << IsMissing(P) << ',' << IsFlag(P,After) << endl; + clog << " " << P.FullName() << ' ' << IsMissing(P) << ',' << IsFlag(P,After) << endl; } } @@ -547,7 +548,7 @@ bool pkgOrderList::VisitNode(PkgIterator Pkg) if (Debug == true) { for (int j = 0; j != Depth; j++) clog << ' '; - clog << "Visit " << Pkg.Name() << endl; + clog << "Visit " << Pkg.FullName() << endl; } Depth++; @@ -606,7 +607,7 @@ bool pkgOrderList::VisitNode(PkgIterator Pkg) if (Debug == true) { for (int j = 0; j != Depth; j++) clog << ' '; - clog << "Leave " << Pkg.Name() << ' ' << IsFlag(Pkg,Added) << ',' << IsFlag(Pkg,AddPending) << endl; + clog << "Leave " << Pkg.FullName() << ' ' << IsFlag(Pkg,Added) << ',' << IsFlag(Pkg,AddPending) << endl; } return true; diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index db882721e..35cc24550 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -470,6 +470,8 @@ bool pkgPackageManager::SmartRemove(PkgIterator Pkg) if (pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == false) return Remove(Pkg,(Cache[Pkg].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge); + else + return SmartRemove(Pkg.Group().FindPkg("all")); return true; } /*}}}*/ @@ -584,11 +586,14 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg) for (PrvIterator P = Cache[Pkg].InstVerIter(Cache).ProvidesList(); P.end() == false; P++) CheckRConflicts(Pkg,P.ParentPkg().RevDependsList(),P.ProvideVersion()); - - if (pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == false && - Install(Pkg,FileNames[Pkg->ID]) == false) + + if (pkgCache::VerIterator(Cache, Cache[Pkg].CandidateVer).Pseudo() == false) + { + if(Install(Pkg,FileNames[Pkg->ID]) == false) + return false; + } else if (SmartUnPack(Pkg.Group().FindPkg("all")) == false) return false; - + List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States); // Perform immedate configuration of the package. -- cgit v1.2.3 From 1ec1653cd4849423e0d5f769ecbfab2d6f16c4ad Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 1 Mar 2010 21:59:03 +0100 Subject: We need to kill also pseudo packages which have no dependency, no installed reverse dependency and which also doesn't provide something. They cause problems if this pseudo packages get new dependencies. As a consequence we also need to recheck the dependencies of a killed pseudo package (and especially the providers of these dependencies) to really kill all non required packages. --- apt-pkg/depcache.cc | 77 ++++++++++++++++++++++++++++++++++++++++++++--------- apt-pkg/depcache.h | 1 + 2 files changed, 66 insertions(+), 12 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 45c614c6f..893164ea1 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -630,11 +630,46 @@ bool pkgDepCache::RemovePseudoInstalledPkg(PkgIterator &Pkg, std::setMultiArch != Version::All) return false; - unsigned char const DepState = VersionState(V.DependsList(),DepInstall,DepInstMin,DepInstPolicy); - if ((DepState & DepInstMin) == DepInstMin) + // Never ever kill an "all" package - they have no dependency so they can't be broken + if (strcmp(Pkg.Arch(),"all") == 0) return false; - // Dependencies for this arch all are not statisfied +// std::cout << "CHECK " << Pkg << std::endl; + + unsigned char const DepState = VersionState(V.DependsList(),DepInstall,DepInstMin,DepInstPolicy); + if ((DepState & DepInstMin) == DepInstMin) { + // okay, the package isn't broken, but is the package also required? + // If it has no real dependencies, no installed rdepends and doesn't + // provide something of value, we will kill it as not required. + // These pseudopackages have otherwise interesting effects if they get + // a new dependency in a newer version… + for (pkgCache::DepIterator D = V.DependsList(); + D.end() != true; ++D) + if ((D->Type == pkgCache::Dep::Depends || + D->Type == pkgCache::Dep::PreDepends) && + D.ParentPkg()->Group != Pkg->Group) + return false; + for (DepIterator D = Pkg.RevDependsList(); D.end() != true; ++D) + { + if (D->Type != pkgCache::Dep::Depends && + D->Type != pkgCache::Dep::PreDepends) + continue; + PkgIterator const P = D.ParentPkg(); + if (P->CurrentVer != 0) + return false; + } + for (PrvIterator Prv = V.ProvidesList(); Prv.end() != true; Prv++) + for (DepIterator d = Prv.ParentPkg().RevDependsList(); + d.end() != true; ++d) + { + PkgIterator const P = d.ParentPkg(); + if (P->CurrentVer != 0 && + P->Group != Pkg->Group) + return false; + } + } + + // Dependencies for this arch all package are not statisfied // so we installed it only for our convenience: get right of it now. RemoveSizes(Pkg); RemoveStates(Pkg); @@ -655,15 +690,33 @@ bool pkgDepCache::RemovePseudoInstalledPkg(PkgIterator &Pkg, std::setCurrentVer != 0) - recheck.insert(P.Index()); - } + for (DepIterator d = V.DependsList(); d.end() != true; ++d) + { + PkgIterator const P = d.TargetPkg(); + for (PrvIterator Prv = P.ProvidesList(); Prv.end() != true; ++Prv) + { + PkgIterator const O = Prv.OwnerPkg(); + if (O->CurrentVer != 0) + recheck.insert(O.Index()); + } + + if (P->CurrentVer != 0) + recheck.insert(P.Index()); + } + + for (PrvIterator Prv = V.ProvidesList(); Prv.end() != true; Prv++) + { + for (DepIterator d = Prv.ParentPkg().RevDependsList(); + d.end() != true; ++d) + { + PkgIterator const P = d.ParentPkg(); + if (P->CurrentVer == 0) + continue; + + recheck.insert(P.Index()); + } + } + return true; } diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 23b29cc13..ea605f199 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -332,6 +332,7 @@ class pkgDepCache : protected pkgCache::Namespace inline operator pkgCache &() {return *Cache;}; inline Header &Head() {return *Cache->HeaderP;}; inline PkgIterator PkgBegin() {return Cache->PkgBegin();}; + inline GrpIterator FindGrp(string const &Name) {return Cache->FindGrp(Name);}; inline PkgIterator FindPkg(string const &Name) {return Cache->FindPkg(Name);}; inline PkgIterator FindPkg(string const &Name, string const &Arch) {return Cache->FindPkg(Name, Arch);}; -- cgit v1.2.3 From 5e5d20643487fd1693af418bd1201be5802c232d Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 1 Mar 2010 22:47:17 +0100 Subject: fix compiler error if compiled with -std=c++0x --- apt-pkg/algorithms.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index c905cffa9..f8a9e210c 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -535,11 +535,11 @@ void pkgProblemResolver::MakeScores() // Important Required Standard Optional Extra signed short PrioMap[] = { 0, - _config->FindI("pkgProblemResolver::Scores::Important",3), - _config->FindI("pkgProblemResolver::Scores::Required",2), - _config->FindI("pkgProblemResolver::Scores::Standard",1), - _config->FindI("pkgProblemResolver::Scores::Optional",-1), - _config->FindI("pkgProblemResolver::Scores::Extra",-2) + (signed short) _config->FindI("pkgProblemResolver::Scores::Important",3), + (signed short) _config->FindI("pkgProblemResolver::Scores::Required",2), + (signed short) _config->FindI("pkgProblemResolver::Scores::Standard",1), + (signed short) _config->FindI("pkgProblemResolver::Scores::Optional",-1), + (signed short) _config->FindI("pkgProblemResolver::Scores::Extra",-2) }; signed short PrioEssentials = _config->FindI("pkgProblemResolver::Scores::Essentials",100); signed short PrioInstalledAndNotObsolete = _config->FindI("pkgProblemResolver::Scores::NotObsolete",1); -- cgit v1.2.3 From 37049546fc18d93f4387917bc9b8181e8adeb3fa Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 2 Mar 2010 18:55:18 +0100 Subject: * doc/apt_preferences.5.xml: - fix two typos and be more verbose in the novice warning. Thanks to Osamu Aoki for pointing it out! (Closes: #567669) --- debian/changelog | 3 +++ doc/apt_preferences.5.xml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 39cc70da9..417c23e8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ apt (0.7.26) UNRELEASED; urgency=low - add char[] fallback for filesystems without shared writable mmap() like JFFS2. Thanks to Marius Vollmer for writing and to Loïc Minier for pointing to the patch! (Closes: #314334) + * doc/apt_preferences.5.xml: + - fix two typos and be more verbose in the novice warning. + Thanks to Osamu Aoki for pointing it out! (Closes: #567669) -- David Kalnischkies Fri, 19 Feb 2010 21:21:43 +0100 diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index 3d7896226..e773ad144 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -59,6 +59,9 @@ APT will not questioning the preferences so wrong settings will therefore lead to uninstallable packages or wrong decisions while upgrading packages. Even more problems will arise if multiply distribution releases are mixed without a good understanding of the following paragraphs. +Packages included in a specific release aren't tested in and +therefore doesn't always work as expected in older or newer releases or +together with other packages from different releases. You have been warned. Note that the files in the /etc/apt/preferences.d -- cgit v1.2.3 From 5bdd31d56d4ae367f85195de327017c748ad7e89 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 2 Mar 2010 18:57:27 +0100 Subject: ignore the autogenerated files and directories in abicheck/ --- .bzrignore | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bzrignore b/.bzrignore index ac276b3fb..c4cd052a7 100644 --- a/.bzrignore +++ b/.bzrignore @@ -11,6 +11,15 @@ configure buildlib/config.sub buildlib/config.guess +# abichecker related files/dir +abicheck/apt_build.xml +abicheck/apt_installed.xml +abicheck/compat_reports/ +abicheck/descriptors_storage/ +abicheck/header_compile_errors/ +abicheck/test_results/ +abicheck/tests/ + # generated files in the progress to build all # apt man pages and other documentation doc/*.1 -- cgit v1.2.3 From cf0e078c440226e0009bb861486b974a03842f7b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 3 Mar 2010 21:29:01 +0100 Subject: fix memory leak in getLanguages() by closing the directory after checking --- apt-pkg/aptconfiguration.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 10613f11d..f3f94dce3 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -152,6 +152,7 @@ std::vector const Configuration::getLanguages(bool const &All, builtin.push_back(c); } } + closedir(D); // get the environment language codes: LC_MESSAGES (and later LANGUAGE) // we extract both, a long and a short code and then we will -- cgit v1.2.3 From 3ddcd175889e6dd3f332914f391d458035424861 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 8 Mar 2010 17:48:33 +0100 Subject: * debian/apt.conf.autoremove: - add "transitional" to the APT::Never-MarkAuto-Sections --- debian/apt.conf.autoremove | 5 +++++ debian/changelog | 2 ++ 2 files changed, 7 insertions(+) diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove index 42081014a..2fb6aeff5 100644 --- a/debian/apt.conf.autoremove +++ b/debian/apt.conf.autoremove @@ -14,5 +14,10 @@ APT "restricted/metapackages"; "universe/metapackages"; "multiverse/metapackages"; + "transitional"; + "restricted/transitional"; + "universe/transitional"; + "multiverse/transitional"; + }; }; diff --git a/debian/changelog b/debian/changelog index 4dfe6210c..dc12d25fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ apt (0.7.25.3ubuntu2) UNRELEASED; urgency=low * abicheck/ - add new abitest tester using the ABI Compliance Checker from http://ispras.linuxfoundation.org/index.php/ABI_compliance_checker + * debian/apt.conf.autoremove: + - add "transitional" to the APT::Never-MarkAuto-Sections [ Robert Collins ] * Change the package index Info methods to allow apt-cache policy to be -- cgit v1.2.3 From 3ed9acb90edb6fac452af21b2bb277ddb6ee63dc Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 8 Mar 2010 17:55:39 +0100 Subject: add "oldlibs" to the APT::Never-MarkAuto-Sections as its used for transitional packages --- debian/apt.conf.autoremove | 8 ++++---- debian/changelog | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove index 2fb6aeff5..44e6eb69c 100644 --- a/debian/apt.conf.autoremove +++ b/debian/apt.conf.autoremove @@ -14,10 +14,10 @@ APT "restricted/metapackages"; "universe/metapackages"; "multiverse/metapackages"; - "transitional"; - "restricted/transitional"; - "universe/transitional"; - "multiverse/transitional"; + "oldlibs"; + "restricted/oldlibs"; + "universe/oldlibs"; + "multiverse/oldlibs"; }; }; diff --git a/debian/changelog b/debian/changelog index dc12d25fd..8af45b1a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,8 @@ apt (0.7.25.3ubuntu2) UNRELEASED; urgency=low - add new abitest tester using the ABI Compliance Checker from http://ispras.linuxfoundation.org/index.php/ABI_compliance_checker * debian/apt.conf.autoremove: - - add "transitional" to the APT::Never-MarkAuto-Sections + - add "oldlibs" to the APT::Never-MarkAuto-Sections as its used + for transitional packages [ Robert Collins ] * Change the package index Info methods to allow apt-cache policy to be -- cgit v1.2.3 From 569cc9349d26cc6a886111023df21ba569b1ffbe Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 12 Mar 2010 10:56:25 +0100 Subject: * apt-pkg/deb/dpkgpm.cc: - fix error message construction in OpenLog() --- apt-pkg/deb/dpkgpm.cc | 16 +++++++++------- debian/changelog | 2 ++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index fb6054f79..ad1ea77fd 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -564,35 +564,37 @@ void pkgDPkgPM::WriteHistoryTag(string tag, string value) // DPkgPM::OpenLog /*{{{*/ bool pkgDPkgPM::OpenLog() { - string logdir = _config->FindDir("Dir::Log"); + string const logdir = _config->FindDir("Dir::Log"); if(not FileExists(logdir)) return _error->Error(_("Directory '%s' missing"), logdir.c_str()); // get current time char timestr[200]; - time_t t = time(NULL); - struct tm *tmp = localtime(&t); + time_t const t = time(NULL); + struct tm const * const tmp = localtime(&t); strftime(timestr, sizeof(timestr), "%F %T", tmp); // open terminal log - string logfile_name = flCombine(logdir, + string const logfile_name = flCombine(logdir, _config->Find("Dir::Log::Terminal")); if (!logfile_name.empty()) { term_out = fopen(logfile_name.c_str(),"a"); if (term_out == NULL) - return _error->WarningE(_("Could not open file '%s'"), logfile_name.c_str()); + return _error->WarningE("OpenLog", _("Could not open file '%s'"), logfile_name.c_str()); chmod(logfile_name.c_str(), 0600); fprintf(term_out, "\nLog started: %s\n", timestr); } - // write - string history_name = flCombine(logdir, + // write your history + string const history_name = flCombine(logdir, _config->Find("Dir::Log::History")); if (!history_name.empty()) { history_out = fopen(history_name.c_str(),"a"); + if (history_out == NULL) + return _error->WarningE("OpenLog", _("Could not open file '%s'"), history_name.c_str()); chmod(history_name.c_str(), 0644); fprintf(history_out, "\nStart-Date: %s\n", timestr); string remove, purge, install, upgrade, downgrade; diff --git a/debian/changelog b/debian/changelog index 417c23e8c..d1983ee9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ apt (0.7.26) UNRELEASED; urgency=low * doc/apt_preferences.5.xml: - fix two typos and be more verbose in the novice warning. Thanks to Osamu Aoki for pointing it out! (Closes: #567669) + * apt-pkg/deb/dpkgpm.cc: + - fix error message construction in OpenLog() -- David Kalnischkies Fri, 19 Feb 2010 21:21:43 +0100 -- cgit v1.2.3 From 6cd9fbd763298816e5d010703ceb9ffad0c235c9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 12 Mar 2010 10:59:37 +0100 Subject: * cmdline/apt-get.cc: - add a --only-upgrade flag to install command (Closes: #572259) That is NOT what is requested in e.g. #74067 - this is a very simple flag which behaves orthogonal to --no-upgrade not a full-blown upgrade option for a single package instead of the whole package set. --- cmdline/apt-get.cc | 14 +++++++++++++- debian/changelog | 2 ++ doc/apt-get.8.xml | 7 +++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 5a814e255..b35e16b92 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1098,7 +1098,17 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, Pkg.Name()); return true; } - + + // Ignore request for install if package would be new + if (_config->FindB("APT::Get::Only-Upgrade", false) == true && + Pkg->CurrentVer == 0) + { + if (AllowFail == true) + ioprintf(c1out,_("Skipping %s, it is not installed and only upgrades are requested.\n"), + Pkg.Name()); + return true; + } + // Check if there is something at all to install pkgDepCache::StateCache &State = Cache[Pkg]; if (Remove == true && Pkg->CurrentVer == 0) @@ -1779,6 +1789,7 @@ bool DoInstall(CommandLine &CmdL) Cache[Pkg].Install() == false && (Cache[Pkg].Flags & pkgCache::Flag::Auto) && _config->FindB("APT::Get::ReInstall",false) == false && + _config->FindB("APT::Get::Only-Upgrade",false) == false && _config->FindB("APT::Get::Download-Only",false) == false) { ioprintf(c1out,_("%s set to manually installed.\n"), @@ -2821,6 +2832,7 @@ int main(int argc,const char *argv[]) /*{{{*/ {0,"fix-missing","APT::Get::Fix-Missing",0}, {0,"ignore-hold","APT::Ignore-Hold",0}, {0,"upgrade","APT::Get::upgrade",0}, + {0,"only-upgrade","APT::Get::Only-Upgrade",0}, {0,"force-yes","APT::Get::force-yes",0}, {0,"print-uris","APT::Get::Print-URIs",0}, {0,"diff-only","APT::Get::Diff-Only",0}, diff --git a/debian/changelog b/debian/changelog index d1983ee9e..f27c096b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ apt (0.7.26) UNRELEASED; urgency=low Thanks to Osamu Aoki for pointing it out! (Closes: #567669) * apt-pkg/deb/dpkgpm.cc: - fix error message construction in OpenLog() + * cmdline/apt-get.cc: + - add a --only-upgrade flag to install command (Closes: #572259) -- David Kalnischkies Fri, 19 Feb 2010 21:21:43 +0100 diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 3d22f262c..4f8c80169 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -444,6 +444,13 @@ Configuration Item: APT::Get::Upgrade. + + Do not install new packages; When used in conjunction with install, + only-upgrade will prevent packages on the command line + from being upgraded if they are not already installed. + Configuration Item: APT::Get::Only-Upgrade. + + Force yes; This is a dangerous option that will cause apt to continue without prompting if it is doing something potentially harmful. It -- cgit v1.2.3 From 3a4477a4241bcfbc9db541cf34cc75c1f1111b78 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 12 Mar 2010 11:08:13 +0100 Subject: * cmdline/apt-get.cc - fix memory leaks in error conditions in DoSource() --- apt-pkg/cdrom.cc | 3 ++- cmdline/apt-get.cc | 6 +++++- debian/changelog | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 96d4e9c91..783ffc430 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -289,7 +289,8 @@ bool pkgCdrom::DropRepeats(vector &List,const char *Name) List[J] = string(); } } - + delete[] Inodes; + // Wipe erased entries for (unsigned int I = 0; I < List.size();) { diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index b35e16b92..849401b0c 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2299,6 +2299,7 @@ bool DoSource(CommandLine &CmdL) { for (unsigned I = 0; I != J; I++) ioprintf(cout,_("Fetch source %s\n"),Dsc[I].Package.c_str()); + delete[] Dsc; return true; } @@ -2309,6 +2310,7 @@ bool DoSource(CommandLine &CmdL) for (; I != Fetcher.UriEnd(); I++) cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' << I->Owner->FileSize << ' ' << I->Owner->HashSum() << endl; + delete[] Dsc; return true; } @@ -2334,6 +2336,7 @@ bool DoSource(CommandLine &CmdL) if (_config->FindB("APT::Get::Download-only",false) == true) { c1out << _("Download complete and in download only mode") << endl; + delete[] Dsc; return true; } @@ -2395,7 +2398,8 @@ bool DoSource(CommandLine &CmdL) _exit(0); } - + delete[] Dsc; + // Wait for the subprocess int Status = 0; while (waitpid(Process,&Status,0) != Process) diff --git a/debian/changelog b/debian/changelog index f27c096b6..b05498f12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ apt (0.7.26) UNRELEASED; urgency=low - fix error message construction in OpenLog() * cmdline/apt-get.cc: - add a --only-upgrade flag to install command (Closes: #572259) + - fix memory leaks in error conditions in DoSource() -- David Kalnischkies Fri, 19 Feb 2010 21:21:43 +0100 -- cgit v1.2.3 From 188c9558929fe6732f799a31f6005532022b2b94 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 12 Mar 2010 11:20:18 +0100 Subject: debian/changelog: move changelog entry to the right version --- debian/changelog | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7b20178ac..bf6792c4b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,6 @@ apt (0.7.25.3ubuntu2) UNRELEASED; urgency=low [ Michael Vogt ] - * methods/http.cc: - - add Acquire::http::ProxyAutoDetect configuration that - can be used to call a external helper to figure out the - proxy configuration and return it to apt via stdout - (this is a step towards WPAD and zeroconf/avahi support) * abicheck/ - add new abitest tester using the ABI Compliance Checker from http://ispras.linuxfoundation.org/index.php/ABI_compliance_checker @@ -23,12 +18,17 @@ apt (0.7.25.3ubuntu2) UNRELEASED; urgency=low useful when using several different archives on the same host. (Closes: #329814, LP: #22354) - -- Michael Vogt Fri, 18 Dec 2009 16:54:18 +0100 + -- Michael Vogt Fri, 12 Mar 2010 11:10:15 +0100 apt (0.7.25.3ubuntu1) lucid; urgency=low [ Michael Vogt ] * merged with the debian-sid branch + * methods/http.cc: + - add Acquire::http::ProxyAutoDetect configuration that + can be used to call a external helper to figure out the + proxy configuration and return it to apt via stdout + (this is a step towards WPAD and zeroconf/avahi support) [ Ivan Masár ] * Slovak translation update. Closes: #568294 -- cgit v1.2.3 From 2bb255740bf18b5e0524fe833523303abb5c9051 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 12 Mar 2010 19:41:30 +0100 Subject: * apt-pkg/deb/dpkgpm.cc: - if available store the Commandline in the history * apt-pkg/contrib/cmndline.cc: - save Commandline in Commandline::AsString for logging --- apt-pkg/contrib/cmndline.cc | 42 ++++++++++++++++++++++++++++++++- apt-pkg/contrib/cmndline.h | 1 + apt-pkg/deb/dpkgpm.cc | 2 ++ debian/changelog | 3 +++ test/libapt/commandlineasstring_test.cc | 39 ++++++++++++++++++++++++++++++ test/libapt/makefile | 6 +++++ 6 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 test/libapt/commandlineasstring_test.cc diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc index bfd53695e..0b16bf51a 100644 --- a/apt-pkg/contrib/cmndline.cc +++ b/apt-pkg/contrib/cmndline.cc @@ -135,7 +135,9 @@ bool CommandLine::Parse(int argc,const char **argv) for (; I != argc; I++) *Files++ = argv[I]; *Files = 0; - + + SaveInConfig(argc, argv); + return true; } /*}}}*/ @@ -351,3 +353,41 @@ bool CommandLine::DispatchArg(Dispatch *Map,bool NoMatch) return false; } /*}}}*/ +// CommandLine::SaveInConfig - for output later in a logfile or so /*{{{*/ +// --------------------------------------------------------------------- +/* We save the commandline here to have it around later for e.g. logging. + It feels a bit like a hack here and isn't bulletproof, but it is better + than nothing after all. */ +void CommandLine::SaveInConfig(unsigned int const &argc, char const * const * const argv) +{ + char cmdline[300]; + unsigned int length = 0; + bool lastWasOption = false; + bool closeQuote = false; + for (unsigned int i = 0; i < argc; ++i, ++length) + { + for (unsigned int j = 0; argv[i][j] != '\0' && length < sizeof(cmdline)-1; ++j, ++length) + { + cmdline[length] = argv[i][j]; + if (lastWasOption == true && argv[i][j] == '=') + { + // That is possibly an option: Quote it if it includes spaces, + // the benefit is that this will eliminate also most false positives + const char* c = &argv[i][j+1]; + for (; *c != '\0' && *c != ' '; ++c); + if (*c == '\0') continue; + cmdline[++length] = '"'; + closeQuote = true; + } + } + if (closeQuote == true) + cmdline[length++] = '"'; + // Problem: detects also --hello + if (cmdline[length-1] == 'o') + lastWasOption = true; + cmdline[length] = ' '; + } + cmdline[--length] = '\0'; + _config->Set("CommandLine::AsString", cmdline); +} + /*}}}*/ diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h index e28071e81..7c0c71aa7 100644 --- a/apt-pkg/contrib/cmndline.h +++ b/apt-pkg/contrib/cmndline.h @@ -60,6 +60,7 @@ class CommandLine Configuration *Conf; bool HandleOpt(int &I,int argc,const char *argv[], const char *&Opt,Args *A,bool PreceedeMatch = false); + void static SaveInConfig(unsigned int const &argc, char const * const * const argv); public: diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index ad1ea77fd..9ba60060c 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -614,6 +614,8 @@ bool pkgDPkgPM::OpenLog() remove += I.Name() + string(" (") + Cache[I].CurVersion + string("), "); } } + if (_config->Exists("Commandline::AsString") == true) + WriteHistoryTag("Commandline", _config->Find("Commandline::AsString")); WriteHistoryTag("Install", install); WriteHistoryTag("Upgrade", upgrade); WriteHistoryTag("Downgrade",downgrade); diff --git a/debian/changelog b/debian/changelog index b05498f12..506e70a25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,9 +14,12 @@ apt (0.7.26) UNRELEASED; urgency=low Thanks to Osamu Aoki for pointing it out! (Closes: #567669) * apt-pkg/deb/dpkgpm.cc: - fix error message construction in OpenLog() + - if available store the Commandline in the history * cmdline/apt-get.cc: - add a --only-upgrade flag to install command (Closes: #572259) - fix memory leaks in error conditions in DoSource() + * apt-pkg/contrib/cmndline.cc: + - save Commandline in Commandline::AsString for logging -- David Kalnischkies Fri, 19 Feb 2010 21:21:43 +0100 diff --git a/test/libapt/commandlineasstring_test.cc b/test/libapt/commandlineasstring_test.cc new file mode 100644 index 000000000..a38957d7e --- /dev/null +++ b/test/libapt/commandlineasstring_test.cc @@ -0,0 +1,39 @@ +#include +#include + +#include + +#include "assert.h" + +class CLT: public CommandLine { + + public: + std::string static AsString(const char * const * const argv, + unsigned int const argc) { + std::string const static conf = "Commandline::AsString"; + _config->Clear(conf); + SaveInConfig(argc, argv); + return _config->Find(conf); + } +}; + +#define CMD(y,z) equals(CLT::AsString(argv, y), z); + +int main() { + { + const char* const argv[] = {"apt-get", "install", "-sf"}; + CMD(3, "apt-get install -sf"); + } + { + const char* const argv[] = {"apt-cache", "-s", "apt", "-so", "Debug::test=Test"}; + CMD(5, "apt-cache -s apt -so Debug::test=Test"); + } + { + const char* const argv[] = {"apt-cache", "-s", "apt", "-so", "Debug::test=Das ist ein Test"}; + CMD(5, "apt-cache -s apt -so Debug::test=\"Das ist ein Test\""); + } + { + const char* const argv[] = {"apt-cache", "-s", "apt", "--hallo", "test=1.0"}; + CMD(5, "apt-cache -s apt --hallo test=1.0"); + } +} diff --git a/test/libapt/makefile b/test/libapt/makefile index 08f581e6d..cb76d5ee6 100644 --- a/test/libapt/makefile +++ b/test/libapt/makefile @@ -23,3 +23,9 @@ PROGRAM = GetListOfFilesInDir${BASENAME} SLIBS = -lapt-pkg SOURCE = getlistoffilesindir_test.cc include $(PROGRAM_H) + +# Program for testing CommandLine reconstruction +PROGRAM = commandlineasstring${BASENAME} +SLIBS = -lapt-pkg +SOURCE = commandlineasstring_test.cc +include $(PROGRAM_H) -- cgit v1.2.3 From 553769ba6dab6b13c1235e898edd23cb62a00092 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 12 Mar 2010 22:33:35 +0100 Subject: * debian/apt.cron.daily: - do not look into admin users gconf anymore for the http proxy the user now needs to use the "Apply system-wide" UI in the gnome-control-center to set it * debian/apt.postinst: - add set_apt_proxy_from_gconf() and run that once on upgrade if there is no proxy configured already system-wide (LP: #432631) From that point on gnome-control-center will have to warn if the user makes changes to the proxy settings and does not apply them system wide --- debian/apt.cron.daily | 12 ------------ debian/apt.postinst | 25 +++++++++++++++++++++++++ debian/changelog | 10 ++++++++++ 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index aa7b18886..8e46651b2 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -429,18 +429,6 @@ if [ $UpdateInterval -eq 0 ] && exit 0 fi -# set the proxy based on the admin users gconf settings -admin_user=$(getent group admin|cut -d: -f4|cut -d, -f1) -if [ -n "$admin_user" ] && [ -x /usr/bin/sudo ] && [ -z "$http_proxy" ] && [ -x /usr/bin/gconftool ]; then - use=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/use_http_proxy 2>/dev/null) - host=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/host 2>/dev/null) - port=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/port 2>/dev/null) - if [ "$use" = "true" ] && [ -n "$host" ] && [ -n "$port" ]; then - export http_proxy="http://$host:$port/" - fi -fi - - # deal with BackupArchiveInterval do_cache_backup $BackupArchiveInterval diff --git a/debian/apt.postinst b/debian/apt.postinst index 773077aa5..6236acd42 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -2,6 +2,24 @@ set -e +# set the proxy based on the admin users gconf settings +# +set_apt_proxy_from_gconf() { + admin_user=$(getent group admin|cut -d: -f4|cut -d, -f1) + if [ -n "$admin_user" ] && [ -x /usr/bin/sudo ] && [ -z "$http_proxy" ] && [ -x /usr/bin/gconftool ]; then + use=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/use_http_proxy 2>/dev/null) + host=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/host 2>/dev/null) + port=$(sudo -u "$admin_user" gconftool --get /system/http_proxy/port 2>/dev/null) + if [ "$use" = "true" ] && [ -n "$host" ] && [ -n "$port" ]; then + APT_CONF_PROXY="" + eval $(apt-config shell APT_CONF_PROXY Acquire::http::proxy) + if [ -z "$APT_CONF_PROXY" ]; then + echo "Acquire::http::proxy \"http://$host:$port/\";" >> /etc/apt/apt.conf + fi + fi + fi +} + # summary of how this script can be called: # * `configure' # * `abort-upgrade' @@ -18,6 +36,13 @@ case "$1" in if ! test -f /etc/apt/trusted.gpg; then cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg fi + + # mvo: get gconf defaults once and write to a file, reason is + # that sudo no longer honors http_proxy + # this can be removed after lucid is released + if dpkg --compare-versions "$2" lt-nl "0.7.25.3ubuntu2"; then + set_apt_proxy_from_gconf + fi ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/changelog b/debian/changelog index f35a5fe62..3f4b4948e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,16 @@ apt (0.7.25.3ubuntu2) UNRELEASED; urgency=low error out (LP: #502641) * apt-pkg/indexfile.cc: - deal correctly with three letter langcodes (LP: #391409) + * debian/apt.cron.daily: + - do not look into admin users gconf anymore for the http proxy + the user now needs to use the "Apply system-wide" UI in the + gnome-control-center to set it + * debian/apt.postinst: + - add set_apt_proxy_from_gconf() and run that once on upgrade if + there is no proxy configured already system-wide (LP: #432631) + From that point on gnome-control-center will have to warn if + the user makes changes to the proxy settings and does not apply + them system wide [ Robert Collins ] * Change the package index Info methods to allow apt-cache policy to be -- cgit v1.2.3 From d861c0f25765378feee7f2e84e9aadb8d56d7168 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 12 Mar 2010 23:24:05 +0100 Subject: releasing version 0.7.25.3ubuntu2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3f4b4948e..ccd0a110c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.7.25.3ubuntu2) UNRELEASED; urgency=low +apt (0.7.25.3ubuntu2) lucid; urgency=low [ Michael Vogt ] * abicheck/ @@ -33,7 +33,7 @@ apt (0.7.25.3ubuntu2) UNRELEASED; urgency=low useful when using several different archives on the same host. (Closes: #329814, LP: #22354) - -- Michael Vogt Fri, 12 Mar 2010 11:10:15 +0100 + -- Michael Vogt Fri, 12 Mar 2010 23:10:52 +0100 apt (0.7.25.3ubuntu1) lucid; urgency=low -- cgit v1.2.3 From ea5624c3d04c35f5a269b6f7431c135330c9b9b5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 13 Mar 2010 14:11:22 +0100 Subject: * apt-pkg/deb/debversion.cc: - consider absent of debian revision equivalent to 0 (Closes: #573592) This moves the existing testcase for version comparison to "my" directory, adds a few more tests (e.g. the tests used in cupt) and rewrites the testcases runner: The runner does now call dpkg --compare-versions to check what dpkg thinks about the comparison - all done in less code ;) --- apt-pkg/deb/debversion.cc | 18 ++- debian/changelog | 2 + test/libapt/compareversion_test.cc | 123 ++++++++++++++++++++ test/libapt/makefile | 6 + test/makefile | 7 -- test/versions.lst | 64 +++++++++- test/versiontest.cc | 233 ------------------------------------- 7 files changed, 207 insertions(+), 246 deletions(-) create mode 100644 test/libapt/compareversion_test.cc delete mode 100644 test/versiontest.cc diff --git a/apt-pkg/deb/debversion.cc b/apt-pkg/deb/debversion.cc index ad45e9a44..755ffbe96 100644 --- a/apt-pkg/deb/debversion.cc +++ b/apt-pkg/deb/debversion.cc @@ -190,8 +190,22 @@ int debVersioningSystem::DoCmpVersion(const char *A,const char *AEnd, dlhs++; if (drhs != rhs) drhs++; - - return CmpFragment(dlhs,AEnd,drhs,BEnd); + + // no debian revision need to be treated like -0 + if (*(dlhs-1) == '-' && *(drhs-1) == '-') + return CmpFragment(dlhs,AEnd,drhs,BEnd); + else if (*(dlhs-1) == '-') + { + const char* null = "0"; + return CmpFragment(dlhs,AEnd,null, null+1); + } + else if (*(drhs-1) == '-') + { + const char* null = "0"; + return CmpFragment(null, null+1, drhs, BEnd); + } + else + return 0; } /*}}}*/ // debVS::CheckDep - Check a single dependency /*{{{*/ diff --git a/debian/changelog b/debian/changelog index 506e70a25..b0d7cb536 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,8 @@ apt (0.7.26) UNRELEASED; urgency=low - fix memory leaks in error conditions in DoSource() * apt-pkg/contrib/cmndline.cc: - save Commandline in Commandline::AsString for logging + * apt-pkg/deb/debversion.cc: + - consider absent of debian revision equivalent to 0 (Closes: #573592) -- David Kalnischkies Fri, 19 Feb 2010 21:21:43 +0100 diff --git a/test/libapt/compareversion_test.cc b/test/libapt/compareversion_test.cc new file mode 100644 index 000000000..b6213e84c --- /dev/null +++ b/test/libapt/compareversion_test.cc @@ -0,0 +1,123 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +/* ###################################################################### + + Version Test - Simple program to run through a file and comare versions. + + Each version is compared and the result is checked against an expected + result in the file. The format of the file is + a b Res + Where Res is -1, 1, 0. dpkg -D=1 --compare-versions a "<" b can be + used to determine what Res should be. # at the start of the line + is a comment and blank lines are skipped + + The runner will also call dpkg --compare-versions to check if APT and + dpkg have (still) the same idea. + + ##################################################################### */ + /*}}}*/ +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +using namespace std; + +bool callDPkg(const char *val, const char *ref, const char &op) { + pid_t Process = ExecFork(); + if (Process == 0) + { + const char * args[6]; + args[0] = "/usr/bin/dpkg"; + args[1] = "--compare-versions"; + args[2] = val; + args[3] = (op == 1) ? ">>" : ( (op == 0) ? "=" : "<<"); + args[4] = ref; + args[5] = 0; + execv(args[0], (char**) args); + exit(1); + } + int Ret; + waitpid(Process, &Ret, 0); + return WIFEXITED(Ret) == true && WEXITSTATUS(Ret) == 0; +} + +void assertVersion(int const &CurLine, string const &A, string const &B, int const &Expected) { + int Res = debVS.CmpVersion(A.c_str(), B.c_str()); + bool const dpkg = callDPkg(A.c_str(),B.c_str(), Expected); + Res = (Res < 0) ? -1 : ( (Res > 0) ? 1 : Res); + + if (Res != Expected) + _error->Error("Comparison failed on line %u. '%s' '%s' '%s' %i != %i",CurLine,A.c_str(),((Expected == 1) ? "<<" : ( (Expected == 0) ? "=" : ">>")) ,B.c_str(),Res,Expected); + if (dpkg == false) + _error->Error("DPkg differ with line: %u. '%s' '%s' '%s' == false",CurLine,A.c_str(),((Expected == 1) ? "<<" : ( (Expected == 0) ? "=" : ">>")),B.c_str()); +} + +bool RunTest(const char *File) +{ + ifstream F(File,ios::in); + if (!F != 0) + return false; + + char Buffer[300]; + int CurLine = 0; + + while (1) + { + F.getline(Buffer,sizeof(Buffer)); + CurLine++; + if (F.eof() != 0) + return true; + if (!F != 0) + return _error->Error("Line %u in %s is too long",CurLine,File); + + // Comment + if (Buffer[0] == '#' || Buffer[0] == 0) + continue; + + // First version + char *I; + char *Start = Buffer; + for (I = Buffer; *I != 0 && *I != ' '; I++); + string A(Start, I - Start); + + if (*I == 0) + return _error->Error("Invalid line %u",CurLine); + + // Second version + I++; + Start = I; + for (I = Start; *I != 0 && *I != ' '; I++); + string B(Start,I - Start); + + if (*I == 0 || I[1] == 0) + return _error->Error("Invalid line %u",CurLine); + + // Result + I++; + int const Expected = atoi(I); + assertVersion(CurLine, A, B, Expected); + // Check the reverse as well + assertVersion(CurLine, B, A, Expected*-1); + } +} + +int main(int argc, char *argv[]) +{ + if (argc <= 1) + RunTest("../versions.lst"); + else + RunTest(argv[1]); + + // Print any errors or warnings found + _error->DumpErrors(); + return 0; +} diff --git a/test/libapt/makefile b/test/libapt/makefile index cb76d5ee6..98bdb3348 100644 --- a/test/libapt/makefile +++ b/test/libapt/makefile @@ -29,3 +29,9 @@ PROGRAM = commandlineasstring${BASENAME} SLIBS = -lapt-pkg SOURCE = commandlineasstring_test.cc include $(PROGRAM_H) + +# Program for testing debians version comparing +PROGRAM = compareversion${BASENAME} +SLIBS = -lapt-pkg +SOURCE = compareversion_test.cc +include $(PROGRAM_H) diff --git a/test/makefile b/test/makefile index fb9123d0a..b8c104eae 100644 --- a/test/makefile +++ b/test/makefile @@ -24,13 +24,6 @@ LIB_MAKES = apt-pkg/makefile apt-inst/makefile SOURCE = scratch.cc include $(PROGRAM_H) -# Version compare tester -PROGRAM=versiontest -SLIBS = -lapt-pkg -LIB_MAKES = apt-pkg/makefile -SOURCE = versiontest.cc -include $(PROGRAM_H) - # Version compare tester PROGRAM=testextract SLIBS = -lapt-pkg -lapt-inst diff --git a/test/versions.lst b/test/versions.lst index efc19c4f0..517214151 100644 --- a/test/versions.lst +++ b/test/versions.lst @@ -10,10 +10,11 @@ 1.3 1.2.2 1 # Important attributes -- . -1 -p - -1 -a - -1 -z - -1 +# disabled as dpkg --compare-versions doesn't like them… +#- . -1 +#p - -1 +#a - -1 +#z - -1 a . -1 z . -1 @@ -22,6 +23,10 @@ z . -1 1:1.25-4 1:1.25-8 -1 0:1.18.36 1.18.36 0 +# native version +1.18.36 1.18.35 1 +0:1.18.36 1.18.35 1 + # Funky, but allowed, characters in upstream version 9:1.18.36:5.4-20 10:0.5.1-22 -1 9:1.18.36:5.4-20 9:1.18.36:5.5-1 -1 @@ -49,3 +54,54 @@ III-alpha9.8 III-alpha9.8-1.5 -1 # #205960 3.0~rc1-1 3.0-1 -1 + +# #573592 - debian policy 5.6.12 +1.0 1.0-0 0 +0.2 1.0-0 -1 +1.0 1.0-0+b1 -1 +1.0 1.0-0~ 1 + +# if a version includes a dash +# it should be the debrev dash - policy says so… +0:0-0-0 0-0 1 + +# do we like strange versions? Yes we like strange versions… +0 0 0 +0 00 0 + +# "steal" the testcases from cupt +1.2.3 1.2.3 0 # identical +4.4.3-2 4.4.3-2 0 # identical +1:2ab:5 1:2ab:5 0 # this is correct... +7:1-a:b-5 7:1-a:b-5 0 # and this +57:1.2.3abYZ+~-4-5 57:1.2.3abYZ+~-4-5 0 # and those too +1.2.3 0:1.2.3 0 # zero epoch +1.2.3 1.2.3-0 0 # zero revision +009 9 0 # zeroes... +009ab5 9ab5 0 # there as well +1.2.3 1.2.3-1 -1 # added non-zero revision +1.2.3 1.2.4 -1 # just bigger +1.2.4 1.2.3 1 # order doesn't matter +1.2.24 1.2.3 1 # bigger, eh? +0.10.0 0.8.7 1 # bigger, eh? +3.2 2.3 1 # major number rocks +1.3.2a 1.3.2 1 # letters rock +0.5.0~git 0.5.0~git2 -1 # numbers rock +2a 21 -1 # but not in all places +1.3.2a 1.3.2b -1 # but there is another letter +1:1.2.3 1.2.4 1 # epoch rocks +1:1.2.3 1:1.2.4 -1 # bigger anyway +1.2a+~bCd3 1.2a++ -1 # tilde doesn't rock +1.2a+~bCd3 1.2a+~ 1 # but first is longer! +5:2 304-2 1 # epoch rocks +5:2 304:2 -1 # so big epoch? +25:2 3:2 1 # 25 > 3, obviously +1:2:123 1:12:3 -1 # 12 > 2 +1.2-5 1.2-3-5 -1 # 1.2 < 1.2-3 +5.10.0 5.005 1 # preceding zeroes don't matters +3a9.8 3.10.2 -1 # letters are before all letter symbols +3a9.8 3~10 1 # but after the tilde +1.4+OOo3.0.0~ 1.4+OOo3.0.0-4 -1 # another tilde check +2.4.7-1 2.4.7-z -1 # revision comparing +1.002-1+b2 1.00 1 # whatever... +2.2.4-47978_Debian_lenny 2.2.4-47978_Debian_lenny 0 # and underscore... diff --git a/test/versiontest.cc b/test/versiontest.cc deleted file mode 100644 index 4ede4b280..000000000 --- a/test/versiontest.cc +++ /dev/null @@ -1,233 +0,0 @@ -// -*- mode: cpp; mode: fold -*- -// Description /*{{{*/ -// $Id: versiontest.cc,v 1.5 2003/08/18 15:55:19 mdz Exp $ -/* ###################################################################### - - Version Test - Simple program to run through a file and comare versions. - - Each version is compared and the result is checked against an expected - result in the file. The format of the file is - a b Res - Where Res is -1, 1, 0. dpkg -D=1 --compare-versions a "<" b can be - used to determine what Res should be. # at the start of the line - is a comment and blank lines are skipped - - ##################################################################### */ - /*}}}*/ -#include -#include -#include -#include -#include -#include - -using namespace std; - - static int verrevcmp(const char *val, const char *ref) -{ - int vc, rc; - long vl, rl; - const char *vp, *rp; - - if (!val) - val = ""; - if (!ref) - ref = ""; - for (;;) - { - vp = val; - while (*vp && !isdigit(*vp)) - vp++; - rp = ref; - while (*rp && !isdigit(*rp)) - rp++; - for (;;) - { - vc= val == vp ? 0 : *val++; - rc= ref == rp ? 0 : *ref++; - if (!rc && !vc) - break; - if (vc && !isalpha(vc)) - vc += 256; /* assumes ASCII character set */ - if (rc && !isalpha(rc)) - rc += 256; - if (vc != rc) - return vc - rc; - } - val = vp; - ref = rp; - vl = 0; - if (isdigit(*vp)) - vl = strtol(val,(char**)&val,10); - rl = 0; - if (isdigit(*rp)) - rl = strtol(ref,(char**)&ref,10); - if (vl != rl) - return vl - rl; - if (!*val && !*ref) - return 0; - if (!*val) - return -1; - if (!*ref) - return +1; - } -} - -#if 0 -static int verrevcmp(const char *val, const char *ref) -{ - int vc, rc; - long vl, rl; - const char *vp, *rp; - - if (!val) val= ""; - if (!ref) ref= ""; - for (;;) - { - vp= val; while (*vp && !isdigit(*vp) && *vp != '~') vp++; - rp= ref; while (*rp && !isdigit(*rp) && *rp != '~') rp++; - for (;;) - { - vc= val == vp ? 0 : *val++; - rc= ref == rp ? 0 : *ref++; - if (!rc && !vc) break; - if (vc && !isalpha(vc)) vc += 256; /* assumes ASCII character set */ - if (rc && !isalpha(rc)) rc += 256; - if (vc != rc) return vc - rc; - } - - val= vp; - ref= rp; - if (*vp == '~') val++; - if (*rp == '~') ref++; - vl=0; if (isdigit(*val)) vl= strtol(val,(char**)&val,10); - rl=0; if (isdigit(*ref)) rl= strtol(ref,(char**)&ref,10); - if (vl == 0 && rl == 0) - { - if (*vp == '~' && *rp != '~') return -1; - if (*vp != '~' && *rp == '~') return +1; - } - if (*vp == '~') - vl *= -1; - if (*rp == '~') - rl *= -1; - if (vl != rl) return vl - rl; - if (!*val && !*ref) return 0; - if (!*val) - { - if (*ref == '~') - return +1; - else - return -1; - } - - if (!*ref) - { - if (*val == '~') - return -1; - else - return +1; - } - } -} -#endif - -bool RunTest(const char *File) -{ - ifstream F(File,ios::in); - if (!F != 0) - return false; - - char Buffer[300]; - int CurLine = 0; - - while (1) - { - F.getline(Buffer,sizeof(Buffer)); - CurLine++; - if (F.eof() != 0) - return true; - if (!F != 0) - return _error->Error("Line %u in %s is too long",CurLine,File); - - // Comment - if (Buffer[0] == '#' || Buffer[0] == 0) - continue; - - // First version - char *I; - char *Start = Buffer; - for (I = Buffer; *I != 0 && *I != ' '; I++); - string A(Start, I - Start); - - if (*I == 0) - return _error->Error("Invalid line %u",CurLine); - - // Second version - I++; - Start = I; - for (I = Start; *I != 0 && *I != ' '; I++); - string B(Start,I - Start); - - if (*I == 0 || I[1] == 0) - return _error->Error("Invalid line %u",CurLine); - - // Result - I++; - int Expected = atoi(I); - int Res = debVS.CmpVersion(A.c_str(), B.c_str()); - int Res2 = verrevcmp(A.c_str(),B.c_str()); - cout << "'" << A << "' ? '" << B << "' = " << Res << " (= " << Expected << ") " << Res2 << endl; - - if (Res < 0) - Res = -1; - else if (Res > 0) - Res = 1; - - if (Res != Expected) - _error->Error("Comparison failed on line %u. '%s' ? '%s' %i != %i",CurLine,A.c_str(),B.c_str(),Res,Expected); - - // Check the reverse as well - Expected = -1*Expected; - Res = debVS.CmpVersion(B.c_str(), A.c_str()); - Res2 = verrevcmp(B.c_str(),A.c_str()); - - cout << "'" << B << "' ? '" << A << "' = " << Res << " (= " << Expected << ") " << Res2 << endl; - - if (Res < 0) - Res = -1; - else if (Res > 0) - Res = 1; - - if (Res != Expected) - _error->Error("Comparison failed on line %u. '%s' ? '%s' %i != %i",CurLine,B.c_str(),A.c_str(),Res,Expected); - } -} - -int main(int argc, char *argv[]) -{ - if (argc <= 1) - { - cerr << "You must specify a test file" << endl; - return 0; - } - - RunTest(argv[1]); - - // Print any errors or warnings found - if (_error->empty() == false) - { - string Err; - while (_error->empty() == false) - { - - bool Type = _error->PopMessage(Err); - if (Type == true) - cout << "E: " << Err << endl; - else - cout << "W: " << Err << endl; - } - - return 0; - } -} -- cgit v1.2.3 From 1f530ccb32c17b70b05dd5feee706dc1098a7251 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 14 Mar 2010 14:45:00 +0100 Subject: Ensure that for each all package at least one pseudopackage is installed Removing pseudo packages is cool so far, the problem is that we will remove with the not required removing so many pseudo packages that we will have after the remove a few packages with NO installed pseudo package (e.g. metapackages are good candidates) - so we will walk over all these packages and try to find a pseudopackage for this package we can install without breaking something. --- apt-pkg/depcache.cc | 77 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 68 insertions(+), 9 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 893164ea1..ffa4fe71c 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -634,10 +634,8 @@ bool pkgDepCache::RemovePseudoInstalledPkg(PkgIterator &Pkg, std::setType == pkgCache::Dep::Depends || - D->Type == pkgCache::Dep::PreDepends) && - D.ParentPkg()->Group != Pkg->Group) + if (D.IsCritical() == true && D.ParentPkg()->Group != Pkg->Group) return false; for (DepIterator D = Pkg.RevDependsList(); D.end() != true; ++D) { - if (D->Type != pkgCache::Dep::Depends && - D->Type != pkgCache::Dep::PreDepends) + if (D.IsCritical() == false) continue; PkgIterator const P = D.ParentPkg(); + if (P->Group == Pkg->Group) + continue; if (P->CurrentVer != 0) return false; } @@ -800,6 +797,68 @@ void pkgDepCache::Update(OpProgress *Prog) } recheck.erase(p); } + + /* Okay, we have killed a great amount of pseudopackages - + we have killed so many that we have now arch "all" packages + without an installed pseudo package, but we NEED an installed + pseudo package, so we will search now for a pseudo package + we can install without breaking everything. */ + for (GrpIterator G = Cache->GrpBegin(); G.end() != true; ++G) + { + PkgIterator P = G.FindPkg("all"); + if (P.end() == true) + continue; + if (P->CurrentVer == 0) + continue; + bool installed = false; + for (P = G.FindPkg("any"); P.end() != true; P = G.NextPkg(P)) + { + if (strcmp(P.Arch(), "all") == 0) + continue; + if (P->CurrentVer == 0) + continue; + installed = true; + break; + } + if (installed == false) + recheck.insert(G.Index()); + } + std::vector Archs = APT::Configuration::getArchitectures(); + bool checkChanged = false; + do { + for(std::set::const_iterator g = recheck.begin(); + g != recheck.end(); ++g) { + GrpIterator G = GrpIterator(*Cache, Cache->GrpP + *g); + VerIterator allV = G.FindPkg("all").CurrentVer(); + for (std::vector::const_iterator a = Archs.begin(); + a != Archs.end(); ++a) + { + PkgIterator P = G.FindPkg(*a); + if (P.end() == true) continue; + for (VerIterator V = P.VersionList(); V.end() != true; ++V) + { + // FIXME: String comparison isn't a save indicator! + if (strcmp(allV.VerStr(),V.VerStr()) != 0) + continue; + unsigned char const CurDepState = VersionState(V.DependsList(),DepInstall,DepInstMin,DepInstPolicy); + if ((CurDepState & DepInstMin) != DepInstMin) + break; // we found the correct version, but it is broken. Better try another arch or later again + P->CurrentVer = V.Index(); + AddStates(P); + Update(P); + AddSizes(P); + checkChanged = true; + break; + } + } + recheck.erase(g); + } + } while (checkChanged == true && recheck.empty() == false); + + if (_config->FindB("Debug::MultiArchKiller", false) == true) + for(std::set::const_iterator g = recheck.begin(); + g != recheck.end(); ++g) + std::cout << "No pseudo package for »" << GrpIterator(*Cache, Cache->GrpP + *g).Name() << "« installed" << std::endl; } if (Prog != 0) -- cgit v1.2.3 From 7f912c325b207beac9deb5daafb7ec34b9db067a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 14 Mar 2010 17:26:50 +0100 Subject: * debian/control: - add automake/conf build-depends/conflicts as recommend by the autotools-dev README (Closes: #572615) --- debian/changelog | 2 ++ debian/control | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3b564b3a1..142577e42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ apt (0.7.26) UNRELEASED; urgency=low - don't crash if no arguments are given (Closes: #570962) * debian/control: - remove some years old and obsolete Replaces + - add automake/conf build-depends/conflicts as recommend by + the autotools-dev README (Closes: #572615) * apt-pkg/contrib/mmap.{h,cc}: - add char[] fallback for filesystems without shared writable mmap() like JFFS2. Thanks to Marius Vollmer for writing diff --git a/debian/control b/debian/control index 0cf092c25..b7c3e5712 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,8 @@ Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , Luca Bruno , Julian Andres Klode Standards-Version: 3.8.4 -Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev +Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev, autoconf, automake +Build-Conflicts: autoconf2.13, automake1.4 Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Package: apt -- cgit v1.2.3 From c176c4d0adad246ac0768f9e2b60aa8e4c56fffb Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 14 Mar 2010 21:48:14 +0100 Subject: * apt-pkg/depcache.cc: - remove Auto-Installed information from extended_states together with the package itself (Closes: #572364) --- apt-pkg/depcache.cc | 31 ++++++++++++++++++++++++------- apt-pkg/depcache.h | 2 +- apt-pkg/tagfile.cc | 13 ++----------- apt-pkg/tagfile.h | 15 ++++++++++++++- debian/changelog | 3 +++ 5 files changed, 44 insertions(+), 20 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 5943d858a..e9fb5f76a 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -235,16 +235,30 @@ bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly) /*{{{*/ std::set pkgs_seen; const char *nullreorderlist[] = {0}; while(tagfile.Step(section)) { - string pkgname = section.FindS("Package"); + string const pkgname = section.FindS("Package"); // Silently ignore unknown packages and packages with no actual // version. pkgCache::PkgIterator pkg=Cache->FindPkg(pkgname); if(pkg.end() || pkg.VersionList().end()) continue; - bool newAuto = (PkgState[pkg->ID].Flags & Flag::Auto); + StateCache const &P = PkgState[pkg->ID]; + bool newAuto = (P.Flags & Flag::Auto); + // skip not installed or now-removed ones if requested + if (InstalledOnly && ( + (pkg->CurrentVer == 0 && P.Mode != ModeInstall) || + (pkg->CurrentVer != 0 && P.Mode == ModeDelete))) + { + // The section is obsolete if it contains no other tag + unsigned int const count = section.Count(); + if (count < 2 || + (count == 2 && section.Exists("Auto-Installed"))) + continue; + else + newAuto = false; + } if(_config->FindB("Debug::pkgAutoRemove",false)) std::clog << "Update existing AutoInstall info: " - << pkg.Name() << std::endl; + << pkgname << std::endl; TFRewriteData rewrite[2]; rewrite[0].Tag = "Auto-Installed"; rewrite[0].Rewrite = newAuto ? "1" : "0"; @@ -258,15 +272,18 @@ bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly) /*{{{*/ // then write the ones we have not seen yet std::ostringstream ostr; for(pkgCache::PkgIterator pkg=Cache->PkgBegin(); !pkg.end(); pkg++) { - if(PkgState[pkg->ID].Flags & Flag::Auto) { + StateCache const &P = PkgState[pkg->ID]; + if(P.Flags & Flag::Auto) { if (pkgs_seen.find(pkg.Name()) != pkgs_seen.end()) { if(debug_autoremove) std::clog << "Skipping already written " << pkg.Name() << std::endl; continue; } - // skip not installed ones if requested - if(InstalledOnly && pkg->CurrentVer == 0) - continue; + // skip not installed ones if requested + if (InstalledOnly && ( + (pkg->CurrentVer == 0 && P.Mode != ModeInstall) || + (pkg->CurrentVer != 0 && P.Mode == ModeDelete))) + continue; if(debug_autoremove) std::clog << "Writing new AutoInstall: " << pkg.Name() << std::endl; diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 0306861a1..fd1f202be 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -447,7 +447,7 @@ class pkgDepCache : protected pkgCache::Namespace // read persistent states bool readStateFile(OpProgress *prog); - bool writeStateFile(OpProgress *prog, bool InstalledOnly=false); + bool writeStateFile(OpProgress *prog, bool InstalledOnly=true); // Size queries inline double UsrSize() {return iUsrSize;}; diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index 7c5d15a58..0d4999ee7 100644 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@ -193,17 +193,8 @@ bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long Offset) /*}}}*/ // TagSection::Scan - Scan for the end of the header information /*{{{*/ // --------------------------------------------------------------------- -/* This looks for the first double new line in the data stream. It also - indexes the tags in the section. This very simple hash function for the - last 8 letters gives very good performance on the debian package files */ -inline static unsigned long AlphaHash(const char *Text, const char *End = 0) -{ - unsigned long Res = 0; - for (; Text != End && *Text != ':' && *Text != 0; Text++) - Res = ((unsigned long)(*Text) & 0xDF) ^ (Res << 1); - return Res & 0xFF; -} - +/* This looks for the first double new line in the data stream. + It also indexes the tags in the section. */ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength) { const char *End = Start + MaxLength; diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h index 321329a23..f63a51d07 100644 --- a/apt-pkg/tagfile.h +++ b/apt-pkg/tagfile.h @@ -33,7 +33,18 @@ class pkgTagSection unsigned int AlphaIndexes[0x100]; unsigned int TagCount; - + + /* This very simple hash function for the last 8 letters gives + very good performance on the debian package files */ + inline static unsigned long AlphaHash(const char *Text, const char *End = 0) + { + unsigned long Res = 0; + for (; Text != End && *Text != ':' && *Text != 0; Text++) + Res = ((unsigned long)(*Text) & 0xDF) ^ (Res << 1); + return Res & 0xFF; + } + + protected: const char *Stop; @@ -54,6 +65,8 @@ class pkgTagSection virtual void TrimRecord(bool BeforeRecord, const char* &End); inline unsigned int Count() const {return TagCount;}; + inline bool Exists(const char* const Tag) {return AlphaIndexes[AlphaHash(Tag)] != 0;} + inline void Get(const char *&Start,const char *&Stop,unsigned int I) const {Start = Section + Indexes[I]; Stop = Section + Indexes[I+1];} diff --git a/debian/changelog b/debian/changelog index 142577e42..415a6fd8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ apt (0.7.26) UNRELEASED; urgency=low [ David Kalnischkies ] * Switch to dpkg-source 3.0 (native) format + * apt-pkg/depcache.cc: + - remove Auto-Installed information from extended_states + together with the package itself (Closes: #572364) * cmdline/apt-mark: - don't crash if no arguments are given (Closes: #570962) * debian/control: -- cgit v1.2.3 From 3226fe2bef62975976ebab7522759428a813ad4d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 15 Mar 2010 09:57:57 +0100 Subject: releasing version 0.7.25.3ubuntu3 --- apt-pkg/indexfile.cc | 3 +-- debian/changelog | 8 ++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc index 34fd71b20..9b85a8cf8 100644 --- a/apt-pkg/indexfile.cc +++ b/apt-pkg/indexfile.cc @@ -115,8 +115,7 @@ string pkgIndexFile::LanguageCode() // we have a mapping of the language codes that contains all the language // codes that need the country code as well // (like pt_BR, pt_PT, sv_SE, zh_*, en_*) - const char *need_full_langcode[] = { "cs_", - "en_", + const char *need_full_langcode[] = { "en_", "pt_", "sv_", "zh_", diff --git a/debian/changelog b/debian/changelog index ccd0a110c..4164fd726 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.25.3ubuntu3) lucid; urgency=low + + * apt-pkg/indexfile.cc: + - remove "cs" from languages that need the full langcode when + downloading translations (thanks to Steve Langasek) + + -- Michael Vogt Mon, 15 Mar 2010 09:42:39 +0100 + apt (0.7.25.3ubuntu2) lucid; urgency=low [ Michael Vogt ] -- cgit v1.2.3 From b45fb8db8c586fa837a9d1ad0c2247a7e003e51f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 15 Mar 2010 11:02:31 +0100 Subject: * doc/makefile, doc/*: - generate subdirectories for building the manpages in on the fly depending on the po files we have. --- debian/changelog | 3 +++ doc/de/makefile | 11 ----------- doc/es/makefile | 11 ----------- doc/fr/makefile | 11 ----------- doc/it/makefile | 11 ----------- doc/ja/makefile | 11 ----------- doc/lang.makefile | 11 +++++++++++ doc/makefile | 15 ++++++++++++--- doc/pl/makefile | 11 ----------- doc/pt_BR/makefile | 11 ----------- 10 files changed, 26 insertions(+), 80 deletions(-) delete mode 100644 doc/de/makefile delete mode 100644 doc/es/makefile delete mode 100644 doc/fr/makefile delete mode 100644 doc/it/makefile delete mode 100644 doc/ja/makefile create mode 100644 doc/lang.makefile delete mode 100644 doc/pl/makefile delete mode 100644 doc/pt_BR/makefile diff --git a/debian/changelog b/debian/changelog index 415a6fd8d..ddbf19214 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,9 @@ apt (0.7.26) UNRELEASED; urgency=low - save Commandline in Commandline::AsString for logging * apt-pkg/deb/debversion.cc: - consider absent of debian revision equivalent to 0 (Closes: #573592) + * doc/makefile, doc/*: + - generate subdirectories for building the manpages in on the fly + depending on the po files we have. [ Julian Andres Klode ] * cmdline/apt-mark: diff --git a/doc/de/makefile b/doc/de/makefile deleted file mode 100644 index a827a0f24..000000000 --- a/doc/de/makefile +++ /dev/null @@ -1,11 +0,0 @@ -# -*- make -*- -BASE=../.. -SUBDIR=doc/de - -# Bring in the default rules -include ../../buildlib/defaults.mak - -# Language Code of this translation -LC=de - -include $(PO4A_MANPAGE_H) diff --git a/doc/es/makefile b/doc/es/makefile deleted file mode 100644 index 0b5b52222..000000000 --- a/doc/es/makefile +++ /dev/null @@ -1,11 +0,0 @@ -# -*- make -*- -BASE=../.. -SUBDIR=doc/es - -# Bring in the default rules -include ../../buildlib/defaults.mak - -# Language Code of this translation -LC=es - -include $(PO4A_MANPAGE_H) diff --git a/doc/fr/makefile b/doc/fr/makefile deleted file mode 100644 index 214534736..000000000 --- a/doc/fr/makefile +++ /dev/null @@ -1,11 +0,0 @@ -# -*- make -*- -BASE=../.. -SUBDIR=doc/fr - -# Bring in the default rules -include ../../buildlib/defaults.mak - -# Language Code of this translation -LC=fr - -include $(PO4A_MANPAGE_H) diff --git a/doc/it/makefile b/doc/it/makefile deleted file mode 100644 index 2179ec15f..000000000 --- a/doc/it/makefile +++ /dev/null @@ -1,11 +0,0 @@ -# -*- make -*- -BASE=../.. -SUBDIR=doc/it - -# Bring in the default rules -include ../../buildlib/defaults.mak - -# Language Code of this translation -LC=it - -include $(PO4A_MANPAGE_H) diff --git a/doc/ja/makefile b/doc/ja/makefile deleted file mode 100644 index f44bb1c0f..000000000 --- a/doc/ja/makefile +++ /dev/null @@ -1,11 +0,0 @@ -# -*- make -*- -BASE=../.. -SUBDIR=doc/ja - -# Bring in the default rules -include ../../buildlib/defaults.mak - -# Language Code of this translation -LC=ja - -include $(PO4A_MANPAGE_H) diff --git a/doc/lang.makefile b/doc/lang.makefile new file mode 100644 index 000000000..9fdc6ea70 --- /dev/null +++ b/doc/lang.makefile @@ -0,0 +1,11 @@ +# -*- make -*- +BASE=../.. +SUBDIR=doc/@@LANG@@ + +# Bring in the default rules +include ../../buildlib/defaults.mak + +# Language Code of this translation +LC=@@LANG@@ + +include $(PO4A_MANPAGE_H) diff --git a/doc/makefile b/doc/makefile index 6e6186466..93504e23e 100644 --- a/doc/makefile +++ b/doc/makefile @@ -46,9 +46,14 @@ TO = $(DOC) TARGET = binary include $(COPY_H) -#.PHONY: headers library clean veryclean all binary program doc doc.pt_BR doc.fr +.PHONY: clean clean-subdirs veryclean veryclean-subdirs all binary doc doc: - for dir in $(SUBDIRS); do\ + for i in $(shell ls po/*.po | sed -r 's#po/([a-z]+[A-Z_]*).po#\1#'); do \ + test -d $$i || mkdir $$i; \ + test -f $$i/makefile || sed "s#@@LANG@@#$$i#" lang.makefile > $$i/makefile; \ + done + # it is likely that we have changed the list, so SUBDIRS is incorrect + for dir in $(dir $(wildcard */makefile)); do\ $(MAKE) -C $$dir $@; \ done @@ -70,7 +75,7 @@ doc: po4a clean: po4a-clean -.PHONY: update-po po4a +.PHONY: update-po po4a stats update-po: po4a --previous --no-backups --force --no-translations po4a.conf @@ -79,6 +84,10 @@ po4a-clean: po4a: po4a --previous --no-backups po4a.conf + +stats: + for i in po/*.po; do echo -n "$$i: "; msgfmt --statistics $$i; done + endif ifdef DOXYGEN diff --git a/doc/pl/makefile b/doc/pl/makefile deleted file mode 100644 index 7e77b29b9..000000000 --- a/doc/pl/makefile +++ /dev/null @@ -1,11 +0,0 @@ -# -*- make -*- -BASE=../.. -SUBDIR=doc/pl - -# Bring in the default rules -include ../../buildlib/defaults.mak - -# Language Code of this translation -LC=pl - -include $(PO4A_MANPAGE_H) diff --git a/doc/pt_BR/makefile b/doc/pt_BR/makefile deleted file mode 100644 index 6e485bbf6..000000000 --- a/doc/pt_BR/makefile +++ /dev/null @@ -1,11 +0,0 @@ -# -*- make -*- -BASE=../.. -SUBDIR=doc/pt_BR - -# Bring in the default rules -include ../../buildlib/defaults.mak - -# Language Code of this translation -LC=pt_BR - -include $(PO4A_MANPAGE_H) -- cgit v1.2.3 From 7e2b56a39618589e77ea8c73611ab0aae39aae7f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 17 Mar 2010 14:47:05 +0100 Subject: * apt-pkg/pkgcachegen.cc: - merge versions correctly even if multiple different versions with the same version number are available. Thanks to Magnus Holmgren for the patch! (Closes: #351056) --- apt-pkg/pkgcachegen.cc | 28 +++++++++++----------------- debian/changelog | 4 ++++ 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 3eeb18cae..75a0e34f0 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -175,17 +175,22 @@ bool pkgCacheGenerator::MergeList(ListParser &List, pkgCache::VerIterator Ver = Pkg.VersionList(); map_ptrloc *LastVer = &Pkg->VersionList; int Res = 1; + unsigned long const Hash = List.VersionHash(); for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++) { Res = Cache.VS->CmpVersion(Version,Ver.VerStr()); - if (Res >= 0) + // Version is higher as current version - insert here + if (Res > 0) break; + // Versionstrings are equal - is hash also equal? + if (Res == 0 && Ver->Hash == Hash) + break; + // proceed with the next till we have either the right + // or we found another version (which will be lower) } - - /* We already have a version for this item, record that we - saw it */ - unsigned long Hash = List.VersionHash(); - if (Res == 0 && Ver->Hash == Hash) + + /* We already have a version for this item, record that we saw it */ + if (Res == 0) { if (List.UsePackage(Pkg,Ver) == false) return _error->Error(_("Error occurred while processing %s (UsePackage2)"), @@ -204,17 +209,6 @@ bool pkgCacheGenerator::MergeList(ListParser &List, } continue; - } - - // Skip to the end of the same version set. - if (Res == 0) - { - for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++) - { - Res = Cache.VS->CmpVersion(Version,Ver.VerStr()); - if (Res != 0) - break; - } } // Add a new version diff --git a/debian/changelog b/debian/changelog index ddbf19214..bdafa70e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,10 @@ apt (0.7.26) UNRELEASED; urgency=low * doc/makefile, doc/*: - generate subdirectories for building the manpages in on the fly depending on the po files we have. + * apt-pkg/pkgcachegen.cc: + - merge versions correctly even if multiple different versions + with the same version number are available. + Thanks to Magnus Holmgren for the patch! (Closes: #351056) [ Julian Andres Klode ] * cmdline/apt-mark: -- cgit v1.2.3 From 6086b2b2a250c066b713097ea70a08f9ae225692 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 17 Mar 2010 17:05:57 +0100 Subject: The language directories for manpage building are now autogenerated so we should ignore them. --- .bzrignore | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.bzrignore b/.bzrignore index c4cd052a7..7c4b11b10 100644 --- a/.bzrignore +++ b/.bzrignore @@ -22,12 +22,6 @@ abicheck/tests/ # generated files in the progress to build all # apt man pages and other documentation -doc/*.1 -doc/*.5 -doc/*.8 -doc/*/*.1 -doc/*/*.5 -doc/*/*.8 -doc/*/apt.ent -doc/*/*.xml -doc/*/*.sgml +./doc/*/ +!./doc/examples/ +!./doc/po/ -- cgit v1.2.3 From e426a5ff1cd02797b29f5781be4d6fc8bdf44610 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 18 Mar 2010 13:27:55 +0100 Subject: Fix a segfault in the version merger introduced in the previous patch: As we skip now versions with a different hash we will have situations in which the version is equal but the hash different causing to check the next version, but as this version was the last one the version iterator is invalid then the merger wants to add further information. --- apt-pkg/pkgcachegen.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 75a0e34f0..47ead2df9 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -190,7 +190,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List, } /* We already have a version for this item, record that we saw it */ - if (Res == 0) + if (Res == 0 && Ver.end() == false && Ver->Hash == Hash) { if (List.UsePackage(Pkg,Ver) == false) return _error->Error(_("Error occurred while processing %s (UsePackage2)"), -- cgit v1.2.3 From 306eacf617b8ea8c87b31258c55a5373be4ad946 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 18 Mar 2010 18:07:51 +0100 Subject: generate "negative" dependencies against all architectures of a package Negative means here Conflicts, Replaces and Breaks - this adds again a whole lot of dependencies. --- apt-pkg/deb/deblistparser.cc | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 84eab44a7..5c9cf6d4b 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -609,7 +609,10 @@ bool debListParser::ParseDepends(pkgCache::VerIterator Ver, const char *Stop; if (Section.Find(Tag,Start,Stop) == false) return true; - + + static std::vector const archs = APT::Configuration::getArchitectures(); + static bool const multiArch = archs.size() <= 1; + string Package; string const pkgArch = Ver.Arch(true); string Version; @@ -620,8 +623,18 @@ bool debListParser::ParseDepends(pkgCache::VerIterator Ver, Start = ParseDepends(Start,Stop,Package,Version,Op); if (Start == 0) return _error->Error("Problem parsing dependency %s",Tag); - - if (NewDepends(Ver,Package,pkgArch,Version,Op,Type) == false) + + if (multiArch == true && + (Type == pkgCache::Dep::Conflicts || + Type == pkgCache::Dep::DpkgBreaks || + Type == pkgCache::Dep::Replaces)) + { + for (std::vector::const_iterator a = archs.begin(); + a != archs.end(); ++a) + if (NewDepends(Ver,Package,*a,Version,Op,Type) == false) + return false; + } + else if (NewDepends(Ver,Package,pkgArch,Version,Op,Type) == false) return false; if (Start == Stop) break; -- cgit v1.2.3 From 8d4c859d0d20687a8ffcf9e1d60466d061c2e24d Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 18 Mar 2010 18:51:14 +0100 Subject: Readd the FindPkg() method implementation used in the singleArch days to use it as a fallback if multiarch is not enabled. The effect is barly noticeable but SingleArch is the realworld scenario. --- apt-pkg/pkgcache.cc | 30 +++++++++++++++++++++++++++++- apt-pkg/pkgcache.h | 8 +++++++- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 24d9e0329..fe8757ded 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -108,6 +108,7 @@ bool pkgCache::Header::CheckSizes(Header &Against) const /* */ pkgCache::pkgCache(MMap *Map, bool DoMap) : Map(*Map) { + MultiArchEnabled = APT::Configuration::getArchitectures().size() > 1; if (DoMap == true) ReMap(); } @@ -178,11 +179,31 @@ unsigned long pkgCache::sHash(const char *Str) const return Hash % _count(HeaderP->PkgHashTable); } + /*}}}*/ +// Cache::SingleArchFindPkg - Locate a package by name /*{{{*/ +// --------------------------------------------------------------------- +/* Returns 0 on error, pointer to the package otherwise + The multiArch enabled methods will fallback to this one as it is (a bit) + faster for single arch environments and realworld is mostly singlearch… */ +pkgCache::PkgIterator pkgCache::SingleArchFindPkg(const string &Name) +{ + // Look at the hash bucket + Package *Pkg = PkgP + HeaderP->PkgHashTable[Hash(Name)]; + for (; Pkg != PkgP; Pkg = PkgP + Pkg->NextPackage) + { + if (Pkg->Name != 0 && StrP[Pkg->Name] == Name[0] && + stringcasecmp(Name,StrP + Pkg->Name) == 0) + return PkgIterator(*this,Pkg); + } + return PkgIterator(*this,0); +} /*}}}*/ // Cache::FindPkg - Locate a package by name /*{{{*/ // --------------------------------------------------------------------- /* Returns 0 on error, pointer to the package otherwise */ pkgCache::PkgIterator pkgCache::FindPkg(const string &Name) { + if (MultiArchCache() == false) + return SingleArchFindPkg(Name); size_t const found = Name.find(':'); if (found == string::npos) return FindPkg(Name, "native"); @@ -195,7 +216,14 @@ pkgCache::PkgIterator pkgCache::FindPkg(const string &Name) { // Cache::FindPkg - Locate a package by name /*{{{*/ // --------------------------------------------------------------------- /* Returns 0 on error, pointer to the package otherwise */ -pkgCache::PkgIterator pkgCache::FindPkg(const string &Name, string Arch) { +pkgCache::PkgIterator pkgCache::FindPkg(const string &Name, string const &Arch) { + if (MultiArchCache() == false) { + if (Arch == "native" || Arch == "all" || + Arch == _config->Find("APT::Architecture")) + return SingleArchFindPkg(Name); + else + return PkgIterator(*this,0); + } /* We make a detour via the GrpIterator here as on a multi-arch environment a group is easier to find than a package (less entries in the buckets) */ diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 012caac76..577eebad9 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -126,7 +126,7 @@ class pkgCache /*{{{*/ // Accessors GrpIterator FindGrp(const string &Name); PkgIterator FindPkg(const string &Name); - PkgIterator FindPkg(const string &Name, string Arch); + PkgIterator FindPkg(const string &Name, const string &Arch); Header &Head() {return *HeaderP;}; inline GrpIterator GrpBegin(); @@ -136,6 +136,8 @@ class pkgCache /*{{{*/ inline PkgFileIterator FileBegin(); inline PkgFileIterator FileEnd(); + inline bool MultiArchCache() const { return MultiArchEnabled; }; + // Make me a function pkgVersioningSystem *VS; @@ -146,6 +148,10 @@ class pkgCache /*{{{*/ pkgCache(MMap *Map,bool DoMap = true); virtual ~pkgCache() {}; + +private: + bool MultiArchEnabled; + PkgIterator SingleArchFindPkg(const string &Name); }; /*}}}*/ // Header structure /*{{{*/ -- cgit v1.2.3 From 6083d5ec97c605df51633cf6522df1323f69c29c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 19 Mar 2010 10:54:26 +0100 Subject: =?UTF-8?q?add=20translation=20of=20the=20manpages=20to=20PT=20(po?= =?UTF-8?q?rtuguese)=20Thanks=20to=20Am=C3=A9rico=20Monteiro!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 2 + doc/po/pt.po | 11089 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 11091 insertions(+) create mode 100644 doc/po/pt.po diff --git a/debian/changelog b/debian/changelog index 595285dbf..cd5f2ae1b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ apt (0.7.26) UNRELEASED; urgency=low * Ignore :qualifiers after package name in build dependencies in the library by default, but try to honour them in apt-get as we have some sort of MultiArch support ready (Closes: #558103) + * add translation of the manpages to PT (portuguese) + Thanks to Américo Monteiro! * Switch to dpkg-source 3.0 (native) format * apt-pkg/depcache.cc: - remove Auto-Installed information from extended_states diff --git a/doc/po/pt.po b/doc/po/pt.po new file mode 100644 index 000000000..1e308afdc --- /dev/null +++ b/doc/po/pt.po @@ -0,0 +1,11089 @@ +# Translation of apt manpages to Portuguese +# Copyright (C) 2009 Free Software Foundation, Inc. +# This file is distributed under the same license as the apt-doc package. +# +# Américo Monteiro , 2009, 2010. +msgid "" +msgstr "" +"Project-Id-Version: apt-doc 0.7.26~exp3\n" +"POT-Creation-Date: 2010-03-14 16:41+0100\n" +"PO-Revision-Date: 2010-03-19 00:21+0000\n" +"Last-Translator: Américo Monteiro \n" +"Language-Team: Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.0\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. type: TH +#: apt.8:17 +#, no-wrap +msgid "apt" +msgstr "apt" + +#. type: TH +#: apt.8:17 +#, no-wrap +msgid "16 June 1998" +msgstr "16 Junho 1998" + +#. type: TH +#: apt.8:17 +#, no-wrap +msgid "Debian GNU/Linux" +msgstr "Debian GNU/Linux" + +#. type: SH +#: apt.8:18 +#, no-wrap +msgid "NAME" +msgstr "NOME" + +#. type: Plain text +#: apt.8:20 +msgid "apt - Advanced Package Tool" +msgstr "apt - Advanced Package Tool" + +#. type: SH +#: apt.8:20 +#, no-wrap +msgid "SYNOPSIS" +msgstr "SINOPSE" + +#. type: Plain text +#: apt.8:22 +msgid "B" +msgstr "B" + +#. type: SH +#: apt.8:22 +#, no-wrap +msgid "DESCRIPTION" +msgstr "DESCRIÇÃO" + +#. type: Plain text +#: apt.8:31 +msgid "" +"APT is a management system for software packages. For normal day to day " +"package management there are several frontends available, such as B" +"(8) for the command line or B(8) for the X Window System. Some " +"options are only implemented in B(8) though." +msgstr "" +"APT é um sistema de gestão para pacotes de software. Para a gestão de " +"pacotes normal do dia-a-dia existem vários frontends disponíveis, como o " +"B(8) para a linha de comandos ou o B(8) para o X Window " +"System. No entanto, algumas das opções estão apenas implementadas no B(8)." + +#. type: SH +#: apt.8:31 +#, no-wrap +msgid "OPTIONS" +msgstr "OPÇÕES" + +#. type: Plain text +#: apt.8:33 apt.8:35 +msgid "None." +msgstr "Nenhum." + +#. type: SH +#: apt.8:33 +#, no-wrap +msgid "FILES" +msgstr "FICHEIROS" + +#. type: SH +#: apt.8:35 +#, no-wrap +msgid "SEE ALSO" +msgstr "VEJA TAMBÉM" + +#. type: Plain text +#: apt.8:42 +msgid "" +"B(8), B(8), B(5), B(5), " +"B(5), B(8)" +msgstr "" +"B(8), B(8), B(5), B(5), " +"B(5), B(8)" + +#. type: SH +#: apt.8:42 +#, no-wrap +msgid "DIAGNOSTICS" +msgstr "DIAGNÓSTICOS" + +#. type: Plain text +#: apt.8:44 +msgid "apt returns zero on normal operation, decimal 100 on error." +msgstr "o apt devolve zero na operação normal, 100 decimal em erro." + +#. type: SH +#: apt.8:44 +#, no-wrap +msgid "BUGS" +msgstr "BUGS" + +#. type: Plain text +#: apt.8:46 +msgid "This manpage isn't even started." +msgstr "Este manual ainda nem começou." + +#. type: Plain text +#: apt.8:55 +msgid "" +"See Ehttp://bugs.debian.org/aptE. If you wish to report a bug in " +"B, please see I or the " +"B(1) command." +msgstr "" +"Veja Ehttp://bugs.debian.org/aptE. Se deseja reportar um bug em " +"B, por favor veja I ou o " +"comando B(1) ." + +#. type: SH +#: apt.8:55 +#, no-wrap +msgid "AUTHOR" +msgstr "AUTOR" + +#. type: Plain text +#: apt.8:56 +msgid "apt was written by the APT team Eapt@packages.debian.orgE." +msgstr "apt foi escrito pelo APT team Eapt@packages.debian.orgE." + +#. type: Plain text +#: apt.ent:2 +msgid "" +msgstr "" + +#. type: Plain text +#: apt.ent:10 +msgid "" +" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " +msgstr "" +" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " + +#. type: Plain text +#: apt.ent:17 +#, no-wrap +msgid "" +"\n" +"\n" +" apt.conf\n" +" 5\n" +" \"\n" +">\n" +msgstr "" +"\n" +"\n" +" apt.conf\n" +" 5\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:23 +#, no-wrap +msgid "" +"\n" +" apt-get\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt-get\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:29 +#, no-wrap +msgid "" +"\n" +" apt-config\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt-config\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:35 +#, no-wrap +msgid "" +"\n" +" apt-cdrom\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt-cdrom\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:41 +#, no-wrap +msgid "" +"\n" +" apt-cache\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt-cache\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:47 +#, no-wrap +msgid "" +"\n" +" apt_preferences\n" +" 5\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt_preferences\n" +" 5\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:53 +#, no-wrap +msgid "" +"\n" +" apt-key\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt-key\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:59 +#, no-wrap +msgid "" +"\n" +" apt-secure\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt-secure\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:65 +#, no-wrap +msgid "" +"\n" +" apt-ftparchive\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt-ftparchive\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:72 +#, no-wrap +msgid "" +"\n" +" sources.list\n" +" 5\n" +" \"\n" +">\n" +msgstr "" +"\n" +" sources.list\n" +" 5\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:78 +#, no-wrap +msgid "" +"\n" +" reportbug\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" reportbug\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:84 +#, no-wrap +msgid "" +"\n" +" dpkg\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" dpkg\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:90 +#, no-wrap +msgid "" +"\n" +" dpkg-buildpackage\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" dpkg-buildpackage\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:96 +#, no-wrap +msgid "" +"\n" +" gzip\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" gzip\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:102 +#, no-wrap +msgid "" +"\n" +" dpkg-scanpackages\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" dpkg-scanpackages\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:108 +#, no-wrap +msgid "" +"\n" +" dpkg-scansources\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" dpkg-scansources\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:114 +#, no-wrap +msgid "" +"\n" +" dselect\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" dselect\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:120 +#, no-wrap +msgid "" +"\n" +" aptitude\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" aptitude\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:126 +#, no-wrap +msgid "" +"\n" +" synaptic\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" synaptic\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:132 +#, no-wrap +msgid "" +"\n" +" debsign\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" debsign\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:138 +#, no-wrap +msgid "" +"\n" +" debsig-verify\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" debsig-verify\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:144 +#, no-wrap +msgid "" +"\n" +" gpg\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" gpg\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:150 +#, no-wrap +msgid "" +"\n" +" gnome-apt\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" gnome-apt\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:156 +#, no-wrap +msgid "" +"\n" +" wajig\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" wajig\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:168 +#, no-wrap +msgid "" +"\n" +"\n" +"
apt@packages.debian.org
\n" +" \n" +" Jason Gunthorpe\n" +" \n" +" \n" +" 1998-2001 Jason Gunthorpe\n" +" 28 October 2008\n" +" Linux\n" +msgstr "" +"\n" +"\n" +"
apt@packages.debian.org
\n" +" \n" +" Jason Gunthorpe\n" +" \n" +" \n" +" 1998-2001 Jason Gunthorpe\n" +" 28 Outubro 2008\n" +" Linux\n" + +#. type: Plain text +#: apt.ent:171 +#, no-wrap +msgid "" +" \n" +"\"> \n" +msgstr "" +" \n" +"\"> \n" + +#. type: Plain text +#: apt.ent:177 +#, no-wrap +msgid "" +"\n" +" apt@packages.debian.org\n" +" \n" +"\">\n" +msgstr "" +"\n" +" apt@packages.debian.org\n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:185 +#, no-wrap +msgid "" +"\n" +" Jason\n" +" Gunthorpe\n" +" \n" +" \n" +"\">\n" +msgstr "" +"\n" +" Jason\n" +" Gunthorpe\n" +" \n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:193 +#, no-wrap +msgid "" +"\n" +" Mike\n" +" O'Connor\n" +" \n" +" \n" +"\">\n" +msgstr "" +"\n" +" Mike\n" +" O'Connor\n" +" \n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:200 +#, no-wrap +msgid "" +"\n" +" APT team\n" +" \n" +" \n" +"\">\n" +msgstr "" +"\n" +" APT team\n" +" \n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:204 apt.ent:215 +#, no-wrap +msgid "" +"Linux\n" +"\">\n" +msgstr "" +"Linux\n" +"\">\n" + +#. type: Plain text +#: apt.ent:211 +#, no-wrap +msgid "" +"\n" +" Jason Gunthorpe\n" +" 1998-2001\n" +" \n" +"\">\n" +msgstr "" +"\n" +" Jason Gunthorpe\n" +" 1998-2001\n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:221 +#, no-wrap +msgid "" +"\n" +"\t\tQA Page\n" +"\t\n" +"\">\n" +msgstr "" +"\n" +"\t\tQA Page\n" +"\t\n" +"\">\n" + +#. type: Plain text +#: apt.ent:232 +#, no-wrap +msgid "" +"\n" +"Bugs\n" +" APT bug page. \n" +" If you wish to report a bug in APT, please see\n" +" /usr/share/doc/debian/bug-reporting.txt or the\n" +" &reportbug; command.\n" +" \n" +" \n" +"\">\n" +msgstr "" +"\n" +"Bugs\n" +" página de bugs do APT. \n" +" Se deseja reportar um bug no APT, por favor veja\n" +" /usr/share/doc/debian/bug-reporting.txt ou o\n" +" comando &reportbug;.\n" +" \n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:240 +#, no-wrap +msgid "" +"\n" +"Author\n" +" APT was written by the APT team apt@packages.debian.org.\n" +" \n" +" \n" +"\">\n" +msgstr "" +"\n" +"Autor\n" +" APT foi escrito pela equipa do APT apt@packages.debian.org.\n" +" \n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:250 +#, no-wrap +msgid "" +"\n" +"\n" +" \n" +" Show a short usage summary.\n" +" \n" +" \n" +" \n" +msgstr "" +"\n" +"\n" +" \n" +" Mostra um sumário curto da utilização.\n" +" \n" +" \n" +" \n" + +#. type: Plain text +#: apt.ent:258 +#, no-wrap +msgid "" +" \n" +" \n" +" \n" +" Show the program version.\n" +" \n" +" \n" +" \n" +msgstr "" +" \n" +" \n" +" \n" +" Mostra a versão do programa.\n" +" \n" +" \n" +" \n" + +#. type: Plain text +#: apt.ent:268 +#, no-wrap +msgid "" +" \n" +" \n" +" \n" +" Configuration File; Specify a configuration file to use. \n" +" The program will read the default configuration file and then this \n" +" configuration file. See &apt-conf; for syntax information. \n" +" \n" +" \n" +" \n" +msgstr "" +" \n" +" \n" +" \n" +" Ficheiro de Configuração; Especifica um ficheiro de configuração a usar. \n" +" O programa irá ler o ficheiro de configuração predefinido e depois este \n" +" ficheiro de configuração. Veja &apt-conf; para informação de sintaxe. \n" +" \n" +" \n" +" \n" + +#. type: Plain text +#: apt.ent:280 +#, no-wrap +msgid "" +" \n" +" \n" +" \n" +" Set a Configuration Option; This will set an arbitrary\n" +" configuration option. The syntax is .\n" +" and can be used multiple\n" +" times to set different options.\n" +" \n" +" \n" +" \n" +"\">\n" +msgstr "" +" \n" +" \n" +" \n" +" Define uma Opção de Configuração; Isto irá definir uma opção\n" +" de configuração arbitrária. A sintaxe é .\n" +" e podem ser usadas várias\n" +" vezes para definir opções diferentes.\n" +" \n" +" \n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:291 +#, no-wrap +msgid "" +"\n" +"All command line options may be set using the configuration file, the\n" +" descriptions indicate the configuration option to set. For boolean\n" +" options you can override the config file by using something like \n" +" ,, \n" +" or several other variations.\n" +" \n" +"\">\n" +msgstr "" +"\n" +"Todas as opções de linha de comandos podem ser definidas usando o ficheiro de configuração, as\n" +" descrições indicam a opção de configuração a definir. Para opções\n" +" booleanas você pode sobre por o ficheiro de configuração usando algo como \n" +" ,, \n" +" ou várias outras variantes.\n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:297 +#, no-wrap +msgid "" +"/etc/apt/apt.conf\n" +" APT configuration file.\n" +" Configuration Item: Dir::Etc::Main.\n" +" \n" +msgstr "" +"/etc/apt/apt.conf\n" +" Ficheiro de configuração do APT.\n" +" Item de Configuração: Dir::Etc::Main.\n" +" \n" + +#. type: Plain text +#: apt.ent:303 +#, no-wrap +msgid "" +" /etc/apt/apt.conf.d/\n" +" APT configuration file fragments.\n" +" Configuration Item: Dir::Etc::Parts.\n" +" \n" +"\">\n" +msgstr "" +" /etc/apt/apt.conf.d/\n" +" Ficheiros de configuração fragmentados do APT.\n" +" Item de Configuração: Dir::Etc::Parts.\n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:309 +#, no-wrap +msgid "" +"&cachedir;/archives/\n" +" Storage area for retrieved package files.\n" +" Configuration Item: Dir::Cache::Archives.\n" +" \n" +msgstr "" +"&cachedir;/archives/\n" +" Área de armazenamento para ficheiros de pacotes obtidos.\n" +" Item de Configuração: Dir::Cache::Archives.\n" +" \n" + +#. type: Plain text +#: apt.ent:315 +#, no-wrap +msgid "" +" &cachedir;/archives/partial/\n" +" Storage area for package files in transit.\n" +" Configuration Item: Dir::Cache::Archives (implicit partial). \n" +" \n" +"\">\n" +msgstr "" +" &cachedir;/archives/partial/\n" +" Área de armazenamento para ficheiros de pacotes em curso.\n" +" Item de Configuração: Dir::Cache::Archives (implicit partial). \n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:325 +#, no-wrap +msgid "" +"/etc/apt/preferences\n" +" Version preferences file.\n" +" This is where you would specify "pinning",\n" +" i.e. a preference to get certain packages\n" +" from a separate source\n" +" or from a different version of a distribution.\n" +" Configuration Item: Dir::Etc::Preferences.\n" +" \n" +msgstr "" +"/etc/apt/preferences\n" +" Ficheiro de preferências de versão.\n" +" Isto é onde você deve especificar "pinning",\n" +" isto é, uma preferência para obter certos pacotes\n" +" A partir de uma fonte separada\n" +" ou a partir duma versão diferente de uma distribuição.\n" +" Item de Configuração: Dir::Etc::Preferences.\n" +" \n" + +#. type: Plain text +#: apt.ent:331 +#, no-wrap +msgid "" +" /etc/apt/preferences.d/\n" +" File fragments for the version preferences.\n" +" Configuration Item: Dir::Etc::PreferencesParts.\n" +" \n" +"\">\n" +msgstr "" +" /etc/apt/preferences.d/\n" +" Ficheiros fragmentados para as preferências de versão.\n" +" Item de Configuração: Dir::Etc::PreferencesParts.\n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:337 +#, no-wrap +msgid "" +"/etc/apt/sources.list\n" +" Locations to fetch packages from.\n" +" Configuration Item: Dir::Etc::SourceList.\n" +" \n" +msgstr "" +"/etc/apt/sources.list\n" +" Localizações de onde obter pacotes.\n" +" Item de Configuração: Dir::Etc::SourceList.\n" +" \n" + +#. type: Plain text +#: apt.ent:343 +#, no-wrap +msgid "" +" /etc/apt/sources.list.d/\n" +" File fragments for locations to fetch packages from.\n" +" Configuration Item: Dir::Etc::SourceParts.\n" +" \n" +"\">\n" +msgstr "" +" /etc/apt/sources.list.d/\n" +" Ficheiros fragmentados para localizações de onde obter pacotes.\n" +" Item de Configuração: Dir::Etc::SourceParts.\n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:350 +#, no-wrap +msgid "" +"&statedir;/lists/\n" +" Storage area for state information for each package resource specified in\n" +" &sources-list;\n" +" Configuration Item: Dir::State::Lists.\n" +" \n" +msgstr "" +"&statedir;/lists/\n" +" Área de armazenamento para informação de estado para cada recurso de pacote especificado em\n" +" &sources-list;\n" +" Tem de Configuração: Dir::State::Lists.\n" +" \n" + +#. type: Plain text +#: apt.ent:356 +#, no-wrap +msgid "" +" &statedir;/lists/partial/\n" +" Storage area for state information in transit.\n" +" Configuration Item: Dir::State::Lists (implicit partial).\n" +" \n" +"\">\n" +msgstr "" +" &statedir;/lists/partial/\n" +" Área de armazenamento para informação de estado em trânsito.\n" +" Item de Configuração: Dir::State::Lists (parcial implícito).\n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:362 +#, no-wrap +msgid "" +"/etc/apt/trusted.gpg\n" +" Keyring of local trusted keys, new keys will be added here.\n" +" Configuration Item: Dir::Etc::Trusted.\n" +" \n" +msgstr "" +"/etc/apt/trusted.gpg\n" +" Chaveiro de chaves de confiança locais, as novas chaves serão adicionadas aqui.\n" +" Item de Configuração: Dir::Etc::Trusted.\n" +" \n" + +#. type: Plain text +#: apt.ent:369 +#, no-wrap +msgid "" +" /etc/apt/trusted.gpg.d/\n" +" File fragments for the trusted keys, additional keyrings can\n" +" be stored here (by other packages or the administrator).\n" +" Configuration Item Dir::Etc::TrustedParts.\n" +" \n" +"\">\n" +msgstr "" +" /etc/apt/trusted.gpg.d/\n" +" Fragmentos de ficheiro para as chaves de confiança, chaveiros adicionais podem\n" +" ser armazenados aqui (por outros pacotes ou pelo administrador).\n" +" Item de Configuração Dir::Etc::TrustedParts.\n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:371 +msgid "" +msgstr "" + +#. type: Plain text +#: apt.ent:380 +#, no-wrap +msgid "" +"\n" +"john@doe.org in 2009,\n" +" 2010 and Daniela Acme daniela@acme.us in 2010 together with the\n" +" Debian Dummy l10n Team debian-l10n-dummy@lists.debian.org.\n" +"\">\n" +msgstr "" +"a_monteiro@netcabo.pt em 2009, 2010.\n" +" A tradução foi revista pela equipa de traduções portuguesas da Debian traduz@debianpt.org.\n" +"\">\n" + +#. type: Plain text +#: apt.ent:387 +#, no-wrap +msgid "" +"\n" +"\n" +msgstr "" +"\n" + +#. The last update date +#. type: Content of: +#: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 +#: apt-sortpkgs.1.xml:13 sources.list.5.xml:13 +msgid "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; 29 " +"February 2004" +msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; 29 " +"Fevereiro 2004" + +#. type: Content of: +#: apt-cache.8.xml:22 apt-cache.8.xml:29 +msgid "apt-cache" +msgstr "apt-cache" + +#. type: Content of: +#: apt-cache.8.xml:23 apt-cdrom.8.xml:22 apt-config.8.xml:23 apt-get.8.xml:23 +#: apt-key.8.xml:15 apt-mark.8.xml:23 apt-secure.8.xml:15 +msgid "8" +msgstr "8" + +#. type: Content of: +#: apt-cache.8.xml:24 apt-cdrom.8.xml:23 apt-config.8.xml:24 +#: apt-extracttemplates.1.xml:24 apt-ftparchive.1.xml:24 apt-get.8.xml:24 +#: apt-key.8.xml:16 apt-mark.8.xml:24 apt-secure.8.xml:16 +#: apt-sortpkgs.1.xml:24 apt.conf.5.xml:30 apt_preferences.5.xml:23 +#: sources.list.5.xml:24 +msgid "APT" +msgstr "APT" + +#. type: Content of: +#: apt-cache.8.xml:30 +msgid "APT package handling utility -- cache manipulator" +msgstr "Utilitário de manuseamento de pacotes do APT -- manipulador de cache" + +#. type: Content of: +#: apt-cache.8.xml:36 +msgid "" +"apt-cache " +"add file gencaches showpkg pkg " +"showsrc pkg stats dump dumpavail unmet search regex show pkg depends pkg " +"rdepends pkg pkgnames prefix dotty pkg " +"xvcg pkg policy pkgs madison pkgs " +msgstr "" +"apt-cache " +" add ficheiro gencaches " +"showpkg pacote showsrc pacote stats dump dumpavail unmet search regex show pacote depends " +"pacote rdepends pacote pkgnames prefixo dotty pacote xvcg pacote policy pacotes madison pacotes " + +#. type: Content of: +#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 +#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125 +#: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 +#: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 +#: sources.list.5.xml:33 +msgid "Description" +msgstr "Descrição" + +#. type: Content of: <refentry><refsect1><para> +#: apt-cache.8.xml:63 +msgid "" +"<command>apt-cache</command> performs a variety of operations on APT's " +"package cache. <command>apt-cache</command> does not manipulate the state of " +"the system but does provide operations to search and generate interesting " +"output from the package metadata." +msgstr "" +"<command>apt-cache</command> executa uma variedade de operações na cache de " +"pacotes do APT. <command>apt-cache</command> não manipula o estado do " +"sistema mas fornece operações para procurar e gerar resultados interessantes " +"a partir dos metadados do pacote." + +#. type: Content of: <refentry><refsect1><para> +#: apt-cache.8.xml:68 apt-get.8.xml:131 +msgid "" +"Unless the <option>-h</option>, or <option>--help</option> option is given, " +"one of the commands below must be present." +msgstr "" +"A menos que a opção <option>-h</option>, ou <option>--help</option> seja " +"fornecida, um dos comandos abaixo têm que estar presentes." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:72 +msgid "add <replaceable>file(s)</replaceable>" +msgstr "add <replaceable>ficheiro(s)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:73 +msgid "" +"<literal>add</literal> adds the named package index files to the package " +"cache. This is for debugging only." +msgstr "" +"<literal>add</literal> adiciona ficheiros índice do pacote nomeado à cache " +"pacotes. Isto é apenas para depuração." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:77 +msgid "gencaches" +msgstr "gencaches" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:78 +msgid "" +"<literal>gencaches</literal> performs the same operation as <command>apt-get " +"check</command>. It builds the source and package caches from the sources in " +"&sources-list; and from <filename>/var/lib/dpkg/status</filename>." +msgstr "" +"<literal>gencaches</literal> executa a mesma operação que o <command>apt-get " +"check</command>. Constrói as caches de fonte e pacote a partir das fontes em " +"&sources-list; e a partir de <filename>/var/lib/dpkg/status</filename>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:84 +msgid "showpkg <replaceable>pkg(s)</replaceable>" +msgstr "showpkg <replaceable>pacote(s)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:85 +msgid "" +"<literal>showpkg</literal> displays information about the packages listed on " +"the command line. Remaining arguments are package names. The available " +"versions and reverse dependencies of each package listed are listed, as well " +"as forward dependencies for each version. Forward (normal) dependencies are " +"those packages upon which the package in question depends; reverse " +"dependencies are those packages that depend upon the package in question. " +"Thus, forward dependencies must be satisfied for a package, but reverse " +"dependencies need not be. For instance, <command>apt-cache showpkg " +"libreadline2</command> would produce output similar to the following:" +msgstr "" +"<literal>showpkg</literal> mostra informação acerca dos pacotes listados na " +"linha de comandos. Os argumentos restantes são nomes de pacotes. São " +"listadas as versões disponíveis e dependências reversas de cada pacote " +"listado, assim como as dependências dianteiras de cada versão. Dependências " +"dianteiras (normais) são aqueles pacotes de que o pacote em questão depende; " +"dependências reversas são aqueles pacotes que dependem do pacote em questão. " +"Assim, as dependências dianteiras de um pacote têm de ser satisfeitas, mas " +"as dependências reversas não precisam de ser. Por exemplo, <command>apt-" +"cache showpkg libreadline2</command> deverá produzir resultados semelhantes " +"ao seguinte:" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> +#: apt-cache.8.xml:97 +#, no-wrap +msgid "" +"Package: libreadline2\n" +"Versions: 2.1-12(/var/state/apt/lists/foo_Packages),\n" +"Reverse Depends: \n" +" libreadlineg2,libreadline2\n" +" libreadline2-altdev,libreadline2\n" +"Dependencies:\n" +"2.1-12 - libc5 (2 5.4.0-0) ncurses3.0 (0 (null))\n" +"Provides:\n" +"2.1-12 - \n" +"Reverse Provides: \n" +msgstr "" +"Pacote: libreadline2\n" +"Versões: 2.1-12(/var/state/apt/lists/foo_Packages),\n" +"Dependências Reversas Depends: \n" +" libreadlineg2,libreadline2\n" +" libreadline2-altdev,libreadline2\n" +"Dependências:\n" +"2.1-12 - libc5 (2 5.4.0-0) ncurses3.0 (0 (null))\n" +"Fornecimentos:\n" +"2.1-12 - \n" +"Fornecimentos Reversos: \n" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:109 +msgid "" +"Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and " +"ncurses3.0 which must be installed for libreadline2 to work. In turn, " +"libreadlineg2 and libreadline2-altdev depend on libreadline2. If " +"libreadline2 is installed, libc5 and ncurses3.0 (and ldso) must also be " +"installed; libreadlineg2 and libreadline2-altdev do not have to be " +"installed. For the specific meaning of the remainder of the output it is " +"best to consult the apt source code." +msgstr "" +"Assim pode-se ver que libreadline2, versão 2.1-12, depende de libc5 e " +"ncurses3.0 que têm que ser instalados para que libreadline2 funcione. Por " +"sua vez, libreadlineg2 e libreadline2-altdev dependem de libreadline2. Se " +"libreadline2 for instalado, libc5 e ncurses3.0 (e ldso) também têm que ser " +"instalados; libreadlineg2 e libreadline2-altdev não precisam de ser " +"instalados. Para o significado específico do lembrete da saída é melhor " +"consultar o código fonte do apt." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:118 +msgid "stats" +msgstr "stats" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:118 +msgid "" +"<literal>stats</literal> displays some statistics about the cache. No " +"further arguments are expected. Statistics reported are:" +msgstr "" +"<literal>stats</literal> mostra algumas estatísticas acerca da cache. Não " +"são esperados mais argumentos. As estatísticas reportadas são:" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:121 +msgid "" +"<literal>Total package names</literal> is the number of package names found " +"in the cache." +msgstr "" +"<literal>Total package names</literal> é o número de nomes de pacotes " +"encontrados na cache." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:125 +msgid "" +"<literal>Normal packages</literal> is the number of regular, ordinary " +"package names; these are packages that bear a one-to-one correspondence " +"between their names and the names used by other packages for them in " +"dependencies. The majority of packages fall into this category." +msgstr "" +"<literal>Normal packages</literal> é o número de nomes de pacotes regulares " +"e ordinários; estes são pacotes que têm uma correspondência de um-para-um " +"entre os seus nomes e os nomes usados por outros pacotes para eles nas " +"dependências. A maioria dos pacotes caem nesta categoria." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:131 +msgid "" +"<literal>Pure virtual packages</literal> is the number of packages that " +"exist only as a virtual package name; that is, packages only \"provide\" the " +"virtual package name, and no package actually uses the name. For instance, " +"\"mail-transport-agent\" in the Debian GNU/Linux system is a pure virtual " +"package; several packages provide \"mail-transport-agent\", but there is no " +"package named \"mail-transport-agent\"." +msgstr "" +"<literal>Pure virtual packages</literal> é o número de pacotes que existem " +"apenas como nome de pacote virtual; isto é, os pacotes apenas " +"\"disponibilizam\" o nome do pacote virtual, e nenhum pacote usa realmente o " +"nome. Por exemplo, \"mail-transport-agent\" no sistema Debian GNU/Linux é um " +"pacote puramente virtual; vários pacotes disponibilizam \"mail-transport-" +"agent\", mas não existe um existe um pacote chamado \"mail-transport-agent\"." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:139 +msgid "" +"<literal>Single virtual packages</literal> is the number of packages with " +"only one package providing a particular virtual package. For example, in the " +"Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only " +"one package, xless, provides \"X11-text-viewer\"." +msgstr "" +"<literal>Single virtual packages</literal> é o número de pacotes com apenas " +"um pacote a disponibilizar um pacote virtual particular. Por exemplo, no " +"sistema Debian GNU/Linux, \"X11-text-viewer\" é um pacote virtual, mas " +"apenas um pacote, xless, disponibiliza \"X11-text-viewer\"." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:145 +msgid "" +"<literal>Mixed virtual packages</literal> is the number of packages that " +"either provide a particular virtual package or have the virtual package name " +"as the package name. For instance, in the Debian GNU/Linux system, \"debconf" +"\" is both an actual package, and provided by the debconf-tiny package." +msgstr "" +"<literal>Mixed virtual packages</literal> é o número de pacotes que ou " +"disponibilizam um pacote virtual particular ou têm o nome de pacote virtual " +"como o nome de pacote. Por exemplo, no sistema Debian GNU/Linux, \"debconf\" " +"é tanto um pacote real, como também disponibilizado pelo pacote debconf-tiny." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:152 +msgid "" +"<literal>Missing</literal> is the number of package names that were " +"referenced in a dependency but were not provided by any package. Missing " +"packages may be an evidence if a full distribution is not accessed, or if a " +"package (real or virtual) has been dropped from the distribution. Usually " +"they are referenced from Conflicts or Breaks statements." +msgstr "" +"<literal>Missing</literal> é o número de nomes de pacotes que são " +"referenciados numa dependência mas não foram disponibilizados por nenhum " +"pacote. Os pacotes em falta podem ser uma evidência de que não se está a " +"aceder ao total de uma distribuição, ou que um pacote (real ou virtual) foi " +"removido da distribuição. Normalmente são referenciados a partir de " +"declarações de Conflitos ou Breaks." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:159 +msgid "" +"<literal>Total distinct</literal> versions is the number of package versions " +"found in the cache; this value is therefore at least equal to the number of " +"total package names. If more than one distribution (both \"stable\" and " +"\"unstable\", for instance), is being accessed, this value can be " +"considerably larger than the number of total package names." +msgstr "" +"<literal>Total distinct versions</literal> é o número de versões de pacotes " +"encontrados na cache; este valor é portanto pelo menos igual ao número do " +"total de nomes de pacotes. Se mais do que uma distribuição (ambas \"stable\" " +"e \"unstable\", por exemplo) está a ser acedida, este valor pode ser " +"consideravelmente maior que o número do total de nomes de pacotes." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:166 +msgid "" +"<literal>Total dependencies</literal> is the number of dependency " +"relationships claimed by all of the packages in the cache." +msgstr "" +"<literal>Total dependencies</literal> é o número de relacionamentos com " +"dependências reivindicadas por todos os pacotes na cache." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:173 +msgid "showsrc <replaceable>pkg(s)</replaceable>" +msgstr "showsrc <replaceable>pacote(s)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:174 +msgid "" +"<literal>showsrc</literal> displays all the source package records that " +"match the given package names. All versions are shown, as well as all " +"records that declare the name to be a Binary." +msgstr "" +"<literal>showsrc</literal> mostra todos os registos de pacotes fonte que " +"correspondem aos nomes de pacotes fornecidos. Todas as versões são " +"mostradas, assim como todos os registos que declaram o nome como sendo um " +"Binário." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:179 apt-config.8.xml:84 +msgid "dump" +msgstr "dump" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:180 +msgid "" +"<literal>dump</literal> shows a short listing of every package in the cache. " +"It is primarily for debugging." +msgstr "" +"<literal>dump</literal> mostra uma listagem curta de todos os pacotes na " +"cache. É principalmente para depuração." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:184 +msgid "dumpavail" +msgstr "dumpavail" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:185 +msgid "" +"<literal>dumpavail</literal> prints out an available list to stdout. This is " +"suitable for use with &dpkg; and is used by the &dselect; method." +msgstr "" +"<literal>dumpavail</literal> escreve uma lista de disponibilidades no " +"stdout. Isto é apropriado para usar com o &dpkg; e é usado pelo método " +"&dselect;." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:189 +msgid "unmet" +msgstr "unmet" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:190 +msgid "" +"<literal>unmet</literal> displays a summary of all unmet dependencies in the " +"package cache." +msgstr "" +"<literal>unmet</literal> mostra um sumário de todas as dependências " +"insatisfeitas na cache do pacote." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:194 +msgid "show <replaceable>pkg(s)</replaceable>" +msgstr "show <replaceable>pacote(s)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:195 +msgid "" +"<literal>show</literal> performs a function similar to <command>dpkg --print-" +"avail</command>; it displays the package records for the named packages." +msgstr "" +"<literal>show</literal> executa uma função semelhante ao <command>dpkg --" +"print-avail</command>; mostra os registos do pacote para os pacotes nomeados." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:200 +msgid "search <replaceable>regex [ regex ... ]</replaceable>" +msgstr "search <replaceable>regex [ regex ... ]</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:201 +msgid "" +"<literal>search</literal> performs a full text search on all available " +"package lists for the POSIX regex pattern given, see " +"<citerefentry><refentrytitle><command>regex</command></refentrytitle> " +"<manvolnum>7</manvolnum></citerefentry>. It searches the package names and " +"the descriptions for an occurrence of the regular expression and prints out " +"the package name and the short description, including virtual package " +"names. If <option>--full</option> is given then output identical to " +"<literal>show</literal> is produced for each matched package, and if " +"<option>--names-only</option> is given then the long description is not " +"searched, only the package name is." +msgstr "" +"<literal>search</literal> executa uma busca de texto completo em todas as " +"listas de pacotes disponíveis para o padrão POSIX regex fornecido, veja " +"<citerefentry><refentrytitle><command>regex</command></refentrytitle> " +"<manvolnum>7</manvolnum></citerefentry>. Procura nos nomes de pacotes e nas " +"descrições por uma ocorrência da expressão regular e escreve o nome do " +"pacote e a descrição curta, incluindo nomes de pacotes virtuais. Se for " +"fornecido <option>--full</option> então são produzidos resultados idênticos " +"ao <literal>show</literal> para cada pacote correspondente, e se for " +"fornecido <option>--names-only</option> então não há procura na descrição " +"longa, apenas no nome do pacote." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:214 +msgid "" +"Separate arguments can be used to specify multiple search patterns that are " +"and'ed together." +msgstr "" +"Podem ser usados argumentos separados para especificar múltiplos padrões de " +"busca os quais são lidados em conjunto." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:218 +msgid "depends <replaceable>pkg(s)</replaceable>" +msgstr "depends <replaceable>pacote(s)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:219 +msgid "" +"<literal>depends</literal> shows a listing of each dependency a package has " +"and all the possible other packages that can fulfill that dependency." +msgstr "" +"<literal>depends</literal> mostra uma listagem de cada dependência que um " +"pacote tem e todos os outros pacotes possíveis que podem satisfazer essa " +"dependência." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:223 +msgid "rdepends <replaceable>pkg(s)</replaceable>" +msgstr "rdepends <replaceable>pacote(s)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:224 +msgid "" +"<literal>rdepends</literal> shows a listing of each reverse dependency a " +"package has." +msgstr "" +"<literal>rdepends</literal> mostra uma listagem de cada dependência reversa " +"que um pacote tem." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:228 +msgid "pkgnames <replaceable>[ prefix ]</replaceable>" +msgstr "pkgnames <replaceable>[ prefixo ]</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:229 +msgid "" +"This command prints the name of each package APT knows. The optional " +"argument is a prefix match to filter the name list. The output is suitable " +"for use in a shell tab complete function and the output is generated " +"extremely quickly. This command is best used with the <option>--generate</" +"option> option." +msgstr "" +"Este comando escreve o nome de cada pacote que o APT conhece. O argumento " +"opcional é um prefixo de correspondência para filtrar a lista de nomes. O " +"resultado é apropriado para usar numa função completa de consola e o " +"resultado é gerado com extrema rapidez. Este comando fica melhor usado com a " +"opção <option>--generate</option>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:234 +msgid "" +"Note that a package which APT knows of is not necessarily available to " +"download, installable or installed, e.g. virtual packages are also listed in " +"the generated list." +msgstr "" +"Note que um pacote que o APT conheça não está necessariamente disponível " +"para download, instalável ou instalado, por exemplo, os pacotes virtuais " +"também são listados na lista gerada." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:239 +msgid "dotty <replaceable>pkg(s)</replaceable>" +msgstr "dotty <replaceable>pacote(s)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:240 +msgid "" +"<literal>dotty</literal> takes a list of packages on the command line and " +"generates output suitable for use by dotty from the <ulink url=\"http://www." +"research.att.com/sw/tools/graphviz/\">GraphViz</ulink> package. The result " +"will be a set of nodes and edges representing the relationships between the " +"packages. By default the given packages will trace out all dependent " +"packages; this can produce a very large graph. To limit the output to only " +"the packages listed on the command line, set the <literal>APT::Cache::" +"GivenOnly</literal> option." +msgstr "" +"<literal>dotty</literal> recebe uma lista de pacotes na linha de comandos e " +"gera resultados apropriados para uso pelo dotty do pacote <ulink url=" +"\"http://www.research.att.com/sw/tools/graphviz/\">GraphViz</ulink>. O " +"resultado será um conjunto de nós e orlas que representam os relacionamentos " +"entre os pacotes. Por predefinição, os pacotes fornecidos irão seguir todos " +"os pacotes dependentes; isto pode produzir um gráfico muito grande. Para " +"limitar os resultados apenas aos pacotes listados na linha de comandos, " +"defina a opção <literal>APT::Cache::GivenOnly</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:249 +msgid "" +"The resulting nodes will have several shapes; normal packages are boxes, " +"pure provides are triangles, mixed provides are diamonds, missing packages " +"are hexagons. Orange boxes mean recursion was stopped [leaf packages], blue " +"lines are pre-depends, green lines are conflicts." +msgstr "" +"Os nós resultantes irão ter várias formas; pacotes normais são caixas, " +"fornecimentos puros são triângulos, fornecimentos mistos são diamantes, " +"pacotes desaparecidos são hexágonos. Caixas cor de laranja significa que a " +"recursão parou [pacotes leaf], linhas azuis são pré-dependências, linhas " +"verdes são conflitos." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:254 +msgid "Caution, dotty cannot graph larger sets of packages." +msgstr "" +"Atenção, o dotty não consegue fazer gráficos com grandes conjuntos de " +"pacotes." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:257 +msgid "xvcg <replaceable>pkg(s)</replaceable>" +msgstr "xvcg <replaceable>pacote(s)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:258 +msgid "" +"The same as <literal>dotty</literal>, only for xvcg from the <ulink url=" +"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>." +msgstr "" +"O mesmo que <literal>dotty</literal>, apenas para xvcg a partir de <ulink " +"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">Ferramenta " +"VCG</ulink>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:262 +msgid "policy <replaceable>[ pkg(s) ]</replaceable>" +msgstr "policy <replaceable>[ pacote(s) ]</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:263 +msgid "" +"<literal>policy</literal> is meant to help debug issues relating to the " +"preferences file. With no arguments it will print out the priorities of each " +"source. Otherwise it prints out detailed information about the priority " +"selection of the named package." +msgstr "" +"<literal>policy</literal> destina-se a ajudar a depurar problemas " +"relacionados com o ficheiro de preferências. Sem argumentos irá escrever as " +"propriedades de cada fonte. Caso contrário escreve informação detalhada " +"acerca da selecção de prioridade do pacote nomeado." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:269 +msgid "madison <replaceable>/[ pkg(s) ]</replaceable>" +msgstr "madison <replaceable>/[ pacote(s) ]</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:270 +msgid "" +"<literal>apt-cache</literal>'s <literal>madison</literal> command attempts " +"to mimic the output format and a subset of the functionality of the Debian " +"archive management tool, <literal>madison</literal>. It displays available " +"versions of a package in a tabular format. Unlike the original " +"<literal>madison</literal>, it can only display information for the " +"architecture for which APT has retrieved package lists (<literal>APT::" +"Architecture</literal>)." +msgstr "" +"O comando <literal>madison</literal> do <literal>apt-cache</literal> tenta " +"imitar o formato de saída e um subconjunto das funcionalidades da ferramenta " +"<literal>madison</literal> de gestão de pacotes da Debian. Mostra versões " +"disponíveis de um pacote num formato tabular. Ao contrário do " +"<literal>madison</literal> original, apenas pode mostrar informação para a " +"arquitectura que o APT recolheu listas de pacotes (<literal>APT::" +"Architecture</literal>)." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 +#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 +msgid "options" +msgstr "opções" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:285 +msgid "<option>-p</option>" +msgstr "<option>-p</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:285 +msgid "<option>--pkg-cache</option>" +msgstr "<option>--pkg-cache</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:286 +msgid "" +"Select the file to store the package cache. The package cache is the primary " +"cache used by all operations. Configuration Item: <literal>Dir::Cache::" +"pkgcache</literal>." +msgstr "" +"Selecciona o ficheiro para armazenar a cache do pacote. A cache do pacote é " +"a cache principal usada por todas as operações. Item de Configuração: " +"<literal>Dir::Cache::pkgcache</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376 +#: apt-sortpkgs.1.xml:58 +msgid "<option>-s</option>" +msgstr "<option>-s</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:291 +msgid "<option>--src-cache</option>" +msgstr "<option>--src-cache</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:292 +msgid "" +"Select the file to store the source cache. The source is used only by " +"<literal>gencaches</literal> and it stores a parsed version of the package " +"information from remote sources. When building the package cache the source " +"cache is used to avoid reparsing all of the package files. Configuration " +"Item: <literal>Dir::Cache::srcpkgcache</literal>." +msgstr "" +"Selecciona o ficheiro para armazenar a cache de fonte. A fonte é usada " +"apenas pelo <literal>gencaches</literal> e armazena uma versão analisada da " +"informação do pacote a partir de fontes remotas. Ao construir a cache de " +"pacote é usada a cache fonte para evitar reanalisar todos os ficheiros do " +"pacote. Item de Configuração: <literal>Dir::Cache::srcpkgcache</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 +msgid "<option>-q</option>" +msgstr "<option>-q</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 +msgid "<option>--quiet</option>" +msgstr "<option>--quiet</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:300 +msgid "" +"Quiet; produces output suitable for logging, omitting progress indicators. " +"More q's will produce more quietness up to a maximum of 2. You can also use " +"<option>-q=#</option> to set the quietness level, overriding the " +"configuration file. Configuration Item: <literal>quiet</literal>." +msgstr "" +"Quiet; produz resultados apropriados para registar em logs, omitindo os " +"indicadores de progresso. Mais q's irão produzir mais serenidade até um " +"máximo de 2. Você também pode usar <option>-q=#</option> para definir o " +"nível de serenidade, sobrepondo o ficheiro de configuração. Item de " +"Configuração: <literal>quiet</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:306 +msgid "<option>-i</option>" +msgstr "<option>-i</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:306 +msgid "<option>--important</option>" +msgstr "<option>--important</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:307 +msgid "" +"Print only important dependencies; for use with unmet and depends. Causes " +"only Depends and Pre-Depends relations to be printed. Configuration Item: " +"<literal>APT::Cache::Important</literal>." +msgstr "" +"Escreve apenas dependências importantes; para usar com unmet e depends. " +"Separa apenas relações de Depends e Pre-Depends para serem escritas. Item de " +"Configuração: <literal>APT::Cache::Important</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:312 apt-cdrom.8.xml:121 apt-get.8.xml:333 +msgid "<option>-f</option>" +msgstr "<option>-f</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:312 +msgid "<option>--full</option>" +msgstr "<option>--full</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:313 +msgid "" +"Print full package records when searching. Configuration Item: " +"<literal>APT::Cache::ShowFull</literal>." +msgstr "" +"Escreve registos de pacote completos quando procura. Item de Configuração: " +"<literal>APT::Cache::ShowFull</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548 +msgid "<option>-a</option>" +msgstr "<option>-a</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:317 +msgid "<option>--all-versions</option>" +msgstr "<option>--all-versions</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:318 +msgid "" +"Print full records for all available versions. This is the default; to turn " +"it off, use <option>--no-all-versions</option>. If <option>--no-all-" +"versions</option> is specified, only the candidate version will displayed " +"(the one which would be selected for installation). This option is only " +"applicable to the <literal>show</literal> command. Configuration Item: " +"<literal>APT::Cache::AllVersions</literal>." +msgstr "" +"Escreve registos completos para todas as versões disponíveis. Isto é a " +"predefinição; para a desligar, use <option>--no-all-versions</option>. Se " +"<option>--no-all-versions</option> for especificada, apenas a versão " +"candidata será mostrada (aquela que seria seleccionada para instalação). " +"Esta opção é aplicável apenas ao comando <literal>show</literal>. Item de " +"Configuração: <literal>APT::Cache::AllVersions</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:326 +msgid "<option>-g</option>" +msgstr "<option>-g</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:326 +msgid "<option>--generate</option>" +msgstr "<option>--generate</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:327 +msgid "" +"Perform automatic package cache regeneration, rather than use the cache as " +"it is. This is the default; to turn it off, use <option>--no-generate</" +"option>. Configuration Item: <literal>APT::Cache::Generate</literal>." +msgstr "" +"Executa regeneração automática da cache de pacote, em vez de usar a cache " +"como está. Isto é a predefinição; para a desligar, use <option>--no-" +"generate</option>. Item de Configuração: <literal>APT::Cache::Generate</" +"literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:332 +msgid "<option>--names-only</option>" +msgstr "<option>--names-only</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:332 apt-cdrom.8.xml:139 +msgid "<option>-n</option>" +msgstr "<option>-n</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:333 +msgid "" +"Only search on the package names, not the long descriptions. Configuration " +"Item: <literal>APT::Cache::NamesOnly</literal>." +msgstr "" +"Apenas procura nos nomes dos pacotes, e não nas descrições longas. Item de " +"Configuração: <literal>APT::Cache::NamesOnly</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:337 +msgid "<option>--all-names</option>" +msgstr "<option>--all-names</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:338 +msgid "" +"Make <literal>pkgnames</literal> print all names, including virtual packages " +"and missing dependencies. Configuration Item: <literal>APT::Cache::" +"AllNames</literal>." +msgstr "" +"Faz com que o <literal>pkgnames</literal> escreva todos os nomes, incluindo " +"pacotes virtuais e dependências em falta. Item de configuração: " +"<literal>APT::Cache::AllNames</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:343 +msgid "<option>--recurse</option>" +msgstr "<option>--recurse</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:344 +msgid "" +"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so " +"that all packages mentioned are printed once. Configuration Item: " +"<literal>APT::Cache::RecurseDepends</literal>." +msgstr "" +"Torna <literal>depends</literal> e <literal>rdepends</literal> recursivo " +"para que todos os pacotes mencionados sejam escritos uma vez. Item de " +"Configuração <literal>APT::Cache::RecurseDepends</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:349 +msgid "<option>--installed</option>" +msgstr "<option>--installed</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:351 +msgid "" +"Limit the output of <literal>depends</literal> and <literal>rdepends</" +"literal> to packages which are currently installed. Configuration Item: " +"<literal>APT::Cache::Installed</literal>." +msgstr "" +"Limita a saída de <literal>depends</literal> e <literal>rdepends</literal> " +"aos pacotes que estão actualmente instalados. Item de Configuração: " +"<literal>APT::Cache::Installed</literal>." + +#. type: Content of: <refentry><refsect1><variablelist> +#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 +#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:561 +#: apt-sortpkgs.1.xml:64 +msgid "&apt-commonoptions;" +msgstr "&apt-commonoptions;" + +#. type: Content of: <refentry><refsect1><title> +#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122 +#: apt.conf.5.xml:1035 apt_preferences.5.xml:633 +msgid "Files" +msgstr "Ficheiros" + +#. type: Content of: <refentry><refsect1><variablelist> +#: apt-cache.8.xml:363 +msgid "&file-sourceslist; &file-statelists;" +msgstr "&file-sourceslist; &file-statelists;" + +#. type: Content of: <refentry><refsect1><title> +#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 +#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:576 +#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:640 +#: sources.list.5.xml:233 +msgid "See Also" +msgstr "Veja também" + +#. type: Content of: <refentry><refsect1><para> +#: apt-cache.8.xml:369 +msgid "&apt-conf;, &sources-list;, &apt-get;" +msgstr "&apt-conf;, &sources-list;, &apt-get;" + +#. type: Content of: <refentry><refsect1><title> +#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 +#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:582 +#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 +msgid "Diagnostics" +msgstr "Diagnóstico" + +#. type: Content of: <refentry><refsect1><para> +#: apt-cache.8.xml:374 +msgid "" +"<command>apt-cache</command> returns zero on normal operation, decimal 100 " +"on error." +msgstr "" +"<command>apt-cache</command> devolve zero em operação normal, 100 decimal em " +"erro." + +#. type: Content of: <refentry><refentryinfo> +#: apt-cdrom.8.xml:13 +msgid "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 " +"February 2004</date>" +msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 " +"Fevereiro 2004</date>" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-cdrom.8.xml:21 apt-cdrom.8.xml:28 +msgid "apt-cdrom" +msgstr "apt-cdrom" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-cdrom.8.xml:29 +msgid "APT CDROM management utility" +msgstr "Utilitário de gestão de CDROM do APT" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-cdrom.8.xml:35 +msgid "" +"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> " +"<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> " +"<arg><option>-o=<replaceable>config string</replaceable></option></arg> " +"<arg><option>-c=<replaceable>file</replaceable></option></arg> <group> " +"<arg>add</arg> <arg>ident</arg> </group>" +msgstr "" +"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> " +"<arg><option>-d=<replaceable>ponto de montagem do cdrom</replaceable></" +"option></arg> <arg><option>-o=<replaceable>string de configuração</" +"replaceable></option></arg> <arg><option>-c=<replaceable>ficheiro</" +"replaceable></option></arg> <group> <arg>add</arg> <arg>ident</arg> </group>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-cdrom.8.xml:48 +msgid "" +"<command>apt-cdrom</command> is used to add a new CDROM to APTs list of " +"available sources. <command>apt-cdrom</command> takes care of determining " +"the structure of the disc as well as correcting for several possible mis-" +"burns and verifying the index files." +msgstr "" +"O <command>apt-cdrom</command> é usado para adicionar um novo CDROM à lista " +"de fontes disponíveis do APT. O <command>apt-cdrom</command> encarrega-se de " +"determinar a estrutura do disco assim como corrigir várias falhas possíveis " +"e verificar os ficheiros de índice." + +#. type: Content of: <refentry><refsect1><para> +#: apt-cdrom.8.xml:55 +msgid "" +"It is necessary to use <command>apt-cdrom</command> to add CDs to the APT " +"system, it cannot be done by hand. Furthermore each disk in a multi-cd set " +"must be inserted and scanned separately to account for possible mis-burns." +msgstr "" +"É necessário usar o <command>apt-cdrom</command> para adicionar CDs ao " +"sistema APT, não pode ser feito manualmente. Mais, cada disco de um conjunto " +"de vários discos tem que ser inserido e sondado separadamente para ter em " +"conta possíveis falhas." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:65 +msgid "add" +msgstr "add" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:66 +msgid "" +"<literal>add</literal> is used to add a new disc to the source list. It will " +"unmount the CDROM device, prompt for a disk to be inserted and then proceed " +"to scan it and copy the index files. If the disc does not have a proper " +"<filename>disk</filename> directory you will be prompted for a descriptive " +"title." +msgstr "" +"<literal>add</literal> é usado para adicionar um novo disco à lista de " +"fontes. Irá desmontar o dispositivo CDROM, pedir que seja inserido um disco " +"e depois prosseguir com a sua sondagem e cópia dos ficheiros índice. Se o " +"disco não possuir um directório <filename>disk</filename> apropriado, ser-" +"lhe-à pedido um título descritivo." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:74 +msgid "" +"APT uses a CDROM ID to track which disc is currently in the drive and " +"maintains a database of these IDs in <filename>&statedir;/cdroms.list</" +"filename>" +msgstr "" +"O APT usa um ID de CDROM para acompanhar qual disco está actualmente na " +"drive e mantêm uma base de dados desses IDs em <filename>&statedir;/cdroms." +"list</filename>" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:81 +msgid "ident" +msgstr "ident" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:82 +msgid "" +"A debugging tool to report the identity of the current disc as well as the " +"stored file name" +msgstr "" +"Uma ferramenta de depuração para reportar a identificação do disco actual " +"assim como o nome de ficheiro armazenado" + +#. type: Content of: <refentry><refsect1><para> +#: apt-cdrom.8.xml:61 +msgid "" +"Unless the <option>-h</option>, or <option>--help</option> option is given " +"one of the commands below must be present. <placeholder type=\"variablelist" +"\" id=\"0\"/>" +msgstr "" +"A menos que a opção <option>-h</option>, ou <option>--help</option> seja " +"fornecida, um dos comandos abaixo têm que estar presentes. <placeholder type=" +"\"variablelist\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><title> +#: apt-cdrom.8.xml:91 apt-key.8.xml:139 +msgid "Options" +msgstr "Opções" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328 +msgid "<option>-d</option>" +msgstr "<option>-d</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:95 +msgid "<option>--cdrom</option>" +msgstr "<option>--cdrom</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:96 +msgid "" +"Mount point; specify the location to mount the cdrom. This mount point must " +"be listed in <filename>/etc/fstab</filename> and properly configured. " +"Configuration Item: <literal>Acquire::cdrom::mount</literal>." +msgstr "" +"Ponto de Montagem; especifica a localização para montar o cdrom. Este ponto " +"de montagem deve estar listado em <filename>/etc/fstab</filename> e " +"configurado apropriadamente. Item de configuração: <literal>Acquire::cdrom::" +"mount</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:104 +msgid "<option>-r</option>" +msgstr "<option>-r</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:104 +msgid "<option>--rename</option>" +msgstr "<option>--rename</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:105 +msgid "" +"Rename a disc; change the label of a disk or override the disks given label. " +"This option will cause <command>apt-cdrom</command> to prompt for a new " +"label. Configuration Item: <literal>APT::CDROM::Rename</literal>." +msgstr "" +"Renomear um disco; muda a etiqueta de um disco ou sobrepõe a etiqueta " +"fornecida do disco. Esta opção irá fazer com que o <command>apt-cdrom</" +"command> pergunte por uma nova etiqueta. Item de configuração: <literal>APT::" +"CDROM::Rename</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:113 apt-get.8.xml:347 +msgid "<option>-m</option>" +msgstr "<option>-m</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:113 +msgid "<option>--no-mount</option>" +msgstr "<option>--no-mount</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:114 +msgid "" +"No mounting; prevent <command>apt-cdrom</command> from mounting and " +"unmounting the mount point. Configuration Item: <literal>APT::CDROM::" +"NoMount</literal>." +msgstr "" +"Nenhuma montagem; impede o <command>apt-cdrom</command> de montar e " +"desmontar o ponto de montagem. Item de configuração: <literal>APT::CDROM::" +"NoMount</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:121 +msgid "<option>--fast</option>" +msgstr "<option>--fast</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:122 +msgid "" +"Fast Copy; Assume the package files are valid and do not check every " +"package. This option should be used only if <command>apt-cdrom</command> has " +"been run on this disc before and did not detect any errors. Configuration " +"Item: <literal>APT::CDROM::Fast</literal>." +msgstr "" +"Copia rápida; Assume que os ficheiros do pacote são válidos e não verifica " +"cada pacote. Este opção só deve ser usada se o <command>apt-cdrom</command> " +"já foi corrido com este disco e não detectou nenhum erro. Item de " +"configuração: <literal>APT::CDROM::Fast</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:131 +msgid "<option>--thorough</option>" +msgstr "<option>--thorough</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:132 +msgid "" +"Thorough Package Scan; This option may be needed with some old Debian " +"1.1/1.2 discs that have Package files in strange places. It takes much " +"longer to scan the CD but will pick them all up." +msgstr "" +"Sondagem de pacote exaustiva; Esta opção pode ser necessária com alguns " +"discos Debian antigos 1.1/1.2 que têm ficheiros de pacotes em lugares " +"estranhos. Demora muito mais tempo a sondar o CD mas irá apanhá-los a todos." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:140 apt-get.8.xml:378 +msgid "<option>--just-print</option>" +msgstr "<option>--just-print</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:141 apt-get.8.xml:380 +msgid "<option>--recon</option>" +msgstr "<option>--recon</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:142 apt-get.8.xml:381 +msgid "<option>--no-act</option>" +msgstr "<option>--no-act</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:143 +msgid "" +"No Changes; Do not change the &sources-list; file and do not write index " +"files. Everything is still checked however. Configuration Item: " +"<literal>APT::CDROM::NoAct</literal>." +msgstr "" +"Nenhuma alteração; Não altera o ficheiro &sources-list; e não escreve " +"ficheiros índice. No entanto, tudo continua a ser verificado. Item de " +"configuração: <literal>APT::CDROM::NoAct</literal>." + +#. type: Content of: <refentry><refsect1><para> +#: apt-cdrom.8.xml:156 +msgid "&apt-conf;, &apt-get;, &sources-list;" +msgstr "&apt-conf;, &apt-get;, &sources-list;" + +#. type: Content of: <refentry><refsect1><para> +#: apt-cdrom.8.xml:161 +msgid "" +"<command>apt-cdrom</command> returns zero on normal operation, decimal 100 " +"on error." +msgstr "" +"<command>apt-cdrom</command> devolve zero em operação normal, 100 decimal em " +"erro." + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-config.8.xml:22 apt-config.8.xml:29 +msgid "apt-config" +msgstr "apt-config" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-config.8.xml:30 +msgid "APT Configuration Query program" +msgstr "Programa de Consulta de Configuração do APT" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-config.8.xml:36 +msgid "" +"<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-" +"o=<replaceable>config string</replaceable></option></arg> <arg><option>-" +"c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> " +"<arg>shell</arg> <arg>dump</arg> </group>" +msgstr "" +"<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-" +"o=<replaceable>string de configuração</replaceable></option></arg> " +"<arg><option>-c=<replaceable>ficheiro</replaceable></option></arg> <group " +"choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-config.8.xml:48 +msgid "" +"<command>apt-config</command> is an internal program used by various " +"portions of the APT suite to provide consistent configurability. It accesses " +"the main configuration file <filename>/etc/apt/apt.conf</filename> in a " +"manner that is easy to use by scripted applications." +msgstr "" +"<command>apt-config</command> é um programa interno usado por várias partes " +"da suite APT para fornecer uma configurabilidade consistente. Acede ao " +"ficheiro de configuração principal <filename>/etc/apt/apt.conf</filename> de " +"um modo que é fácil de usar para aplicações em script." + +#. type: Content of: <refentry><refsect1><para> +#: apt-config.8.xml:53 apt-ftparchive.1.xml:72 +msgid "" +"Unless the <option>-h</option>, or <option>--help</option> option is given " +"one of the commands below must be present." +msgstr "" +"A menos que a opção <option>-h</option>, ou <option>--help</option> seja " +"fornecida, um dos comandos abaixo têm que estar presentes." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-config.8.xml:58 +msgid "shell" +msgstr "shell" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:60 +msgid "" +"shell is used to access the configuration information from a shell script. " +"It is given pairs of arguments, the first being a shell variable and the " +"second the configuration value to query. As output it lists a series of " +"shell assignments commands for each present value. In a shell script it " +"should be used like:" +msgstr "" +"shell é usado para aceder à informação de configuração a partir de um script " +"shell. É fornecido pares de argumentos, sendo o primeiro uma variável de " +"shell e o segundo o valor de configuração a consultar. Como resultado cria " +"uma lista de comandos de atribuições de shell para cada valor presente. Num " +"script shell deverá ser usado como:" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> +#: apt-config.8.xml:68 +#, no-wrap +msgid "" +"OPTS=\"-f\"\n" +"RES=`apt-config shell OPTS MyApp::options`\n" +"eval $RES\n" +msgstr "" +"OPTS=\"-f\"\n" +"RES=`apt-config shell OPTS MyApp::options`\n" +"eval $RES\n" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:73 +msgid "" +"This will set the shell environment variable $OPTS to the value of MyApp::" +"options with a default of <option>-f</option>." +msgstr "" +"Isto irá definir a variável de ambiente shell $OPTS ao valor de MyApp::" +"options com uma predefinição de <option>-f</option>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:77 +msgid "" +"The configuration item may be postfixed with a /[fdbi]. f returns file " +"names, d returns directories, b returns true or false and i returns an " +"integer. Each of the returns is normalized and verified internally." +msgstr "" +"O item de configuração pode ser pós-fixado com um /[fdbi]. f devolve nomes " +"de ficheiros, d devolve directórios, b devolve verdadeiro ou falso e i " +"devolve um número inteiro. Cada um dos valores devolvidos é normalizado e " +"verificado internamente." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:86 +msgid "Just show the contents of the configuration space." +msgstr "Apenas mostra o conteúdo do espaço de configuração." + +#. type: Content of: <refentry><refsect1><para> +#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593 +#: apt-sortpkgs.1.xml:70 +msgid "&apt-conf;" +msgstr "&apt-conf;" + +#. type: Content of: <refentry><refsect1><para> +#: apt-config.8.xml:109 +msgid "" +"<command>apt-config</command> returns zero on normal operation, decimal 100 " +"on error." +msgstr "" +"<command>apt-config</command> devolve zero em operação normal, 100 decimal " +"em erro." + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-extracttemplates.1.xml:22 apt-extracttemplates.1.xml:29 +msgid "apt-extracttemplates" +msgstr "apt-extracttemplates" + +#. type: Content of: <refentry><refmeta><manvolnum> +#: apt-extracttemplates.1.xml:23 apt-ftparchive.1.xml:23 apt-sortpkgs.1.xml:23 +msgid "1" +msgstr "1" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-extracttemplates.1.xml:30 +msgid "Utility to extract DebConf config and templates from Debian packages" +msgstr "" +"Utilitário para extrair configurações e modelos DebConf a partir de pacotes " +"Debian" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-extracttemplates.1.xml:36 +msgid "" +"<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> " +"<arg><option>-t=<replaceable>temporary directory</replaceable></option></" +"arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></" +"arg>" +msgstr "" +"<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> " +"<arg><option>-t=<replaceable>directório temporário</replaceable></option></" +"arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>ficheiro</" +"replaceable></arg>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-extracttemplates.1.xml:44 +msgid "" +"<command>apt-extracttemplates</command> will take one or more Debian package " +"files as input and write out (to a temporary directory) all associated " +"config scripts and template files. For each passed in package that contains " +"config scripts and templates, one line of output will be generated in the " +"format:" +msgstr "" +"<command>apt-extracttemplates</command> irá receber um ou mais ficheiros de " +"pacotes Debian na sua entrada e escrever (para um directório temporário) " +"todos os scripts de configuração associados e ficheiros de modelo. Por cada " +"pacote passado por ele que contenha scripts de configuração e modelos, será " +"gerada uma linha no formato:" + +#. type: Content of: <refentry><refsect1><para> +#: apt-extracttemplates.1.xml:49 +msgid "package version template-file config-script" +msgstr "pacote versão ficheiro-modelo script-de-configuração" + +#. type: Content of: <refentry><refsect1><para> +#: apt-extracttemplates.1.xml:50 +msgid "" +"template-file and config-script are written to the temporary directory " +"specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</" +"literal>) directory, with filenames of the form <filename>package.template." +"XXXX</filename> and <filename>package.config.XXXX</filename>" +msgstr "" +"ficheiro-modelo e script-de-configuração são escritos num directório " +"temporário especificado por -t ou --tempdir (<literal>APT::" +"ExtractTemplates::TempDir</literal>) directório, com nomes de ficheiros no " +"formato <filename>pacote.modelo.XXXX</filename> e <filename>pacote." +"configuração.XXXX</filename>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495 +msgid "<option>-t</option>" +msgstr "<option>-t</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-extracttemplates.1.xml:60 +msgid "<option>--tempdir</option>" +msgstr "<option>--tempdir</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-extracttemplates.1.xml:62 +msgid "" +"Temporary directory in which to write extracted debconf template files and " +"config scripts. Configuration Item: <literal>APT::ExtractTemplates::" +"TempDir</literal>" +msgstr "" +"Directório temporário para onde escrever ficheiros debconf modelo extraídos " +"e scripts de configuração. Item de Configuração: <literal>APT::" +"ExtractTemplates::TempDir</literal>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-extracttemplates.1.xml:79 +msgid "" +"<command>apt-extracttemplates</command> returns zero on normal operation, " +"decimal 100 on error." +msgstr "" +"<command>apt-extracttemplates</command> devolve zero na operação normal, 100 " +"decimal em erro." + +#. The last update date +#. type: Content of: <refentry><refentryinfo> +#: apt-ftparchive.1.xml:13 +msgid "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 " +"August 2009</date>" +msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 " +"Agosto 2009</date>" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:29 +msgid "apt-ftparchive" +msgstr "apt-ftparchive" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-ftparchive.1.xml:30 +msgid "Utility to generate index files" +msgstr "Utilitário para gerar ficheiros de índice" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-ftparchive.1.xml:36 +msgid "" +"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " +"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " +"<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></" +"arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</" +"replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></" +"option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=" +"\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</" +"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " +"<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</" +"replaceable></arg><arg><replaceable>override</" +"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " +"<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></arg></" +"arg> <arg>release <arg choice=\"plain\"><replaceable>path</replaceable></" +"arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>config-file</" +"replaceable></arg> <arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice=" +"\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>" +msgstr "" +"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " +"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " +"<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +"arg> <arg><option>--arch <replaceable>arquitectura</replaceable></option></" +"arg> <arg><option>-o <replaceable>configuração</" +"replaceable>=<replaceable>string</replaceable></option></arg> <arg><option>-" +"c=<replaceable>ficheiro</replaceable></option></arg> <group choice=\"req\"> " +"<arg>packages<arg choice=\"plain\" rep=\"repeat\"><replaceable>caminho</" +"replaceable></arg><arg><replaceable>override</" +"replaceable><arg><replaceable>prefixo-de-caminho</replaceable></arg></arg></" +"arg> <arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>caminho</" +"replaceable></arg><arg><replaceable>sobrepor</" +"replaceable><arg><replaceable>prefixo-de-caminho</replaceable></arg></arg></" +"arg> <arg>contents <arg choice=\"plain\"><replaceable>caminho</replaceable></" +"arg></arg> <arg>release <arg choice=\"plain\"><replaceable>caminho</" +"replaceable></arg></arg> <arg>generate <arg choice=\"plain" +"\"><replaceable>ficheiro-de-configuração</replaceable></arg> <arg choice=" +"\"plain\" rep=\"repeat\"><replaceable>secção</replaceable></arg></arg> " +"<arg>clean <arg choice=\"plain\"><replaceable>ficheiro-de-configuração</" +"replaceable></arg></arg> </group>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:57 +msgid "" +"<command>apt-ftparchive</command> is the command line tool that generates " +"the index files that APT uses to access a distribution source. The index " +"files should be generated on the origin site based on the content of that " +"site." +msgstr "" +"<command>apt-ftparchive</command> é a ferramenta de linha de comandos que " +"cria os ficheiros índice que o APT usa para aceder a uma fonte de " +"distribuição. Os ficheiros índice devem ser gerados no site de origem " +"baseados no conteúdo desse site." + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:61 +msgid "" +"<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; " +"program, incorporating its entire functionality via the <literal>packages</" +"literal> command. It also contains a contents file generator, " +"<literal>contents</literal>, and an elaborate means to 'script' the " +"generation process for a complete archive." +msgstr "" +"<command>apt-ftparchive</command> é um super conjunto do programa &dpkg-" +"scanpackages;, incorporando todas as suas funcionalidades através do comando " +"<literal>packages</literal>. Também contém um gerador de ficheiro de " +"conteúdos, <literal>contents</literal>, e um meio elaborado de colocar em " +"script o processo de geração para um arquivo completo." + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:67 +msgid "" +"Internally <command>apt-ftparchive</command> can make use of binary " +"databases to cache the contents of a .deb file and it does not rely on any " +"external programs aside from &gzip;. When doing a full generate it " +"automatically performs file-change checks and builds the desired compressed " +"output files." +msgstr "" +"Internamente o <command>apt-ftparchive</command> pode fazer uso de bases de " +"dados binárias para por em cache os conteúdos de um ficheiro .deb e não " +"precisa de nenhum programa externo à excepção do &gzip;. Quando faz uma " +"geração completa, executa automaticamente verificações de alterações de " +"ficheiros e constrói os ficheiros comprimidos desejados." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:76 +msgid "packages" +msgstr "packages" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:78 +msgid "" +"The packages command generates a package file from a directory tree. It " +"takes the given directory and recursively searches it for .deb files, " +"emitting a package record to stdout for each. This command is approximately " +"equivalent to &dpkg-scanpackages;." +msgstr "" +"O comando packages gera um ficheiro pacote a partir duma árvore de " +"directórios. Recebe um dado directório e procura recursivamente por " +"ficheiros .deb, emitindo um registo de pacote para o stdout por cada um. " +"Este comando é aproximadamente equivalente ao &dpkg-scanpackages;." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107 +msgid "" +"The option <option>--db</option> can be used to specify a binary caching DB." +msgstr "" +"A opção <option>--db</option> pode ser usada para especificar uma base de " +"dados de cache binária." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:86 +msgid "sources" +msgstr "sources" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:88 +msgid "" +"The <literal>sources</literal> command generates a source index file from a " +"directory tree. It takes the given directory and recursively searches it " +"for .dsc files, emitting a source record to stdout for each. This command is " +"approximately equivalent to &dpkg-scansources;." +msgstr "" +"O comando <literal>sources</literal> gera um índice de fonte a partir duma " +"árvore de directórios. Recebe um dado directório e procura recursivamente " +"por ficheiros .dsc, emitindo um registo de fonte para o stdout por cada um. " +"Este comando é aproximadamente equivalente ao &dpkg-scansources;." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:93 +msgid "" +"If an override file is specified then a source override file will be looked " +"for with an extension of .src. The --source-override option can be used to " +"change the source override file that will be used." +msgstr "" +"Se for especificado um ficheiro de sobreposição então será procurado um " +"ficheiro de sobreposição de fonte com uma extensão de .src. A opção --" +"source-override pode ser usada para alterar o ficheiro de sobreposição de " +"fonte que irá ser usado." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:98 +msgid "contents" +msgstr "contents" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:100 +msgid "" +"The <literal>contents</literal> command generates a contents file from a " +"directory tree. It takes the given directory and recursively searches it " +"for .deb files, and reads the file list from each file. It then sorts and " +"writes to stdout the list of files matched to packages. Directories are not " +"written to the output. If multiple packages own the same file then each " +"package is separated by a comma in the output." +msgstr "" +"O comando<literal>contents</literal> gera um ficheiro de conteúdos a partir " +"duma árvore de directórios. Recebe um dado directório e procura " +"recursivamente por ficheiros .deb, e lê a lista de ficheiros de cada " +"ficheiro. Então organiza e escreve para o stdout a lista de ficheiros " +"correspondente a pacotes. Os directórios não são escritos no saída. Se " +"múltiplos pacotes possuírem o mesmo ficheiro então cada pacote é separado " +"por uma vírgula na saída." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:110 +msgid "release" +msgstr "release" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:112 +msgid "" +"The <literal>release</literal> command generates a Release file from a " +"directory tree. It recursively searches the given directory for Packages, " +"Packages.gz, Packages.bz2, Sources, Sources.gz, Sources.bz2, Release and " +"md5sum.txt files. It then writes to stdout a Release file containing an MD5 " +"digest and SHA1 digest for each file." +msgstr "" +"O comando <literal>release</literal> gera um ficheiro Release a partir duma " +"árvore de directórios. Procura recursivamente o directório dado por " +"ficheiros Packages, Packages.gz, Packages.bz2, Sources, Sources.gz, Sources." +"bz2, Release e md5sum.txt. Depois escreve para o stdout um ficheiro Release " +"contendo um sumário MD5 e um sumário SHA1 por cada ficheiro." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:119 +msgid "" +"Values for the additional metadata fields in the Release file are taken from " +"the corresponding variables under <literal>APT::FTPArchive::Release</" +"literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The " +"supported fields are: <literal>Origin</literal>, <literal>Label</literal>, " +"<literal>Suite</literal>, <literal>Version</literal>, <literal>Codename</" +"literal>, <literal>Date</literal>, <literal>Architectures</literal>, " +"<literal>Components</literal>, <literal>Description</literal>." +msgstr "" +"Valores para os campos de metadados adicionais no ficheiro Release são " +"tomados a partir das variáveis correspondentes sob <literal>APT::FTPArchive::" +"Release</literal>, ex. <literal>APT::FTPArchive::Release::Origin</literal>. " +"Os campos suportados são: <literal>Origin</literal>, <literal>Label</" +"literal>, <literal>Suite</literal>, <literal>Version</literal>, " +"<literal>Codename</literal>, <literal>Date</literal>, " +"<literal>Architectures</literal>, <literal>Components</literal>, " +"<literal>Description</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:129 +msgid "generate" +msgstr "generate" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:131 +msgid "" +"The <literal>generate</literal> command is designed to be runnable from a " +"cron script and builds indexes according to the given config file. The " +"config language provides a flexible means of specifying which index files " +"are built from which directories, as well as providing a simple means of " +"maintaining the required settings." +msgstr "" +"O comando <literal>generate</literal> é desenhado para ser executado a " +"partir dum script cron e constrói índices de acordo com o ficheiro de " +"configuração fornecido. A linguagem de configuração disponibiliza um meio " +"flexível de de especificar quais ficheiros índice são construídos a partir " +"de quais directórios, assim como disponibilizar um meio simples de manter as " +"definições requeridas." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:138 apt-get.8.xml:292 +msgid "clean" +msgstr "clean" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:140 +msgid "" +"The <literal>clean</literal> command tidies the databases used by the given " +"configuration file by removing any records that are no longer necessary." +msgstr "" +"O comando <literal>clean</literal> arruma as bases de dados usadas pelo " +"ficheiro de configuração fornecido ao remover quaisquer registos que já não " +"são necessários." + +#. type: Content of: <refentry><refsect1><title> +#: apt-ftparchive.1.xml:146 +msgid "The Generate Configuration" +msgstr "A Configuração do Generate" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:148 +msgid "" +"The <literal>generate</literal> command uses a configuration file to " +"describe the archives that are going to be generated. It follows the typical " +"ISC configuration format as seen in ISC tools like bind 8 and dhcpd. &apt-" +"conf; contains a description of the syntax. Note that the generate " +"configuration is parsed in sectional manner, but &apt-conf; is parsed in a " +"tree manner. This only effects how the scope tag is handled." +msgstr "" +"O comando <literal>generate</literal> usa um ficheiro de configuração para " +"descrever os arquivos que vão ser gerados. Segue o formato típico de " +"configuração ISC como visto em ferramentas ISC como o bind 8 e dhcpd. &apt-" +"conf; contém uma descrição da sintaxe. Note que a configuração gerada é " +"analisada de maneira seccional, mas o &apt-conf; é analisado numa maneira de " +"árvore. Isto apenas afecta o modo de como a etiqueta scope é manuseada." + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:156 +msgid "" +"The generate configuration has 4 separate sections, each described below." +msgstr "" +"A configuração do generate tem 4 secções separadas, cada uma descrita mais " +"abaixo." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt-ftparchive.1.xml:158 +msgid "Dir Section" +msgstr "Secção Dir" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:160 +msgid "" +"The <literal>Dir</literal> section defines the standard directories needed " +"to locate the files required during the generation process. These " +"directories are prepended certain relative paths defined in later sections " +"to produce a complete an absolute path." +msgstr "" +"A secção <literal>Dir</literal> define os directórios standard necessários " +"para localizar os ficheiros requisitados durante o processo de geração. " +"Estes directórios precedem a certos caminhos relativos definidos em secções " +"posteriores para produzir um caminho completo e absoluto." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:165 +msgid "ArchiveDir" +msgstr "ArchiveDir" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:167 +msgid "" +"Specifies the root of the FTP archive, in a standard Debian configuration " +"this is the directory that contains the <filename>ls-LR</filename> and dist " +"nodes." +msgstr "" +"Especifica a raiz do arquivo FTP, numa configuração Debian standard este é o " +"directório que contém o <filename>ls-LR</filename> e nós da distribuição." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:172 +msgid "OverrideDir" +msgstr "OverrideDir" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:174 +msgid "Specifies the location of the override files." +msgstr "Especifica a localização dos ficheiros de sobrepor." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:177 +msgid "CacheDir" +msgstr "CacheDir" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:179 +msgid "Specifies the location of the cache files" +msgstr "Especifica a localização dos ficheiros de cache" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:182 +msgid "FileListDir" +msgstr "FileListDir" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:184 +msgid "" +"Specifies the location of the file list files, if the <literal>FileList</" +"literal> setting is used below." +msgstr "" +"Especifica a localização dos ficheiros de listas de ficheiros, se a " +"definição <literal>FileList</literal> for usada mais abaixo." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt-ftparchive.1.xml:190 +msgid "Default Section" +msgstr "Secção Default" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:192 +msgid "" +"The <literal>Default</literal> section specifies default values, and " +"settings that control the operation of the generator. Other sections may " +"override these defaults with a per-section setting." +msgstr "" +"A secção <literal>Default</literal> especifica valores predefinidos, e " +"definições que controlam a operação do gerador. Outras secções podem " +"sobrepor estas predefinições em uma definição por-secção." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:196 +msgid "Packages::Compress" +msgstr "Packages::Compress" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:198 +msgid "" +"Sets the default compression schemes to use for the Package index files. It " +"is a string that contains a space separated list of at least one of: '.' (no " +"compression), 'gzip' and 'bzip2'. The default for all compression schemes is " +"'. gzip'." +msgstr "" +"Define os esquemas de compressão predefinidos a usar para os ficheiros de " +"índice Package. É uma string que contém uma lista separada por espaços de " +"pelo menos um de: '.' (nenhuma compressão), 'gzip' and 'bzip2'. A " +"predefinição para todos os esquemas de compressão é '. gzip'." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:204 +msgid "Packages::Extensions" +msgstr "Packages::Extensions" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:206 +msgid "" +"Sets the default list of file extensions that are package files. This " +"defaults to '.deb'." +msgstr "" +"Define a lista predefinida das extensões de ficheiros que são ficheiros " +"pacote. A predefinição é '.deb'." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:210 +msgid "Sources::Compress" +msgstr "Sources::Compress" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:212 +msgid "" +"This is similar to <literal>Packages::Compress</literal> except that it " +"controls the compression for the Sources files." +msgstr "" +"Isto é semelhante a <literal>Packages::Compress</literal> excepto que " +"controla a compressão para os ficheiros das Fontes." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:216 +msgid "Sources::Extensions" +msgstr "Sources::Extensions" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:218 +msgid "" +"Sets the default list of file extensions that are source files. This " +"defaults to '.dsc'." +msgstr "" +"Define a lista predefinida das extensões de ficheiros que são ficheiros de " +"fontes. A predefinição é '.dsc'." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:222 +msgid "Contents::Compress" +msgstr "Contents::Compress" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:224 +msgid "" +"This is similar to <literal>Packages::Compress</literal> except that it " +"controls the compression for the Contents files." +msgstr "" +"Isto é semelhante a <literal>Packages::Compress</literal> excepto que " +"controla a compressão para os ficheiros de Conteúdos." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:228 +msgid "DeLinkLimit" +msgstr "DeLinkLimit" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:230 +msgid "" +"Specifies the number of kilobytes to delink (and replace with hard links) " +"per run. This is used in conjunction with the per-section <literal>External-" +"Links</literal> setting." +msgstr "" +"Especifica o número de kilobytes para delink (e substitui com hard links) " +"por execução. Isto é usado em conjunto com a definição <literal>External-" +"Links</literal> por secção." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:235 +msgid "FileMode" +msgstr "FileMode" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:237 +msgid "" +"Specifies the mode of all created index files. It defaults to 0644. All " +"index files are set to this mode with no regard to the umask." +msgstr "" +"Especifica o modo de todos os ficheiros índice criados. A predefinição é " +"0644. Todos os ficheiros índice são definidos para este modo " +"independentemente do umask." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt-ftparchive.1.xml:244 +msgid "TreeDefault Section" +msgstr "Secção TreeDefault" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:246 +msgid "" +"Sets defaults specific to <literal>Tree</literal> sections. All of these " +"variables are substitution variables and have the strings $(DIST), " +"$(SECTION) and $(ARCH) replaced with their respective values." +msgstr "" +"Define predefinições específicas para as secções <literal>Tree</literal>. " +"Todas estas variáveis são variáveis de substituição e têm as strings " +"$(DIST), $(SECTION) e $(ARCH) substituídas pelos seus respectivos valores." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:251 +msgid "MaxContentsChange" +msgstr "MaxContentsChange" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:253 +msgid "" +"Sets the number of kilobytes of contents files that are generated each day. " +"The contents files are round-robined so that over several days they will all " +"be rebuilt." +msgstr "" +"Define o número de kilobytes dos ficheiros de conteúdo que são gerados a " +"cada dia. Os ficheiros de conteúdo são re-circulados para que ao fim de " +"alguns dias todos sejam reconstruídos." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:258 +msgid "ContentsAge" +msgstr "ContentsAge" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:260 +msgid "" +"Controls the number of days a contents file is allowed to be checked without " +"changing. If this limit is passed the mtime of the contents file is updated. " +"This case can occur if the package file is changed in such a way that does " +"not result in a new contents file [override edit for instance]. A hold off " +"is allowed in hopes that new .debs will be installed, requiring a new file " +"anyhow. The default is 10, the units are in days." +msgstr "" +"Controla o número de dias que se permite a um ficheiro de conteúdo ser " +"verificado sem alteração. Se este limite for ultrapassado o mtime do " +"ficheiro de conteúdo é actualizado. Este caso pode ocorrer se o ficheiro de " +"pacote é alterado num modo que não resulta num novo ficheiro de conteúdo " +"[por exemplo uma edição de sobreposição]. É permitido um soltar na esperança " +"que novos .debs sejam instalados, requerendo um novo ficheiro de qualquer " +"modo. A predefinição é 10, as unidades são em dias." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:269 +msgid "Directory" +msgstr "Directory" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:271 +msgid "" +"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/" +"$(SECTION)/binary-$(ARCH)/</filename>" +msgstr "" +"Define o topo da árvore de directórios .deb. A predefinição é <filename>" +"$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:275 +msgid "SrcDirectory" +msgstr "SrcDirectory" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:277 +msgid "" +"Sets the top of the source package directory tree. Defaults to <filename>" +"$(DIST)/$(SECTION)/source/</filename>" +msgstr "" +"Define o topo da árvore de directórios de pacotes fonte. A predefinição é " +"<filename>$(DIST)/$(SECTION)/source/</filename>" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407 +msgid "Packages" +msgstr "Packages" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:283 +msgid "" +"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" +"binary-$(ARCH)/Packages</filename>" +msgstr "" +"Define o ficheiro Packages de saída. A predefinição é <filename>$(DIST)/" +"$(SECTION)/binary-$(ARCH)/Packages</filename>" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412 +msgid "Sources" +msgstr "Sources" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:289 +msgid "" +"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/" +"source/Sources</filename>" +msgstr "" +"Define o ficheiro Sources de saída. A predefinição é <filename>$(DIST)/" +"$(SECTION)/source/Sources</filename>" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:293 +msgid "InternalPrefix" +msgstr "InternalPrefix" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:295 +msgid "" +"Sets the path prefix that causes a symlink to be considered an internal link " +"instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</" +"filename>" +msgstr "" +"Define o prefixo de caminho que causa que um symlink seja considerado um " +"link interno em vez de um link externo. A predefinição é <filename>$(DIST)/" +"$(SECTION)/</filename>" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418 +msgid "Contents" +msgstr "Contents" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:302 +msgid "" +"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)" +"</filename>. If this setting causes multiple Packages files to map onto a " +"single Contents file (such as the default) then <command>apt-ftparchive</" +"command> will integrate those package files together automatically." +msgstr "" +"Define a saída do ficheiro Contents. A predefinição é <filename>$(DIST)/" +"Contents-$(ARCH)</filename>. Se esta definição causar múltiplos ficheiros " +"Packages para mapear em um único ficheiro Contents (tal como a predefinição) " +"então o <command>apt-ftparchive</command> irá automaticamente integrar esses " +"ficheiros pacotes todos juntos." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:309 +msgid "Contents::Header" +msgstr "Contents::Header" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:311 +msgid "Sets header file to prepend to the contents output." +msgstr "Define o ficheiro cabeçalho para prefixar a saída de conteúdos." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443 +msgid "BinCacheDB" +msgstr "BinCacheDB" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:316 +msgid "" +"Sets the binary cache database to use for this section. Multiple sections " +"can share the same database." +msgstr "" +"Define a base de dados de cache binária a usar para esta secção. Múltiplas " +"secções podem partilhar a mesma base de dados." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:320 +msgid "FileList" +msgstr "FileList" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:322 +msgid "" +"Specifies that instead of walking the directory tree, <command>apt-" +"ftparchive</command> should read the list of files from the given file. " +"Relative files names are prefixed with the archive directory." +msgstr "" +"Especifica que em vez de navegar na árvore de directórios, o <command>apt-" +"ftparchive</command> deverá ler a lista de ficheiros a partir do ficheiro " +"fornecido. Nomes de ficheiros relativos são prefixados com o directório de " +"arquivo." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:327 +msgid "SourceFileList" +msgstr "SourceFileList" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:329 +msgid "" +"Specifies that instead of walking the directory tree, <command>apt-" +"ftparchive</command> should read the list of files from the given file. " +"Relative files names are prefixed with the archive directory. This is used " +"when processing source indexes." +msgstr "" +"Especifica que em vez de navegar na árvore de directórios, o <command>apt-" +"ftparchive</command> deverá ler a lista de ficheiros a partir do ficheiro " +"fornecido. Nomes de ficheiros relativos são prefixados com o directório de " +"arquivo. Isto é usado quando se processa índices de fonte." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt-ftparchive.1.xml:337 +msgid "Tree Section" +msgstr "Secção Tree" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:339 +msgid "" +"The <literal>Tree</literal> section defines a standard Debian file tree " +"which consists of a base directory, then multiple sections in that base " +"directory and finally multiple Architectures in each section. The exact " +"pathing used is defined by the <literal>Directory</literal> substitution " +"variable." +msgstr "" +"A secção <literal>Tree</literal> define uma árvore de ficheiros Debian " +"standard que consiste de um directório base, depois múltiplas secções nesse " +"directório base e finalmente múltiplas Arquitecturas em cada secção. O " +"caminho exacto usado é definido pela variável de substituição " +"<literal>Directory</literal>." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:344 +msgid "" +"The <literal>Tree</literal> section takes a scope tag which sets the " +"<literal>$(DIST)</literal> variable and defines the root of the tree (the " +"path is prefixed by <literal>ArchiveDir</literal>). Typically this is a " +"setting such as <filename>dists/woody</filename>." +msgstr "" +"A secção <literal>Tree</literal> recebe uma etiqueta scope que define a " +"variável <literal>$(DIST)</literal> e define a raiz da árvore (o caminho é " +"prefixado por <literal>ArchiveDir</literal>). Tipicamente esta é uma " +"definição tal como <filename>dists/woody</filename>." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:349 +msgid "" +"All of the settings defined in the <literal>TreeDefault</literal> section " +"can be use in a <literal>Tree</literal> section as well as three new " +"variables." +msgstr "" +"Todas as definições definidas na secção <literal>TreeDefault</literal> podem " +"ser usadas na secção <literal>Tree</literal> assim como as novas três " +"variáveis." + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt-ftparchive.1.xml:355 +#, no-wrap +msgid "" +"for i in Sections do \n" +" for j in Architectures do\n" +" Generate for DIST=scope SECTION=i ARCH=j\n" +" " +msgstr "" +"for i in Sections do \n" +" for j in Architectures do\n" +" Generate for DIST=scope SECTION=i ARCH=j\n" +" " + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:352 +msgid "" +"When processing a <literal>Tree</literal> section <command>apt-ftparchive</" +"command> performs an operation similar to: <placeholder type=\"programlisting" +"\" id=\"0\"/>" +msgstr "" +"Quando processa uma secção <literal>Tree</literal>, o <command>apt-" +"ftparchive</command> executa uma operação semelhante a: <placeholder type=" +"\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:361 +msgid "Sections" +msgstr "Sections" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:363 +msgid "" +"This is a space separated list of sections which appear under the " +"distribution, typically this is something like <literal>main contrib non-" +"free</literal>" +msgstr "" +"Isto é uma lista de secções separada por espaços que aparece sob a " +"distribuição, tipicamente isto é algo como <literal>main contrib non-free</" +"literal>" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:368 +msgid "Architectures" +msgstr "Architectures" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:370 +msgid "" +"This is a space separated list of all the architectures that appear under " +"search section. The special architecture 'source' is used to indicate that " +"this tree has a source archive." +msgstr "" +"Isto é uma lista separada por espaços de todas as arquitecturas que aparecem " +"sob a secção de buscas. A arquitectura especial 'source' é usada para " +"indicar que esta árvore tem um arquivo fonte." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423 +msgid "BinOverride" +msgstr "BinOverride" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:377 +msgid "" +"Sets the binary override file. The override file contains section, priority " +"and maintainer address information." +msgstr "" +"Define o ficheiro de sobreposição binário. O ficheiro de sobreposição " +"informação de secção, prioridade e endereço do responsável." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428 +msgid "SrcOverride" +msgstr "SrcOverride" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:383 +msgid "" +"Sets the source override file. The override file contains section " +"information." +msgstr "" +"Define o ficheiro de sobreposição fonte. O ficheiro de sobreposição " +"informação de secção." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433 +msgid "ExtraOverride" +msgstr "ExtraOverride" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435 +msgid "Sets the binary extra override file." +msgstr "Define o ficheiro de sobreposição extra binário." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438 +msgid "SrcExtraOverride" +msgstr "SrcExtraOverride" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440 +msgid "Sets the source extra override file." +msgstr "Define o ficheiro de sobreposição extra fonte." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt-ftparchive.1.xml:399 +msgid "BinDirectory Section" +msgstr "Secção BinDirectory" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:401 +msgid "" +"The <literal>bindirectory</literal> section defines a binary directory tree " +"with no special structure. The scope tag specifies the location of the " +"binary directory and the settings are similar to the <literal>Tree</literal> " +"section with no substitution variables or <literal>Section</" +"literal><literal>Architecture</literal> settings." +msgstr "" +"A secção <literal>bindirectory</literal> define uma árvore de directórios " +"binários sem nenhuma estrutura especial. A etiqueta scope especifica a " +"localização do directório binário e as definições são semelhantes às da " +"secção <literal>Tree</literal> sem nenhumas variáveis de substituição ou " +"definições <literal>Section</literal><literal>Architecture</literal>." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:409 +msgid "Sets the Packages file output." +msgstr "Define a saída do ficheiro Packages." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:414 +msgid "" +"Sets the Sources file output. At least one of <literal>Packages</literal> or " +"<literal>Sources</literal> is required." +msgstr "" +"Define a saída do ficheiro Sources. É necessário pelo menos um de " +"<literal>Packages</literal> ou <literal>Sources</literal>." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:420 +msgid "Sets the Contents file output. (optional)" +msgstr "Define a saída do ficheiro Contents (opcional)" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:425 +msgid "Sets the binary override file." +msgstr "Define o ficheiro de sobreposição binário." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:430 +msgid "Sets the source override file." +msgstr "Define o ficheiro de sobreposição fonte." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:445 +msgid "Sets the cache DB." +msgstr "Define a base de dados de cache." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:448 +msgid "PathPrefix" +msgstr "PathPrefix" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:450 +msgid "Appends a path to all the output paths." +msgstr "Acrescenta um caminho a todos os caminhos de saída." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:453 +msgid "FileList, SourceFileList" +msgstr "FileList, SourceFileList" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:455 +msgid "Specifies the file list file." +msgstr "Especifica o ficheiro de lista de ficheiros." + +#. type: Content of: <refentry><refsect1><title> +#: apt-ftparchive.1.xml:462 +msgid "The Binary Override File" +msgstr "O Ficheiro Binary Override" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:463 +msgid "" +"The binary override file is fully compatible with &dpkg-scanpackages;. It " +"contains 4 fields separated by spaces. The first field is the package name, " +"the second is the priority to force that package to, the third is the the " +"section to force that package to and the final field is the maintainer " +"permutation field." +msgstr "" +"O ficheiro de sobreposição binário é totalmente compatível com &dpkg-" +"scanpackages;. Contém 4 campos separados por espaços. O primeiro campo é o " +"nome do pacote, o segundo é a prioridade a qual forçar esse pacote, o " +"terceiro é a secção onde forçar esse pacote e o último campo é o campo de " +"permutação do responsável." + +#. type: Content of: <refentry><refsect1><para><literallayout> +#: apt-ftparchive.1.xml:469 +#, no-wrap +msgid "old [// oldn]* => new" +msgstr "old [// oldn]* => new" + +#. type: Content of: <refentry><refsect1><para><literallayout> +#: apt-ftparchive.1.xml:471 +#, no-wrap +msgid "new" +msgstr "new" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:468 +msgid "" +"The general form of the maintainer field is: <placeholder type=" +"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" " +"id=\"1\"/> The first form allows a double-slash separated list of old email " +"addresses to be specified. If any of those are found then new is substituted " +"for the maintainer field. The second form unconditionally substitutes the " +"maintainer field." +msgstr "" +"O formato geral do campo do responsável é: <placeholder type=\"literallayout" +"\" id=\"0\"/> ou simplesmente, <placeholder type=\"literallayout\" id=\"1\"/" +">. O primeiro formato permite uma lista separada por um duplo slash (//) de " +"antigos endereços e email a serem especificados. Se nenhum destes for " +"encontrado então 'new' é substituído para o campo do responsável. O segundo " +"formato substitui incondicionalmente o campo do responsável." + +#. type: Content of: <refentry><refsect1><title> +#: apt-ftparchive.1.xml:479 +msgid "The Source Override File" +msgstr "O Ficheiro Source Override" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:481 +msgid "" +"The source override file is fully compatible with &dpkg-scansources;. It " +"contains 2 fields separated by spaces. The first fields is the source " +"package name, the second is the section to assign it." +msgstr "" +"O ficheiro de sobreposição de fonte é totalmente compatível com &dpkg-" +"scansources;. Contém dois campos separados por espaços. O primeiro campo é o " +"nome de pacote fonte, o segundo é a secção onde o atribuir." + +#. type: Content of: <refentry><refsect1><title> +#: apt-ftparchive.1.xml:486 +msgid "The Extra Override File" +msgstr "O Ficheiro Extra Override" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:488 +msgid "" +"The extra override file allows any arbitrary tag to be added or replaced in " +"the output. It has 3 columns, the first is the package, the second is the " +"tag and the remainder of the line is the new value." +msgstr "" +"O ficheiro de sobreposição extra permite que qualquer etiqueta arbitrária " +"seja adicionada ou substituída na saída. Tem 3 colunas, a primeira é o " +"pacote, a segunda é a etiqueta e restante da linha é o novo valor." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:497 +msgid "<option>--md5</option>" +msgstr "<option>--md5</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:499 +msgid "" +"Generate MD5 sums. This defaults to on, when turned off the generated index " +"files will not have MD5Sum fields where possible. Configuration Item: " +"<literal>APT::FTPArchive::MD5</literal>" +msgstr "" +"Gera sumários MD5. A predefinição é ligado, quando desligado os ficheiros " +"índice gerados não terão campos MD5Sum onde possíveis. Item de Configuração: " +"<literal>APT::FTPArchive::MD5</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:504 +msgid "<option>--db</option>" +msgstr "<option>--db</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:506 +msgid "" +"Use a binary caching DB. This has no effect on the generate command. " +"Configuration Item: <literal>APT::FTPArchive::DB</literal>." +msgstr "" +"Usa uma base de dados de cache binária. Isto não tem efeito no comando " +"generate. Item de configuração: <literal>APT::FTPArchive::DB</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:512 +msgid "" +"Quiet; produces output suitable for logging, omitting progress indicators. " +"More q's will produce more quiet up to a maximum of 2. You can also use " +"<option>-q=#</option> to set the quiet level, overriding the configuration " +"file. Configuration Item: <literal>quiet</literal>." +msgstr "" +"Silencioso; produz saída apropriada para registar em logs, omitindo " +"indicadores de progresso. Mais q's irão produzir mais silencio até um máximo " +"de 2. Você também pode usar <option>-q=#</option> para definir o nível de " +"silêncio, sobrepondo o ficheiro de configuração. Item de Configuração: " +"<literal>quiet</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:518 +msgid "<option>--delink</option>" +msgstr "<option>--delink</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:520 +msgid "" +"Perform Delinking. If the <literal>External-Links</literal> setting is used " +"then this option actually enables delinking of the files. It defaults to on " +"and can be turned off with <option>--no-delink</option>. Configuration " +"Item: <literal>APT::FTPArchive::DeLinkAct</literal>." +msgstr "" +"Executa Dissociação. Se é usada a definição <literal>External-Links</" +"literal> então esta opção activa a dissociação dos ficheiros. A sua " +"predefinição é ligada e e pode ser desligada com <option>--no-delink</" +"option>. Item de Configuração: <literal>APT::FTPArchive::DeLinkAct</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:526 +msgid "<option>--contents</option>" +msgstr "<option>--contents</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:528 +msgid "" +"Perform contents generation. When this option is set and package indexes are " +"being generated with a cache DB then the file listing will also be extracted " +"and stored in the DB for later use. When using the generate command this " +"option also allows the creation of any Contents files. The default is on. " +"Configuration Item: <literal>APT::FTPArchive::Contents</literal>." +msgstr "" +"Executa a geração de conteúdos. Quando esta opção está definida e os índices " +"de pacotes são gerados com um base de dados cache então a listagem de " +"ficheiros também será extraída e guardada na base de dados para utilização " +"posterior. Quando se usa o comando generate, esta opção também permite a " +"criação de quaisquer ficheiros de Conteúdos. A predefinição é ligado. Item " +"de Configuração: <literal>APT::FTPArchive::Contents</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:536 +msgid "<option>--source-override</option>" +msgstr "<option>--source-override</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:538 +msgid "" +"Select the source override file to use with the <literal>sources</literal> " +"command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" +"literal>." +msgstr "" +"Selecciona o ficheiro de sobreposição de fonte a usar com o comando " +"<literal>sources</literal>. Item de Configuração: <literal>APT::FTPArchive::" +"SourceOverride</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:542 +msgid "<option>--readonly</option>" +msgstr "<option>--readonly</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:544 +msgid "" +"Make the caching databases read only. Configuration Item: <literal>APT::" +"FTPArchive::ReadOnlyDB</literal>." +msgstr "" +"Torna as bases de dados de cache apenas de leitura. Item de Configuração: " +"<literal>APT::FTPArchive::ReadOnlyDB</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:548 +msgid "<option>--arch</option>" +msgstr "<option>--arch</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:549 +msgid "" +"Accept in the <literal>packages</literal> and <literal>contents</literal> " +"commands only package files matching <literal>*_arch.deb</literal> or " +"<literal>*_all.deb</literal> instead of all package files in the given " +"path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>." +msgstr "" +"Aceita nos comandos <literal>packages</literal> e <literal>contents</" +"literal> apenas ficheiros de pacotes que condizem com <literal>*_arch.deb</" +"literal> ou <literal>*_all.deb</literal> em vez de todos os ficheiros de " +"pacotes presentes no caminho fornecido. Item de Configuração: <literal>APT::" +"FTPArchive::Architecture</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:555 +msgid "<option>APT::FTPArchive::AlwaysStat</option>" +msgstr "<option>APT::FTPArchive::AlwaysStat</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:557 +msgid "" +"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " +"packages are recompiled and/or republished with the same version again, this " +"will lead to problems as the now outdated cached metadata like size and " +"checksums will be used. With this option enabled this will no longer happen " +"as it will be checked if the file was changed. Note that this option is set " +"to \"<literal>false</literal>\" by default as it is not recommend to upload " +"multiply versions/builds of a package with the same versionnumber, so in " +"theory nobody will have these problems and therefore all these extra checks " +"are useless." +msgstr "" +"&apt-ftparchive; põe em cache o máximo possível de metadados numa base de " +"dados de cache. Se os pacotes forem recompilados e/ou republicados de novo " +"com a mesma versão, irá originar problemas porque serão usados os metadados " +"desactualizados em cache como o tamanho e sumários de verificação. Com esta " +"opção activa isto não irá mais acontecer porque será verificado se o " +"ficheiro foi alterado. Note que esta opção vem regulada para " +"\"<literal>false</literal>\" por predefinição pois não é recomendado " +"disponibilizar múltiplas versões/compilações de um pacote com o mesmo número " +"de versão, portanto em teoria ninguém irá ter estes problemas e então todas " +"as verificações extras serão desnecessárias." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:567 +msgid "<option>APT::FTPArchive::LongDescription</option>" +msgstr "<option>APT::FTPArchive::LongDescription</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:569 +msgid "" +"This configuration option defaults to \"<literal>true</literal>\" and should " +"only be set to <literal>\"false\"</literal> if the Archive generated with " +"&apt-ftparchive; also provides <filename>Translation</filename> files. Note " +"that it is currently not possible to create these files with <command>apt-" +"ftparchive</command>." +msgstr "" +"Esta opção de configuração tem a predefinição de \"<literal>true</literal>\" " +"e deve apenas ser definida para <literal>\"false\"</literal> se o Arquivo " +"gerado com &apt-ftparchive; também disponibilizar ficheiros " +"<filename>Translation</filename>. Note que actualmente não é possível criar " +"esses ficheiros com <command>apt-ftparchive</command>." + +#. type: Content of: <refentry><refsect1><title> +#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:480 +#: sources.list.5.xml:193 +msgid "Examples" +msgstr "Examples" + +#. type: Content of: <refentry><refsect1><para><programlisting> +#: apt-ftparchive.1.xml:587 +#, no-wrap +msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" +msgstr "<command>apt-ftparchive</command> pacotes <replaceable>directório</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:583 +msgid "" +"To create a compressed Packages file for a directory containing binary " +"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" +msgstr "" +"Para criar um ficheiro Packages comprimido para um directório que contém " +"pacotes binários (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:597 +msgid "" +"<command>apt-ftparchive</command> returns zero on normal operation, decimal " +"100 on error." +msgstr "" +"<command>apt-ftparchive</command> devolve zero na operação normal, 100 " +"decimal em erro." + +#. The last update date +#. type: Content of: <refentry><refentryinfo> +#: apt-get.8.xml:13 +msgid "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 " +"November 2008</date>" +msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 " +"Novembro 2008</date>" + +#. type: <heading></heading> +#: apt-get.8.xml:22 apt-get.8.xml:29 guide.sgml:96 +msgid "apt-get" +msgstr "apt-get" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-get.8.xml:30 +msgid "APT package handling utility -- command-line interface" +msgstr "" +"Utilitário de manuseamento de pacotes do APT -- interface de linha de " +"comandos" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-get.8.xml:36 +msgid "" +"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> " +"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> " +"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> " +"<option>-t=</option> <group choice='req'> <arg choice='plain'> " +"<replaceable>target_release_name</replaceable> </arg> <arg choice='plain'> " +"<replaceable>target_release_number_expression</replaceable> </arg> <arg " +"choice='plain'> <replaceable>target_release_codename</replaceable> </arg> </" +"group> </arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg " +"choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg " +"choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg choice=" +"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group " +"choice='req'> <arg choice='plain'> =<replaceable>pkg_version_number</" +"replaceable> </arg> <arg choice='plain'> /<replaceable>target_release_name</" +"replaceable> </arg> <arg choice='plain'> /" +"<replaceable>target_release_codename</replaceable> </arg> </group> </arg> </" +"arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>purge <arg " +"choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> " +"<arg choice='plain'>source <arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg " +"choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg " +"choice='plain'> /<replaceable>target_release_name</replaceable> </arg> <arg " +"choice='plain'> /<replaceable>target_release_codename</replaceable> </arg> </" +"group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain" +"\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg " +"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg " +"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg " +"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg " +"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group " +"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> " +"</group> </arg> </group>" +msgstr "" +"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> " +"<option>-o= <replaceable>string_de_configuração</replaceable> </option> </" +"arg> <arg> <option>-c= <replaceable>ficheiro_de_configuração</replaceable> </" +"option> </arg> <arg> <option>-t=</option> <group choice='req'> <arg " +"choice='plain'> <replaceable>nome_de_lançamento_de_destino</replaceable> </" +"arg> <arg choice='plain'> " +"<replaceable>expressão_de_número_de_lançamento_de_destino</replaceable> </" +"arg> <arg choice='plain'> " +"<replaceable>nome_de_código_do_lançamento_de_destino</replaceable> </arg> </" +"group> </arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg " +"choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg " +"choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg choice=" +"\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable> <arg> <group " +"choice='req'> <arg choice='plain'> =<replaceable>número_de_versão_do_pacote</" +"replaceable> </arg> <arg choice='plain'> /" +"<replaceable>nome_do_lançamento_de_destino</replaceable> </arg> <arg " +"choice='plain'> /<replaceable>nome_de_código_do_lançamento_de_destino</" +"replaceable> </arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove " +"<arg choice=\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable></" +"arg></arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>pacote</replaceable></arg></arg> <arg choice='plain'>source " +"<arg choice=\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable> <arg> " +"<group choice='req'> <arg choice='plain'> " +"=<replaceable>número_de_versão_do_pacote</replaceable> </arg> <arg " +"choice='plain'> /<replaceable>nome_de_lançamento_de_destino</replaceable> </" +"arg> <arg choice='plain'> /" +"<replaceable>nome_de_código_de_lançamento_de_destino</replaceable> </arg> </" +"group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain" +"\" rep=\"repeat\"><replaceable>pacote</replaceable></arg></arg> <arg " +"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg " +"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg " +"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg " +"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group " +"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> " +"</group> </arg> </group>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:126 +msgid "" +"<command>apt-get</command> is the command-line tool for handling packages, " +"and may be considered the user's \"back-end\" to other tools using the APT " +"library. Several \"front-end\" interfaces exist, such as &dselect;, " +"&aptitude;, &synaptic;, &gnome-apt; and &wajig;." +msgstr "" +"<command>apt-get</command> é a ferramenta de linha de comandos para lidar " +"com pacotes, e pode ser considerada o \"back-end\" dos utilizadores para " +"outras ferramentas que usam a biblioteca APT. Existem várias interfaces " +"\"front-end\" como o &dselect;, &aptitude;, &synaptic;, &gnome-apt; e " +"&wajig;." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:135 apt-key.8.xml:124 +msgid "update" +msgstr "update" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:136 +msgid "" +"<literal>update</literal> is used to resynchronize the package index files " +"from their sources. The indexes of available packages are fetched from the " +"location(s) specified in <filename>/etc/apt/sources.list</filename>. For " +"example, when using a Debian archive, this command retrieves and scans the " +"<filename>Packages.gz</filename> files, so that information about new and " +"updated packages is available. An <literal>update</literal> should always be " +"performed before an <literal>upgrade</literal> or <literal>dist-upgrade</" +"literal>. Please be aware that the overall progress meter will be incorrect " +"as the size of the package files cannot be known in advance." +msgstr "" +"<literal>update</literal> é usado para re-sincronizar os ficheiros de " +"índices de pacotes a partir das suas fontes. Os índices dos pacotes " +"disponíveis são obtidos a partir das localizações em <filename>/etc/apt/" +"sources.list</filename>. Por exemplo, quando se usa um arquivo Debian, este " +"comando recolhe e analisa os ficheiros <filename>Packages.gz</filename> para " +"que a informação sobre pacotes novos e actualizados fique disponível. Um " +"<literal>update</literal> deve ser sempre executado antes de um " +"<literal>upgrade</literal> ou <literal>dist-upgrade</literal>. Por favor " +"note que a medição do processo total ira estar incorrecta pois o tamanho dos " +"ficheiros de pacotes não pode ser conhecido com antecedência." + +#. type: <tag></tag> +#: apt-get.8.xml:147 guide.sgml:121 +msgid "upgrade" +msgstr "upgrade" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:148 +msgid "" +"<literal>upgrade</literal> is used to install the newest versions of all " +"packages currently installed on the system from the sources enumerated in " +"<filename>/etc/apt/sources.list</filename>. Packages currently installed " +"with new versions available are retrieved and upgraded; under no " +"circumstances are currently installed packages removed, or packages not " +"already installed retrieved and installed. New versions of currently " +"installed packages that cannot be upgraded without changing the install " +"status of another package will be left at their current version. An " +"<literal>update</literal> must be performed first so that <command>apt-get</" +"command> knows that new versions of packages are available." +msgstr "" +"<literal>upgrade</literal> é usado para instalar as versões mais recentes de " +"todos os pacotes presentemente instalados no sistema a partir das fontes " +"enumeradas em <filename>/etc/apt/sources.list</filename>. Os pacotes " +"presentemente instalados com versões novas são obtidos e instalados; em " +"nenhumas circunstâncias os pacotes presentemente instalados serão removidos, " +"nem pacotes já instalados serão obtidos e instalados.Os pacotes " +"presentemente instalados com novas versões e que não possam ser actualizados " +"sem alterarem o estado da instalação de outro pacote serão deixados na " +"versão presente. Deve ser executado primeiro um <literal>update</literal> " +"para que o <command>apt-get</command> fique a saber que estão disponíveis " +"novas versões de pacotes." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:160 +msgid "dselect-upgrade" +msgstr "dselect-upgrade" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:161 +msgid "" +"<literal>dselect-upgrade</literal> is used in conjunction with the " +"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</" +"literal> follows the changes made by &dselect; to the <literal>Status</" +"literal> field of available packages, and performs the actions necessary to " +"realize that state (for instance, the removal of old and the installation of " +"new packages)." +msgstr "" +"<literal>dselect-upgrade</literal> é usado em conjunto com o front-end de " +"pacotes Debian tradicional, &dselect;. <literal>dselect-upgrade</literal> " +"segue as alterações feitas pelo &dselect; ao campo <literal>Status</literal> " +"dos pacotes disponíveis, e executa as acções necessárias para realizar esse " +"estado (por exemplo, a remoção de pacotes antigos e a instalação de novos)." + +#. type: <tag></tag> +#: apt-get.8.xml:170 guide.sgml:140 +msgid "dist-upgrade" +msgstr "dist-upgrade" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:171 +msgid "" +"<literal>dist-upgrade</literal> in addition to performing the function of " +"<literal>upgrade</literal>, also intelligently handles changing dependencies " +"with new versions of packages; <command>apt-get</command> has a \"smart\" " +"conflict resolution system, and it will attempt to upgrade the most " +"important packages at the expense of less important ones if necessary. So, " +"<literal>dist-upgrade</literal> command may remove some packages. The " +"<filename>/etc/apt/sources.list</filename> file contains a list of locations " +"from which to retrieve desired package files. See also &apt-preferences; " +"for a mechanism for overriding the general settings for individual packages." +msgstr "" +"<literal>dist-upgrade</literal> adicionalmente a executar a função do " +"<literal>upgrade</literal>, também lida inteligentemente com as alterações " +"de dependências com as novas versões de pacotes; o <command>apt-get</" +"command> tem um sistema de resolução de conflitos 'inteligente', que irá " +"tentar actualizar os pacotes mais importantes a custo dos pacotes menos " +"importantes, caso necessário. Portanto, o comando <literal>dist-upgrade</" +"literal> pode remover alguns pacotes. O ficheiro <filename>/etc/apt/sources." +"list</filename> contém uma lista de localizações de onde obter os ficheiros " +"de pacotes desejados. Veja também &apt-preferences; para um mecanismo para " +"sobrepor as definições gerais em pacotes individuais." + +#. type: <tag></tag> +#: apt-get.8.xml:183 guide.sgml:131 +msgid "install" +msgstr "install" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:185 +msgid "" +"<literal>install</literal> is followed by one or more packages desired for " +"installation or upgrading. Each package is a package name, not a fully " +"qualified filename (for instance, in a Debian GNU/Linux system, libc6 would " +"be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All " +"packages required by the package(s) specified for installation will also be " +"retrieved and installed. The <filename>/etc/apt/sources.list</filename> " +"file is used to locate the desired packages. If a hyphen is appended to the " +"package name (with no intervening space), the identified package will be " +"removed if it is installed. Similarly a plus sign can be used to designate " +"a package to install. These latter features may be used to override " +"decisions made by apt-get's conflict resolution system." +msgstr "" +"<literal>install</literal> é seguido por um ou mais pacotes desejados para " +"instalação ou actualização. Cada pacote é um nome de pacote, não um nome de " +"ficheiro completamente qualificado (por exemplo, num sistema Debian GNU/" +"Linux, libc6 seria o argumento fornecido e não <literal>libc6_1.9.6-2.deb</" +"literal>). Todos os pacotes necessários pelos pacotes especificados para " +"instalação irão também ser obtidos e instalados. O ficheiro <filename>/etc/" +"apt/sources.list</filename> é usado para localizar os pacotes desejados. Se " +"for acrescentado um sinal menos (-) ao nome do pacote (sem nenhum espaço a " +"separar), o pacote identificado irá ser removido se estiver instalado. À " +"semelhança, um sinal mais (+) pode ser usado para designar um pacote a " +"instalar. Estas últimas funcionalidades podem ser usadas para sobrepor " +"decisões feitas pelo sistema de resolução de conflitos do apt-get." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:203 +msgid "" +"A specific version of a package can be selected for installation by " +"following the package name with an equals and the version of the package to " +"select. This will cause that version to be located and selected for install. " +"Alternatively a specific distribution can be selected by following the " +"package name with a slash and the version of the distribution or the Archive " +"name (stable, testing, unstable)." +msgstr "" +"Pode ser seleccionada para instalação uma versão específica de um pacote ao " +"continuar o nome do pacote com um igual (=) e a versão do pacote a " +"seleccionar. Isto irá fazer com que essa versão seja localizada e " +"seleccionada para instalação. Alternativamente pode ser seleccionada uma " +"distribuição específica ao continuar o nome do pacote com uma slash (/) e a " +"versão da distribuição ou o nome de Arquivo (stable, testing, unstable)." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:210 +msgid "" +"Both of the version selection mechanisms can downgrade packages and must be " +"used with care." +msgstr "" +"Ambos os mecanismos de selecção de versão podem regredir pacotes (downgrade) " +"e devem ser usados com cuidado." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:213 +msgid "" +"This is also the target to use if you want to upgrade one or more already-" +"installed packages without upgrading every package you have on your system. " +"Unlike the \"upgrade\" target, which installs the newest version of all " +"currently installed packages, \"install\" will install the newest version of " +"only the package(s) specified. Simply provide the name of the package(s) " +"you wish to upgrade, and if a newer version is available, it (and its " +"dependencies, as described above) will be downloaded and installed." +msgstr "" +"Este é também o objectivo a usar se deseja actualizar um ou mais pacotes já " +"instalados sem actualizar todos os pacotes que tem no seu sistema. Ao " +"contrário do objectivo \"upgrade\", o qual instala as versões mais recentes " +"de todos os pacotes presentemente instalados, o \"install\" irá instalar a " +"versão mais recente apenas dos pacotes especificados. Simplesmente forneça o " +"nome do(s) pacote(s) que deseja actualizar, e se estiver disponível uma nova " +"versão, ela ( e as suas dependências, como descrito em cima) serão " +"descarregadas e instaladas." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:224 +msgid "" +"Finally, the &apt-preferences; mechanism allows you to create an alternative " +"installation policy for individual packages." +msgstr "" +"Finalmente, o mecanismo &apt-preferences; permite-lhe criar uma política de " +"instalação alternativa para pacotes individuais." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:228 +msgid "" +"If no package matches the given expression and the expression contains one " +"of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and " +"it is applied to all package names in the database. Any matches are then " +"installed (or removed). Note that matching is done by substring so 'lo.*' " +"matches 'how-lo' and 'lowest'. If this is undesired, anchor the regular " +"expression with a '^' or '$' character, or create a more specific regular " +"expression." +msgstr "" +"Se nenhum pacote coincidir com a expressão fornecida e a expressão conter um " +"de '.', '?' ou '*' então é assumido ser uma expressão regular POSIX, e é " +"aplicada a todos os nomes de pacotes da base de dados. Quaisquer " +"correspondências são então instaladas (ou removidas). Note que a " +"correspondência é feita por substring, portanto 'lo.*' corresponde a 'how-" +"lo' e 'lowest'. Se isto for indesejável, ancore a expressão regular com a " +"caractere '^' ou '$', para criar uma expressão regular mais específica." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:237 +msgid "remove" +msgstr "remove" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:238 +msgid "" +"<literal>remove</literal> is identical to <literal>install</literal> except " +"that packages are removed instead of installed. Note the removing a package " +"leaves its configuration files in system. If a plus sign is appended to the " +"package name (with no intervening space), the identified package will be " +"installed instead of removed." +msgstr "" +"<literal>remove</literal> é idêntico a <literal>install</literal> à " +"excepção que os pacotes são removidos em vez de instalados. Note que remover " +"um pacote deixa os seus ficheiros de configuração no sistema. Se um sinal " +"mais (+) for acrescentado ao nome do pacote (sem nenhum espaço a separar), o " +"pacote identificado será instalado em vez de removido." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:245 +msgid "purge" +msgstr "purge" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:246 +msgid "" +"<literal>purge</literal> is identical to <literal>remove</literal> except " +"that packages are removed and purged (any configuration files are deleted " +"too)." +msgstr "" +"<literal>purge</literal> é idêntico ao <literal>remove</literal> com a " +"excepção que os pacotes são removidos e purgados (quaisquer ficheiros de " +"configuração são também apagados)." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:250 +msgid "source" +msgstr "source" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:251 +msgid "" +"<literal>source</literal> causes <command>apt-get</command> to fetch source " +"packages. APT will examine the available packages to decide which source " +"package to fetch. It will then find and download into the current directory " +"the newest available version of that source package while respect the " +"default release, set with the option <literal>APT::Default-Release</" +"literal>, the <option>-t</option> option or per package with the " +"<literal>pkg/release</literal> syntax, if possible." +msgstr "" +"<literal>source</literal> faz com que o <command>apt-get</command> procure " +"pacotes fonte. O APT irá examinar os pacotes disponíveis para decidir qual " +"pacote fonte obter. Irá então encontrar e descarregar para o directório " +"actual a versão disponível mais recente desse pacote fonte enquanto respeita " +"o lançamento predefinido, definido com a opção <literal>APT::Default-" +"Release</literal>, a opção <option>-t</option> ou por pacote com a sintaxe " +"<literal>pkg/release</literal>, se possível." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:259 +msgid "" +"Source packages are tracked separately from binary packages via <literal>deb-" +"src</literal> type lines in the &sources-list; file. This means that you " +"will need to add such a line for each repository you want to get sources " +"from. If you don't do this you will properly get another (newer, older or " +"none) source version than the one you have installed or could install." +msgstr "" +"Os pacotes fonte são acompanhados em separado dos pacotes binários via linha " +"do tipo <literal>deb-src</literal> no ficheiro &sources-list;. Isto quer " +"dizer que você precisa de adicionar tal linha para cada repositório de onde " +"deseja obter fontes. Se você não fizer isto, irá provavelmente obter outra " +"versão de fonte (mais recente, antiga ou nenhuma) que aquela que tem " +"instalada ou pode instalar." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:266 +msgid "" +"If the <option>--compile</option> option is specified then the package will " +"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if " +"<option>--download-only</option> is specified then the source package will " +"not be unpacked." +msgstr "" +"Se for especificada a opção <option>--compile</option> então o pacote irá " +"ser compilado para um binário .deb usando <command>dpkg-buildpackage</" +"command>, Se for especificado <option>--download-only</option> então o " +"pacote fonte não será desempacotado." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:271 +msgid "" +"A specific source version can be retrieved by postfixing the source name " +"with an equals and then the version to fetch, similar to the mechanism used " +"for the package files. This enables exact matching of the source package " +"name and version, implicitly enabling the <literal>APT::Get::Only-Source</" +"literal> option." +msgstr "" +"Uma versão fonte específica pode ser obtida ao pós-fixar o nome da fonte com " +"um igual (=) e depois a versão a procurar, semelhante ao mecanismo usado " +"para os ficheiros de pacotes. Isto activa a correspondência exacta do pacote " +"fonte, nome e versão, activando implicitamente a opção <literal>APT::Get::" +"Only-Source</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:277 +msgid "" +"Note that source packages are not tracked like binary packages, they exist " +"only in the current directory and are similar to downloading source tar " +"balls." +msgstr "" +"Note que os pacotes fonte não são acompanhados como pacotes binários, eles " +"existem apenas no directório actual e são semelhantes à descarga de tar " +"balls fonte." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:282 +msgid "build-dep" +msgstr "build-dep" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:283 +msgid "" +"<literal>build-dep</literal> causes apt-get to install/remove packages in an " +"attempt to satisfy the build dependencies for a source package." +msgstr "" +"<literal>build-dep</literal> faz o apt-get instalar/remover pacotes numa " +"tentativa de satisfazer dependências de compilação para um pacote fonte." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:287 +msgid "check" +msgstr "check" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:288 +msgid "" +"<literal>check</literal> is a diagnostic tool; it updates the package cache " +"and checks for broken dependencies." +msgstr "" +"<literal>check</literal> é uma ferramenta de diagnóstico; actualiza a cache " +"de pacotes e verifica por dependências quebradas." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:293 +msgid "" +"<literal>clean</literal> clears out the local repository of retrieved " +"package files. It removes everything but the lock file from " +"<filename>&cachedir;/archives/</filename> and <filename>&cachedir;/archives/" +"partial/</filename>. When APT is used as a &dselect; method, <literal>clean</" +"literal> is run automatically. Those who do not use dselect will likely " +"want to run <literal>apt-get clean</literal> from time to time to free up " +"disk space." +msgstr "" +"<literal>clean</literal> limpa o repositório local dos ficheiros de pacotes " +"obtidos. Remove tudo excepto o ficheiro lock de <filename>&cachedir;/" +"archives/</filename> e <filename>&cachedir;/archives/partial/</filename>. " +"Quando o APT é usado com um método &dselect;, <literal>clean</literal> é " +"executado automaticamente. Aqueles que não usam o dselect irão provavelmente " +"querer executar <literal>apt-get clean</literal> de tempos a tempos para " +"libertar espaço do disco." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:302 +msgid "autoclean" +msgstr "autoclean" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:303 +msgid "" +"Like <literal>clean</literal>, <literal>autoclean</literal> clears out the " +"local repository of retrieved package files. The difference is that it only " +"removes package files that can no longer be downloaded, and are largely " +"useless. This allows a cache to be maintained over a long period without it " +"growing out of control. The configuration option <literal>APT::Clean-" +"Installed</literal> will prevent installed packages from being erased if it " +"is set to off." +msgstr "" +"Tal como o <literal>clean</literal>, <literal>autoclean</literal> limpa o " +"repositório local de ficheiros de pacotes obtidos. A diferença é que apenas " +"remove ficheiros de pacotes que já não podem ser mais descarregados, e são " +"na maioria dos casos inúteis. Isto permite a manutenção de uma cache durante " +"um longo período sem que ela cresça descontroladamente. A opção de " +"configuração <literal>APT::Clean-Installed</literal> irá prevenir que " +"pacotes instalados sejam apagados se estiver definida para 'off'." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:312 +msgid "autoremove" +msgstr "autoremove" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:313 +msgid "" +"<literal>autoremove</literal> is used to remove packages that were " +"automatically installed to satisfy dependencies for some package and that " +"are no more needed." +msgstr "" +"<literal>autoremove</literal> é usado para remover pacotes que foram " +"instalados automaticamente para satisfazer dependências de algum pacote e " +"que já não são necessários." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:323 apt-get.8.xml:429 +msgid "<option>--no-install-recommends</option>" +msgstr "<option>--no-install-recommends</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:324 +msgid "" +"Do not consider recommended packages as a dependency for installing. " +"Configuration Item: <literal>APT::Install-Recommends</literal>." +msgstr "" +"Não considera pacotes recomendados como dependências para instalação. Item " +"de Configuração: <literal>APT::Install-Recommends</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:328 +msgid "<option>--download-only</option>" +msgstr "<option>--download-only</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:329 +msgid "" +"Download only; package files are only retrieved, not unpacked or installed. " +"Configuration Item: <literal>APT::Get::Download-Only</literal>." +msgstr "" +"Apenas descarrega; os ficheiros pacotes são apenas obtidos, não são " +"desempacotados nem instalados. Item de Configuração: <literal>APT::Get::" +"Download-Only</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:333 +msgid "<option>--fix-broken</option>" +msgstr "<option>--fix-broken</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:334 +msgid "" +"Fix; attempt to correct a system with broken dependencies in place. This " +"option, when used with install/remove, can omit any packages to permit APT " +"to deduce a likely solution. If packages are specified, these have to " +"completely correct the problem. The option is sometimes necessary when " +"running APT for the first time; APT itself does not allow broken package " +"dependencies to exist on a system. It is possible that a system's dependency " +"structure can be so corrupt as to require manual intervention (which usually " +"means using &dselect; or <command>dpkg --remove</command> to eliminate some " +"of the offending packages). Use of this option together with <option>-m</" +"option> may produce an error in some situations. Configuration Item: " +"<literal>APT::Get::Fix-Broken</literal>." +msgstr "" +"Corrige; tenta corrigir um sistema com dependências quebradas no lugar. Esta " +"opção, quando usada com install/remove, pode omitir quaisquer pacotes para " +"permitir ao APT deduzir uma solução provável. Se forem especificados " +"pacotes, este têm de corrigir completamente o problema. A opção é por vezes " +"necessária quando se corre o APT pela primeira vez. O próprio APT não " +"permite que existam num sistema dependências de pacotes quebradas. É " +"possível que uma estrutura de dependências de um sistema esteja tão " +"corrompida ao ponto de requerer intervenção manual (o que normalmente " +"significa usar o &dselect; ou <command>dpkg --remove</command> para eliminar " +"alguns dos pacotes ofensivos). O uso desta opção juntamente com <option>-m</" +"option> pode produzir um erro em algumas situações. Item de Configuração: " +"<literal>APT::Get::Fix-Broken</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:347 +msgid "<option>--ignore-missing</option>" +msgstr "<option>--ignore-missing</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:348 +msgid "<option>--fix-missing</option>" +msgstr "<option>--fix-missing</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:349 +msgid "" +"Ignore missing packages; If packages cannot be retrieved or fail the " +"integrity check after retrieval (corrupted package files), hold back those " +"packages and handle the result. Use of this option together with <option>-f</" +"option> may produce an error in some situations. If a package is selected " +"for installation (particularly if it is mentioned on the command line) and " +"it could not be downloaded then it will be silently held back. " +"Configuration Item: <literal>APT::Get::Fix-Missing</literal>." +msgstr "" +"Ignora pacotes em falta; Se pacotes não podem ser obtidos ou falham a " +"verificação de integridade após obtenção (ficheiros de pacotes corrompidos), " +"retêm esses pacotes e manuseia o resultado. Usar esta opção em conjunto com " +"<option>-f</option> pode produzir erros em algumas situações. Se um pacote " +"for seleccionado para instalação (particularmente se for mencionado na linha " +"de comandos) e não pode ser descarregado estão será retido em silêncio. Item " +"de Configuração: <literal>APT::Get::Fix-Missing</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:359 +msgid "<option>--no-download</option>" +msgstr "<option>--no-download</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:360 +msgid "" +"Disables downloading of packages. This is best used with <option>--ignore-" +"missing</option> to force APT to use only the .debs it has already " +"downloaded. Configuration Item: <literal>APT::Get::Download</literal>." +msgstr "" +"Desactiva a descarga de pacotes. Isto é melhor ser usado com <option>--" +"ignore-missing</option> para forçar o APT a usar os .debs que já foram " +"descarregados. Item de Configuração: <literal>APT::Get::Download</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:367 +msgid "" +"Quiet; produces output suitable for logging, omitting progress indicators. " +"More q's will produce more quiet up to a maximum of 2. You can also use " +"<option>-q=#</option> to set the quiet level, overriding the configuration " +"file. Note that quiet level 2 implies <option>-y</option>, you should never " +"use -qq without a no-action modifier such as -d, --print-uris or -s as APT " +"may decided to do something you did not expect. Configuration Item: " +"<literal>quiet</literal>." +msgstr "" +"Silencioso; produz saída apropriada para registar em log, omitindo " +"indicadores de progresso. Mais q's irá resultar em mais silêncio até o " +"máximo de 2. Você também pode usar <option>-q=#</option> para definir o " +"nível de silêncio, sobrepondo o ficheiro de configuração. Note que o " +"silêncio nível 2 implica <option>-y</option>, você nunca deve usar -qq sem " +"um modificador de 'nenhuma acção' tal como -d, --print-uris ou -s pois o APT " +"pode decidir fazer algo que você não esperava. Item de Configuração: " +"<literal>quiet</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:377 +msgid "<option>--simulate</option>" +msgstr "<option>--simulate</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:379 +msgid "<option>--dry-run</option>" +msgstr "<option>--dry-run</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:382 +msgid "" +"No action; perform a simulation of events that would occur but do not " +"actually change the system. Configuration Item: <literal>APT::Get::" +"Simulate</literal>." +msgstr "" +"Nenhuma acção; executa uma simulação dos eventos que irão ocorrer mas na " +"realidade não altera o sistema. Item de Configuração: <literal>APT::Get::" +"Simulate</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:386 +msgid "" +"Simulation run as user will deactivate locking (<literal>Debug::NoLocking</" +"literal>) automatic. Also a notice will be displayed indicating that this " +"is only a simulation, if the option <literal>APT::Get::Show-User-Simulation-" +"Note</literal> is set (Default: true). Neither NoLocking nor the notice " +"will be triggered if run as root (root should know what he is doing without " +"further warnings by <literal>apt-get</literal>)." +msgstr "" +"Uma simulação corrida como utilizador irá automaticamente desactivar o " +"bloqueio (<literal>Debug::NoLocking</literal>). Também será mostrado um " +"aviso indicando que é apenas uma simulação, se a opção <literal>APT::Get::" +"Show-User-Simulation-Note</literal> estiver definida (a predefinição é " +"verdadeira). Nem o NoLocking nem o aviso serão activados se corrido como " +"root (o root deve saber o que está a fazer sem mais avisos do <literal>apt-" +"get</literal>)." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:392 +msgid "" +"Simulate prints out a series of lines each one representing a dpkg " +"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets " +"indicate broken packages and empty set of square brackets meaning breaks " +"that are of no consequence (rare)." +msgstr "" +"A simulação escreve uma série de linhas cada uma representando uma operação " +"do dpkg, Configurar (Conf), Remover (Remv), Desempacotar (Inst). Parênteses " +"rectos ([]) indicam pacotes quebrados e conjuntos de parênteses rectos " +"vazios significam quebras que não têm consequência (raro)." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:399 +msgid "<option>-y</option>" +msgstr "<option>-y</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:399 +msgid "<option>--yes</option>" +msgstr "<option>--yes</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:400 +msgid "<option>--assume-yes</option>" +msgstr "<option>--assume-yes</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:401 +msgid "" +"Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " +"non-interactively. If an undesirable situation, such as changing a held " +"package, trying to install a unauthenticated package or removing an " +"essential package occurs then <literal>apt-get</literal> will abort. " +"Configuration Item: <literal>APT::Get::Assume-Yes</literal>." +msgstr "" +"Responde sim automaticamente aos avisos; assume \"yes\" como resposta a " +"todos os avisos e corre não-interactivamente. Se uma situação indesejável " +"ocorrer, tal como alterar um pacote retido, tentar instalar um pacote não " +"autenticado ou remover um pacote essencial, então o <literal>apt-get</" +"literal> irá abortar. Item de Configuração: <literal>APT::Get::Assume-Yes</" +"literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:408 +msgid "<option>-u</option>" +msgstr "<option>-u</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:408 +msgid "<option>--show-upgraded</option>" +msgstr "<option>--show-upgraded</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:409 +msgid "" +"Show upgraded packages; Print out a list of all packages that are to be " +"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>." +msgstr "" +"Mostra pacotes actualizados; Escreve uma lista de todos os pacotes que estão " +"prestes a ser actualizados. Item de Configuração: <literal>APT::Get::Show-" +"Upgraded</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:414 +msgid "<option>-V</option>" +msgstr "<option>-V</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:414 +msgid "<option>--verbose-versions</option>" +msgstr "<option>--verbose-versions</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:415 +msgid "" +"Show full versions for upgraded and installed packages. Configuration Item: " +"<literal>APT::Get::Show-Versions</literal>." +msgstr "" +"Mostra as versões completas para pacotes actualizados e instalados. Item de " +"Configuração: <literal>APT::Get::Show-Versions</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:419 +msgid "<option>-b</option>" +msgstr "<option>-b</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:419 +msgid "<option>--compile</option>" +msgstr "<option>--compile</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:420 +msgid "<option>--build</option>" +msgstr "<option>--build</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:421 +msgid "" +"Compile source packages after downloading them. Configuration Item: " +"<literal>APT::Get::Compile</literal>." +msgstr "" +"Compila pacotes fonte após os descarregar. Item de Configuração: " +"<literal>APT::Get::Compile</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:425 +msgid "<option>--install-recommends</option>" +msgstr "<option>--install-recommends</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:426 +msgid "Also install recommended packages." +msgstr "Também instala pacotes recomendados." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:430 +msgid "Do not install recommended packages." +msgstr "Não instala pacotes recomendados." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:433 +msgid "<option>--ignore-hold</option>" +msgstr "<option>--ignore-hold</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:434 +msgid "" +"Ignore package Holds; This causes <command>apt-get</command> to ignore a " +"hold placed on a package. This may be useful in conjunction with " +"<literal>dist-upgrade</literal> to override a large number of undesired " +"holds. Configuration Item: <literal>APT::Ignore-Hold</literal>." +msgstr "" +"Ignora pacotes retidos; Isto faz com que o <command>apt-get</command> ignore " +"a retenção de um pacote. Isto pode ser útil em conjunto com <literal>dist-" +"upgrade</literal> para sobrepor um grande número de retenções não desejadas. " +"Item de Configuração: <literal>APT::Ignore-Hold</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:440 +msgid "<option>--no-upgrade</option>" +msgstr "<option>--no-upgrade</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:441 +msgid "" +"Do not upgrade packages; When used in conjunction with <literal>install</" +"literal>, <literal>no-upgrade</literal> will prevent packages on the command " +"line from being upgraded if they are already installed. Configuration Item: " +"<literal>APT::Get::Upgrade</literal>." +msgstr "" +"Não actualiza pacotes; Quando usado em conjunto com <literal>install</" +"literal>, o <literal>no-upgrade</literal> irá prevenir que pacotes sejam " +"actualizados na linha de comandos se estes já estiverem instalados. Item de " +"Configuração: <literal>APT::Get::Upgrade</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:447 +msgid "<option>--only-upgrade</option>" +msgstr "<option>--only-upgrade</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:448 +msgid "" +"Do not install new packages; When used in conjunction with <literal>install</" +"literal>, <literal>only-upgrade</literal> will prevent packages on the " +"command line from being upgraded if they are not already installed. " +"Configuration Item: <literal>APT::Get::Only-Upgrade</literal>." +msgstr "" +"Não instala pacotes novos; Quando usado em conjunto com <literal>install</" +"literal>, o <literal>only-upgrade</literal> irá prevenir que pacotes sejam " +"actualizados na linha de comandos se estes não estiverem já instalados. Item " +"de Configuração: <literal>APT::Get::Only-Upgrade</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:454 +msgid "<option>--force-yes</option>" +msgstr "<option>--force-yes</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:455 +msgid "" +"Force yes; This is a dangerous option that will cause apt to continue " +"without prompting if it is doing something potentially harmful. It should " +"not be used except in very special situations. Using <literal>force-yes</" +"literal> can potentially destroy your system! Configuration Item: " +"<literal>APT::Get::force-yes</literal>." +msgstr "" +"Força o sim; Esta é uma opção perigosa que irá fazer com que o apt continue " +"sem avisar quando está a fazer algo potencialmente prejudicial. Não deve ser " +"usado excepto em situações muito especiais. Usar o <literal>force-yes</" +"literal> pode destruir potencialmente o seu sistema! Item de Configuração: " +"<literal>APT::Get::force-yes</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:462 +msgid "<option>--print-uris</option>" +msgstr "<option>--print-uris</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:463 +msgid "" +"Instead of fetching the files to install their URIs are printed. Each URI " +"will have the path, the destination file name, the size and the expected md5 " +"hash. Note that the file name to write to will not always match the file " +"name on the remote site! This also works with the <literal>source</literal> " +"and <literal>update</literal> commands. When used with the <literal>update</" +"literal> command the MD5 and size are not included, and it is up to the user " +"to decompress any compressed files. Configuration Item: <literal>APT::Get::" +"Print-URIs</literal>." +msgstr "" +"Ao invés de ir buscar os ficheiros para instalar, escreve os seus URIs. Cada " +"URI irá ter o caminho, o nome de ficheiro de destino, o tamanho e o hash md5 " +"esperado. Note que o nome de ficheiro a escrever nem sempre irá condizer com " +"o nome do ficheiro no site remoto! Isto também funciona com os comandos " +"<literal>source</literal> e <literal>update</literal>. Quando usado com o " +"comando <literal>update</literal> o MD5 e o tamanho não são incluídos, e " +"cabe ao utilizador descomprimir quaisquer ficheiros comprimidos. Item de " +"Configuração: <literal>APT::Get::Print-URIs</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:473 +msgid "<option>--purge</option>" +msgstr "<option>--purge</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:474 +msgid "" +"Use purge instead of remove for anything that would be removed. An asterisk " +"(\"*\") will be displayed next to packages which are scheduled to be purged. " +"<option>remove --purge</option> is equivalent to the <option>purge</option> " +"command. Configuration Item: <literal>APT::Get::Purge</literal>." +msgstr "" +"Usa purgar em vez de remoção para tudo o que seja removido. Um asterisco (\"*" +"\") será mostrado junto dos pacotes que estão agendados para serem purgados. " +"<option>remove --purge</option> é equivalente ao comando <option>purge</" +"option>. Item de Configuração: <literal>APT::Get::Purge</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:481 +msgid "<option>--reinstall</option>" +msgstr "<option>--reinstall</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:482 +msgid "" +"Re-Install packages that are already installed and at the newest version. " +"Configuration Item: <literal>APT::Get::ReInstall</literal>." +msgstr "" +"Re-instala pacotes que já estão instalados e na versão mais recente. Item de " +"Configuração: <literal>APT::Get::ReInstall</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:486 +msgid "<option>--list-cleanup</option>" +msgstr "<option>--list-cleanup</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:487 +msgid "" +"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " +"it off. When on <command>apt-get</command> will automatically manage the " +"contents of <filename>&statedir;/lists</filename> to ensure that obsolete " +"files are erased. The only reason to turn it off is if you frequently " +"change your source list. Configuration Item: <literal>APT::Get::List-" +"Cleanup</literal>." +msgstr "" +"A predefinição desta opção é ligada, use <literal>--no-list-cleanup</" +"literal> para a desligar. Quando ligada o <command>apt-get</command> irá " +"gerir automaticamente os conteúdos de <filename>&statedir;/lists</filename> " +"para assegurar que os ficheiros obsoletos são apagados. A única razão para " +"desligar isto é no caso de você alterar frequentemente a sua lista de " +"fontes. Item de Configuração: <literal>APT::Get::List-Cleanup</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:496 +msgid "<option>--target-release</option>" +msgstr "<option>--target-release</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:497 +msgid "<option>--default-release</option>" +msgstr "<option>--default-release</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:498 +msgid "" +"This option controls the default input to the policy engine, it creates a " +"default pin at priority 990 using the specified release string. This " +"overrides the general settings in <filename>/etc/apt/preferences</" +"filename>. Specifically pinned packages are not affected by the value of " +"this option. In short, this option lets you have simple control over which " +"distribution packages will be retrieved from. Some common examples might be " +"<option>-t '2.1*'</option>, <option>-t unstable</option> or <option>-t sid</" +"option>. Configuration Item: <literal>APT::Default-Release</literal>; see " +"also the &apt-preferences; manual page." +msgstr "" +"Esta opção controla a entrada predefinida para o motor de políticas, cria um " +"pin predefinido na prioridade 990 usando a string de lançamento " +"especificada. Isto sobrepõe as definições gerais em <filename>/etc/apt/" +"preferences</filename>. Os pacotes com pin específico não são afectados pelo " +"valor desta opção. Em resumo, esta opção permite-lhe ter controlo simples " +"sobre de qual distribuição os pacotes serão obtidos. Alguns exemplos comuns " +"podem ser <option>-t '2.1*'</option>, <option>-t unstable</option> ou " +"<option>-t sid</option>. Item de Configuração: <literal>APT::Default-" +"Release</literal>; veja também o manual &apt-preferences;." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:511 +msgid "<option>--trivial-only</option>" +msgstr "<option>--trivial-only</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:513 +msgid "" +"Only perform operations that are 'trivial'. Logically this can be considered " +"related to <option>--assume-yes</option>, where <option>--assume-yes</" +"option> will answer yes to any prompt, <option>--trivial-only</option> will " +"answer no. Configuration Item: <literal>APT::Get::Trivial-Only</literal>." +msgstr "" +"Apenas executa operações 'triviais'. Na lógica isto pode ser considerado " +"relacionado ao <option>--assume-yes</option>, onde <option>--assume-yes</" +"option> irá responder 'sim' a todos os avisos, <option>--trivial-only</" +"option> irá responder 'não'. Item de Configuração: <literal>APT::Get::" +"Trivial-Only</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:519 +msgid "<option>--no-remove</option>" +msgstr "<option>--no-remove</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:520 +msgid "" +"If any packages are to be removed apt-get immediately aborts without " +"prompting. Configuration Item: <literal>APT::Get::Remove</literal>." +msgstr "" +"Se quaisquer pacotes estiverem para ser removidos, o apt-get aborta " +"imediatamente sem aviso. Item de Configuração: <literal>APT::Get::Remove</" +"literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:525 +msgid "<option>--auto-remove</option>" +msgstr "<option>--auto-remove</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:526 +msgid "" +"If the command is either <literal>install</literal> or <literal>remove</" +"literal>, then this option acts like running <literal>autoremove</literal> " +"command, removing the unused dependency packages. Configuration Item: " +"<literal>APT::Get::AutomaticRemove</literal>." +msgstr "" +"Se o comando for <literal>install</literal> ou <literal>remove</literal>, " +"então esta opção age como se corresse o comando <literal>autoremove</" +"literal>, removendo os pacotes de dependências não utilizados. Item de " +"Configuração: <literal>APT::Get::AutomaticRemove</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:532 +msgid "<option>--only-source</option>" +msgstr "<option>--only-source</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:533 +msgid "" +"Only has meaning for the <literal>source</literal> and <literal>build-dep</" +"literal> commands. Indicates that the given source names are not to be " +"mapped through the binary table. This means that if this option is " +"specified, these commands will only accept source package names as " +"arguments, rather than accepting binary package names and looking up the " +"corresponding source package. Configuration Item: <literal>APT::Get::Only-" +"Source</literal>." +msgstr "" +"Apenas tem significado para os comandos <literal>source</literal> e " +"<literal>build-dep</literal>. Indica que os nomes de fontes fornecidos não " +"são para serem mapeados através da tabela de binários. Isto quer dizer que " +"se esta opção for especificada, estes comandos apenas irão aceitar nomes de " +"pacotes fonte como argumentos, em vez de aceitarem nomes de pacotes binários " +"e procurar o pacote fonte correspondente. Item de Configuração: " +"<literal>APT::Get::Only-Source</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:543 +msgid "<option>--diff-only</option>" +msgstr "<option>--diff-only</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:543 +msgid "<option>--dsc-only</option>" +msgstr "<option>--dsc-only</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:543 +msgid "<option>--tar-only</option>" +msgstr "<option>--tar-only</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:544 +msgid "" +"Download only the diff, dsc, or tar file of a source archive. Configuration " +"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" +"literal>, and <literal>APT::Get::Tar-Only</literal>." +msgstr "" +"Descarrega apenas o ficheiro diff, dsc, ou tar de um pacote fonte. Item de " +"Configuração: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-" +"Only</literal>, e <literal>APT::Get::Tar-Only</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:549 +msgid "<option>--arch-only</option>" +msgstr "<option>--arch-only</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:550 +msgid "" +"Only process architecture-dependent build-dependencies. Configuration Item: " +"<literal>APT::Get::Arch-Only</literal>." +msgstr "" +"Apenas processa dependências de compilação dependentes da arquitectura. Item " +"de Configuração: <literal>APT::Get::Arch-Only</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:554 +msgid "<option>--allow-unauthenticated</option>" +msgstr "<option>--allow-unauthenticated</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:555 +msgid "" +"Ignore if packages can't be authenticated and don't prompt about it. This " +"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" +"AllowUnauthenticated</literal>." +msgstr "" +"Ignora se os pacotes não podem ser autenticados e não avisa sobre isso. Isto " +"é útil para ferramentas como o pbuilder. Item de Configuração: <literal>APT::" +"Get::AllowUnauthenticated</literal>." + +#. type: Content of: <refentry><refsect1><variablelist> +#: apt-get.8.xml:568 +msgid "" +"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " +"&file-statelists;" +msgstr "" +"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " +"&file-statelists;" + +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:577 +msgid "" +"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " +"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" +"preferences;, the APT Howto." +msgstr "" +"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " +"&apt-config;, &apt-secure;, O guia de utilizadores do The APT em " +"&guidesdir;, &apt-preferences;, o Howto do APT." + +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:583 +msgid "" +"<command>apt-get</command> returns zero on normal operation, decimal 100 on " +"error." +msgstr "" +"<command>apt-get</command> devolve zero na operação normal, 100 decimal em " +"erro." + +#. type: Content of: <refentry><refsect1><title> +#: apt-get.8.xml:586 +msgid "ORIGINAL AUTHORS" +msgstr "AUTORES ORIGINAIS" + +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:587 +msgid "&apt-author.jgunthorpe;" +msgstr "&apt-author.jgunthorpe;" + +#. type: Content of: <refentry><refsect1><title> +#: apt-get.8.xml:590 +msgid "CURRENT AUTHORS" +msgstr "AUTORES ACTUAIS" + +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:592 +msgid "&apt-author.team;" +msgstr "&apt-author.team;" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-key.8.xml:14 apt-key.8.xml:21 +msgid "apt-key" +msgstr "apt-key" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-key.8.xml:22 +msgid "APT key management utility" +msgstr "Utilitário de gestão de chaves do APT" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-key.8.xml:28 +msgid "" +"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</" +"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> " +"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></" +"arg>" +msgstr "" +"<command>apt-key</command> <arg><option>--keyring <replaceable>nome de " +"ficheiro</replaceable></option></arg> <arg><replaceable>comando</" +"replaceable></arg> <arg rep=\"repeat\"><option><replaceable>argumentos</" +"replaceable></option></arg>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-key.8.xml:37 +msgid "" +"<command>apt-key</command> is used to manage the list of keys used by apt to " +"authenticate packages. Packages which have been authenticated using these " +"keys will be considered trusted." +msgstr "" +"<command>apt-key</command> é usado para gerir uma lista de chaves usadas " +"pelo apt para autenticar pacotes. Os pacotes que foram autenticados com " +"estas chaves serão considerados de confiança." + +#. type: Content of: <refentry><refsect1><title> +#: apt-key.8.xml:43 +msgid "Commands" +msgstr "Comandos" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:45 +msgid "add <replaceable>filename</replaceable>" +msgstr "add <replaceable>nome-de-ficheiro</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:49 +msgid "" +"Add a new key to the list of trusted keys. The key is read from " +"<replaceable>filename</replaceable>, or standard input if " +"<replaceable>filename</replaceable> is <literal>-</literal>." +msgstr "" +"Adiciona uma chave nova à lista de chaves de confiança. A chave é lida de " +"<replaceable>nome de ficheiro</replaceable>, ou entrada standard se " +"<replaceable>nome de ficheiro</replaceable> for <literal>-</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:57 +msgid "del <replaceable>keyid</replaceable>" +msgstr "del <replaceable>id de chave</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:61 +msgid "Remove a key from the list of trusted keys." +msgstr "Remove uma chave da lista de chaves de confiança." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:68 +msgid "export <replaceable>keyid</replaceable>" +msgstr "export <replaceable>id de chave</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:72 +msgid "Output the key <replaceable>keyid</replaceable> to standard output." +msgstr "" +"Escreve o <replaceable>id de chave</replaceable> da chave na saída standard." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:79 +msgid "exportall" +msgstr "exportall" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:83 +msgid "Output all trusted keys to standard output." +msgstr "Escreve todas as chaves de confiança na saída standard." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:90 +msgid "list" +msgstr "list" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:94 +msgid "List trusted keys." +msgstr "Lista as chaves de confiança." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:101 +msgid "finger" +msgstr "finger" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:105 +msgid "List fingerprints of trusted keys." +msgstr "Lista as fingerprints das chaves de confiança." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:112 +msgid "adv" +msgstr "adv" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:116 +msgid "" +"Pass advanced options to gpg. With adv --recv-key you can download the " +"public key." +msgstr "" +"Passa opções avançadas ao gpg. Com adv --recv-key você pode descarregar a " +"chave pública." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:128 +msgid "" +"Update the local keyring with the keyring of Debian archive keys and removes " +"from the keyring the archive keys which are no longer valid." +msgstr "" +"Actualiza o chaveiro local com o chaveiro das chaves de arquivos Debian e " +"remove do chaveiro as chaves de arquivo que já não são válidas." + +#. type: Content of: <refentry><refsect1><para> +#: apt-key.8.xml:140 +msgid "" +"Note that options need to be defined before the commands described in the " +"previous section." +msgstr "" +"Note que as opções precisam ser definidas antes dos comandos descritos na " +"secção prévia." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:142 +msgid "--keyring <replaceable>filename</replaceable>" +msgstr "--keyring <replaceable>nome-de-ficheiro</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:143 +msgid "" +"With this option it is possible to specify a specific keyring file the " +"command should operate on. The default is that a command is executed on the " +"<filename>trusted.gpg</filename> file as well as on all parts in the " +"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</" +"filename> is the primary keyring which means that e.g. new keys are added to " +"this one." +msgstr "" +"Com esta opção é possível especificar um ficheiro de chaveiro específico com " +"o qual o comando deve operar. A predefinição é que um comando é executado no " +"ficheiro <filename>trusted.gpg</filename> assim como em todas as partes do " +"directório <filename>trusted.gpg.d</filename>, assim <filename>trusted.gpg</" +"filename> é o chaveiro principal o que significa que, por exemplo, as novas " +"chaves são adicionadas a este." + +#. type: Content of: <refentry><refsect1><variablelist> +#: apt-key.8.xml:156 +msgid "&file-trustedgpg;" +msgstr "&file-trustedgpg;" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:158 +msgid "<filename>/etc/apt/trustdb.gpg</filename>" +msgstr "<filename>/etc/apt/trustdb.gpg</filename>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:159 +msgid "Local trust database of archive keys." +msgstr "Base de dados local de confiança de chaves de arquivos." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:162 +msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:163 +msgid "Keyring of Debian archive trusted keys." +msgstr "Chaveiro das chaves de confiança dos arquivos Debian." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:166 +msgid "" +"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +msgstr "" +"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:167 +msgid "Keyring of Debian archive removed trusted keys." +msgstr "Chaveiro das chaves de confiança removidas dos arquivos Debian." + +#. type: Content of: <refentry><refsect1><para> +#: apt-key.8.xml:176 +msgid "&apt-get;, &apt-secure;" +msgstr "&apt-get;, &apt-secure;" + +#. The last update date +#. type: Content of: <refentry><refentryinfo> +#: apt-mark.8.xml:13 +msgid "" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " +"August 2009</date>" +msgstr "" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " +"Agosto 2009</date>" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-mark.8.xml:22 apt-mark.8.xml:29 +msgid "apt-mark" +msgstr "apt-mark" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-mark.8.xml:30 +msgid "mark/unmark a package as being automatically-installed" +msgstr "marca/desmarca um pacote como sendo instalado automaticamente" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-mark.8.xml:36 +msgid "" +" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" +"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain" +"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain" +"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg " +"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </" +"arg> <arg choice=\"plain\">showauto</arg> </group>" +msgstr "" +" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" +"f=<replaceable>NOME DE FICHEIRO</replaceable></option></arg> <group choice=" +"\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain" +"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg " +"choice=\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable></arg> </" +"arg> <arg choice=\"plain\">showauto</arg> </group>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-mark.8.xml:53 +msgid "" +"<command>apt-mark</command> will change whether a package has been marked as " +"being automatically installed." +msgstr "" +"<command>apt-mark</command> irá modificar se um pacote foi marcado como " +"sendo instalado automaticamente." + +#. type: Content of: <refentry><refsect1><para> +#: apt-mark.8.xml:57 +msgid "" +"When you request that a package is installed, and as a result other packages " +"are installed to satisfy its dependencies, the dependencies are marked as " +"being automatically installed. Once these automatically installed packages " +"are no longer depended on by any manually installed packages, they will be " +"removed by e.g. <command>apt-get</command> or <command>aptitude</command>." +msgstr "" +"Quando você pede que um pacote seja instalado, e como resultado outros " +"pacotes são instalados para satisfazer as suas dependências, as dependências " +"são marcadas como sendo instaladas automaticamente. Uma vez que estes " +"pacotes instalados automaticamente não sejam mais necessários por nenhum " +"pacote instalado manualmente, eles serão removidos pelo <command>apt-get</" +"command> ou <command>aptitude</command> (exemplos)." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:65 +msgid "markauto" +msgstr "markauto" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:66 +msgid "" +"<literal>markauto</literal> is used to mark a package as being automatically " +"installed, which will cause the package to be removed when no more manually " +"installed packages depend on this package." +msgstr "" +"<literal>markauto</literal> é usado para marcar um pacote como sendo " +"instalado automaticamente, o que irá causar a remoção do pacote quando mais " +"nenhum pacote instalado manualmente depender deste pacote." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:73 +msgid "unmarkauto" +msgstr "unmarkauto" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:74 +msgid "" +"<literal>unmarkauto</literal> is used to mark a package as being manually " +"installed, which will prevent the package from being automatically removed " +"if no other packages depend on it." +msgstr "" +"<literal>unmarkauto</literal> é usado para marcar um pacote como sendo " +"instalado manualmente, o que irá prevenir que o pacote seja removido " +"automaticamente se nenhum outro pacote depender dele." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:81 +msgid "showauto" +msgstr "showauto" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:82 +msgid "" +"<literal>showauto</literal> is used to print a list of automatically " +"installed packages with each package on a new line." +msgstr "" +"<literal>showauto</literal> é usado para escrever uma lista dos pacotes " +"instalados automaticamente com cada pacote numa linha nova." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:93 +msgid "" +"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" +msgstr "" +"<option>-f=<filename><replaceable>NOME DE FICHEIRO</replaceable></filename></" +"option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:94 +msgid "" +"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></" +"option>" +msgstr "" +"<option>--file=<filename><replaceable>NOME DE FICHEIRO</replaceable></" +"filename></option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:97 +msgid "" +"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></" +"filename> instead of the default location, which is " +"<filename>extended_status</filename> in the directory defined by the " +"Configuration Item: <literal>Dir::State</literal>." +msgstr "" +"Lê/Escreve o estado de pacote a partir de " +"<filename><replaceable>NOME_DE_FICHEIRO</replaceable></filename> em vez da " +"localização predefinida, a qual é <filename>extended_status</filename> no " +"directório definido pelo Item de Configuração: <literal>Dir::State</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:103 +msgid "<option>-h</option>" +msgstr "<option>-h</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:104 +msgid "<option>--help</option>" +msgstr "<option>--help</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:105 +msgid "Show a short usage summary." +msgstr "Mostra um curto sumário de utilização." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:111 +msgid "<option>-v</option>" +msgstr "<option>-v</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:112 +msgid "<option>--version</option>" +msgstr "<option>--version</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:113 +msgid "Show the program version." +msgstr "Mostra a versão do programa." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:124 +msgid "<filename>/var/lib/apt/extended_states</filename>" +msgstr "<filename>/var/lib/apt/extended_states</filename>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:125 +msgid "" +"Status list of auto-installed packages. Configuration Item: <literal>Dir::" +"State</literal> sets the path to the <filename>extended_states</filename> " +"file." +msgstr "" +"Lista de estado de pacotes auto-instalados. Item de Configuração: " +"<literal>Dir::State</literal> que define o caminho para o ficheiro " +"<filename>extended_states</filename>." + +#. type: Content of: <refentry><refsect1><para> +#: apt-mark.8.xml:134 +msgid "&apt-get;,&aptitude;,&apt-conf;" +msgstr "&apt-get;,&aptitude;,&apt-conf;" + +#. type: Content of: <refentry><refsect1><para> +#: apt-mark.8.xml:138 +msgid "" +"<command>apt-mark</command> returns zero on normal operation, non-zero on " +"error." +msgstr "" +"<command>apt-mark</command> devolve zero na operação normal, 100 decimal em " +"erro." + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-secure.8.xml:14 apt-secure.8.xml:36 +msgid "apt-secure" +msgstr "apt-secure" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-secure.8.xml:37 +msgid "Archive authentication support for APT" +msgstr "Suporte de autenticação de arquivos para o APT" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:42 +msgid "" +"Starting with version 0.6, <command>apt</command> contains code that does " +"signature checking of the Release file for all archives. This ensures that " +"packages in the archive can't be modified by people who have no access to " +"the Release file signing key." +msgstr "" +"A partir da versão 0.6, o <command>apt</command> contém código que faz " +"verificação de assinaturas do ficheiro Release para todos os arquivos. Isto " +"assegura que os pacotes no arquivo não podem ser modificados por pessoas que " +"não têm acesso à chave de assinatura do ficheiro Release." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:50 +msgid "" +"If a package comes from a archive without a signature or with a signature " +"that apt does not have a key for that package is considered untrusted and " +"installing it will result in a big warning. <command>apt-get</command> will " +"currently only warn for unsigned archives, future releases might force all " +"sources to be verified before downloading packages from them." +msgstr "" +"Se um pacote vem dum arquivo sem assinatura ou com uma assinatura para a " +"qual o apt não tem a chave, esse pacote é considerado 'não sendo de " +"confiança' e instalá-lo irá resultar num grande aviso. Actualmente o " +"<command>apt-get</command> irá avisar apenas de arquivos não assinados, " +"lançamentos futuros poderão vir a forçar que todas as fontes sejam " +"verificadas antes de descarregar pacotes delas." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:59 +msgid "" +"The package frontends &apt-get;, &aptitude; and &synaptic; support this new " +"authentication feature." +msgstr "" +"Os frontends de pacotes &apt-get;, &aptitude; e &synaptic; suportam esta " +"nova funcionalidade de autenticação." + +#. type: Content of: <refentry><refsect1><title> +#: apt-secure.8.xml:64 +msgid "Trusted archives" +msgstr "Arquivos de confiança" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:67 +msgid "" +"The chain of trust from an apt archive to the end user is made up of " +"different steps. <command>apt-secure</command> is the last step in this " +"chain, trusting an archive does not mean that the packages that you trust it " +"do not contain malicious code but means that you trust the archive " +"maintainer. It's the archive maintainer responsibility to ensure that the " +"archive integrity is correct." +msgstr "" +"A corrente de confiança desde um arquivo apt até ao utilizador final é feita " +"em diferentes passos. O <command>apt-secure</command> é o último passo nesta " +"corrente, confiar num arquivo não quer dizer que os pacotes em que confia " +"não possam conter código malicioso, mas que dizer que você confia no " +"responsável do arquivo. É da responsabilidade do responsável do arquivo " +"assegurar que a integridade do arquivo está correcta." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:75 +msgid "" +"apt-secure does not review signatures at a package level. If you require " +"tools to do this you should look at <command>debsig-verify</command> and " +"<command>debsign</command> (provided in the debsig-verify and devscripts " +"packages respectively)." +msgstr "" +"O apt-secure não revê as assinaturas ao nível do pacote. Se você necessita " +"de ferramentas que o façam deve procurar pelo <command>debsig-verify</" +"command> e <command>debsign</command> (disponibilizados nos pacotes debsig-" +"verify e devscripts respectivamente)." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:82 +msgid "" +"The chain of trust in Debian starts when a maintainer uploads a new package " +"or a new version of a package to the Debian archive. This upload in order to " +"become effective needs to be signed by a key of a maintainer within the " +"Debian maintainer's keyring (available in the debian-keyring package). " +"Maintainer's keys are signed by other maintainers following pre-established " +"procedures to ensure the identity of the key holder." +msgstr "" +"A corrente de confiança em Debian começa quando o responsável faz o upload " +"de um novo pacote ou de uma nova versão de um pacote para o arquivo Debian. " +"De modo a se tornar efectivo, este upload precisa de ser assinado por uma " +"chave de um responsável dentro do chaveiro de responsáveis da Debian " +"(disponível no pacote debian-keyring). As chaves dos responsáveis são " +"assinadas por outros responsáveis seguindo procedimentos pré-estabelecidos " +"para assegurar a identidade do dono da chave." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:92 +msgid "" +"Once the uploaded package is verified and included in the archive, the " +"maintainer signature is stripped off, an MD5 sum of the package is computed " +"and put in the Packages file. The MD5 sum of all of the packages files are " +"then computed and put into the Release file. The Release file is then signed " +"by the archive key (which is created once a year) and distributed through " +"the FTP server. This key is also on the Debian keyring." +msgstr "" +"Após o upload, o pacote é verificado e incluído no arquivo, a assinatura do " +"responsável é despojada, é computado um sumário MD5 do pacote e colocado no " +"ficheiro Packages. Os sumários MD5 de todos os ficheiros pacotes são então " +"computados e colocados no ficheiro Release. O ficheiro Release é então " +"assinado pela chave de arquivo (a qual é criada uma vez por ano) e " +"distribuído através do servidor FTP. Esta chave está também no chaveiro " +"Debian." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:102 +msgid "" +"Any end user can check the signature of the Release file, extract the MD5 " +"sum of a package from it and compare it with the MD5 sum of the package he " +"downloaded. Prior to version 0.6 only the MD5 sum of the downloaded Debian " +"package was checked. Now both the MD5 sum and the signature of the Release " +"file are checked." +msgstr "" +"Qualquer utilizador final pode verificar a assinatura do ficheiro Release, " +"extrair o sumário MD5 de um pacote a partir dele, e compará-lo com o sumário " +"MD5 do pacote que descarregou. Antes da versão 0.6 apenas o sumário MD5 do " +"pacote Debian descarregado era verificado. Agora são verificados ambos: o " +"sumário MD5 e a assinatura do ficheiro Release." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:109 +msgid "" +"Notice that this is distinct from checking signatures on a per package " +"basis. It is designed to prevent two possible attacks:" +msgstr "" +"Note que isto é diferente de verificar assinaturas por cada pacote. É " +"desenhado para prevenir dois ataques possíveis:" + +#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#: apt-secure.8.xml:114 +msgid "" +"<literal>Network \"man in the middle\" attacks</literal>. Without signature " +"checking, a malicious agent can introduce himself in the package download " +"process and provide malicious software either by controlling a network " +"element (router, switch, etc.) or by redirecting traffic to a rogue server " +"(through arp or DNS spoofing attacks)." +msgstr "" +"<literal>Ataques de rede \"man in the middle\"</literal>. Sem verificação de " +"assinatura, um agente malicioso pode introduzir-se ele próprio no processo " +"de descarga de pacotes e disponibilizar software malicioso seja ao controlar " +"um elemento de rede (router, switch, etc.) ou ao redireccionar tráfego para " +"um servidor impostor (através de ataques de fraude de arp ou DNS)." + +#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#: apt-secure.8.xml:122 +msgid "" +"<literal>Mirror network compromise</literal>. Without signature checking, a " +"malicious agent can compromise a mirror host and modify the files in it to " +"propagate malicious software to all users downloading packages from that " +"host." +msgstr "" +"<literal>Mirror network compromise</literal>. Sem verificação de assinatura, " +"um agente malicioso pode comprometer uma máquina mirror e modificar os " +"ficheiros dele para propagar software malicioso a todos os utilizadores que " +"descarregam pacotes a partir dessa máquina." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:129 +msgid "" +"However, it does not defend against a compromise of the Debian master server " +"itself (which signs the packages) or against a compromise of the key used to " +"sign the Release files. In any case, this mechanism can complement a per-" +"package signature." +msgstr "" +"No entanto, isto não defende contra um compromisso do próprio servidor " +"mestre da Debian (o qual assina os pacotes) ou contra um compromisso da " +"chave usada para assinar os ficheiros Release. Em qualquer caso, este " +"mecanismo pode complementar uma assinatura por-pacote." + +#. type: Content of: <refentry><refsect1><title> +#: apt-secure.8.xml:135 +msgid "User configuration" +msgstr "Configuração do utilizador" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:137 +msgid "" +"<command>apt-key</command> is the program that manages the list of keys used " +"by apt. It can be used to add or remove keys although an installation of " +"this release will automatically provide the default Debian archive signing " +"keys used in the Debian package repositories." +msgstr "" +"<command>apt-key</command> é o programa que gere a lista de chaves usada " +"pelo apt. Pode ser usado para adicionar ou remover chaves apesar de uma " +"instalação deste lançamento ir automaticamente disponibilizar as chaves de " +"assinaturas predefinidas de arquivo Debian usadas nos repositórios de " +"pacotes Debian." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:144 +msgid "" +"In order to add a new key you need to first download it (you should make " +"sure you are using a trusted communication channel when retrieving it), add " +"it with <command>apt-key</command> and then run <command>apt-get update</" +"command> so that apt can download and verify the <filename>Release.gpg</" +"filename> files from the archives you have configured." +msgstr "" +"De modo a adicionar uma chave nova você precisa primeiro de descarregá-la " +"(você deve certificar-se que está a usar um canal de comunicação de " +"confiança quando a obtém), adicioná-la com <command>apt-key</command> e " +"depois correr <command>apt-get update</command> para que o apt possa " +"descarregar e verificar os ficheiros <filename>Release.gpg</filename> dos " +"arquivos que você configurou." + +#. type: Content of: <refentry><refsect1><title> +#: apt-secure.8.xml:153 +msgid "Archive configuration" +msgstr "Configuração de arquivos" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:155 +msgid "" +"If you want to provide archive signatures in an archive under your " +"maintenance you have to:" +msgstr "" +"Se você deseja fornecer assinaturas de arquivo a um arquivo sob sua " +"manutenção, você tem que:" + +#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#: apt-secure.8.xml:160 +msgid "" +"<emphasis>Create a toplevel Release file</emphasis>, if it does not exist " +"already. You can do this by running <command>apt-ftparchive release</" +"command> (provided in apt-utils)." +msgstr "" +"<emphasis>Criar um ficheiro Release de nível de topo</emphasis>, se este já " +"não existir. Você pode fazer isto ao correr <command>apt-ftparchive release</" +"command> (disponibilizado no apt-utils)." + +#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#: apt-secure.8.xml:165 +msgid "" +"<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -abs -" +"o Release.gpg Release</command>." +msgstr "" +"<emphasis>Assiná-lo</emphasis>. Você pode fazer isso ao correr <command>gpg -" +"abs -o Release.gpg Release</command>." + +#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#: apt-secure.8.xml:168 +msgid "" +"<emphasis>Publish the key fingerprint</emphasis>, that way your users will " +"know what key they need to import in order to authenticate the files in the " +"archive." +msgstr "" +"<emphasis>Publicar a impressão digital da chave</emphasis>, deste modo os " +"seus utilizadores irão saber que chave precisam de importar de modo a " +"autenticar os ficheiros no arquivo." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:175 +msgid "" +"Whenever the contents of the archive changes (new packages are added or " +"removed) the archive maintainer has to follow the first two steps previously " +"outlined." +msgstr "" +"Sempre que o conteúdo do arquivo mude (são adicionados novos pacotes ou " +"removidos), o responsável do arquivo tem que seguir os primeiros dois passos " +"previamente delineados." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:183 +msgid "" +"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, " +"&debsign; &debsig-verify;, &gpg;" +msgstr "" +"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, " +"&debsign; &debsig-verify;, &gpg;" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:187 +msgid "" +"For more background information you might want to review the <ulink url=" +"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html" +"\">Debian Security Infrastructure</ulink> chapter of the Securing Debian " +"Manual (available also in the harden-doc package) and the <ulink url=" +"\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong " +"Distribution HOWTO</ulink> by V. Alex Brennen." +msgstr "" +"Para mais informação de fundo você deve querer reler a <ulink url=\"http://" +"www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html" +"\">Infraestrutura de Segurança da Debian</ulink> no capítulo do Manual " +"Debian de Segurança (disponível também no pacote harden-doc) e o <ulink url=" +"\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong " +"Distribution HOWTO</ulink> de V. Alex Brennen." + +#. type: Content of: <refentry><refsect1><title> +#: apt-secure.8.xml:200 +msgid "Manpage Authors" +msgstr "Autores do manual" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:202 +msgid "" +"This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac " +"Jones, Colin Walters, Florian Weimer and Michael Vogt." +msgstr "" +"Este manual é baseado no trabalho de Javier Fernández-Sanguino Peña, Isaac " +"Jones, Colin Walters, Florian Weimer e Michael Vogt." + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-sortpkgs.1.xml:22 apt-sortpkgs.1.xml:29 +msgid "apt-sortpkgs" +msgstr "apt-sortpkgs" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-sortpkgs.1.xml:30 +msgid "Utility to sort package index files" +msgstr "Utilitário para organizar ficheiros índice de pacotes" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-sortpkgs.1.xml:36 +msgid "" +"<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> " +"<arg><option>-o=<replaceable>config string</replaceable></option></arg> " +"<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg choice=" +"\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>" +msgstr "" +"<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> " +"<arg><option>-o=<replaceable>string de configuração</replaceable></option></" +"arg> <arg><option>-c=<replaceable>ficheiro</replaceable></option></arg> <arg " +"choice=\"plain\" rep=\"repeat\"><replaceable>ficheiro</replaceable></arg>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-sortpkgs.1.xml:45 +msgid "" +"<command>apt-sortpkgs</command> will take an index file (Source index or " +"Package index) and sort the records so that they are ordered by the package " +"name. It will also sort the internal fields of each record according to the " +"internal sorting rules." +msgstr "" +"<command>apt-sortpkgs</command> irá pegar num ficheiro índice (índice de " +"fontes ou índice de pacotes) e organizar os registos para que fiquem " +"ordenados pelo nome do pacote. Também organiza os campos internos de cada " +"registo de acordo com as regras de organização internas." + +#. type: Content of: <refentry><refsect1><para> +#: apt-sortpkgs.1.xml:51 +msgid "All output is sent to stdout, the input must be a seekable file." +msgstr "" +"Todas as saídas são enviadas para o stdout, a entrada tem de ser um ficheiro " +"pesquisável." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-sortpkgs.1.xml:58 +msgid "<option>--source</option>" +msgstr "<option>--source</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-sortpkgs.1.xml:60 +msgid "" +"Use Source index field ordering. Configuration Item: <literal>APT::" +"SortPkgs::Source</literal>." +msgstr "" +"Usa ordenação de campo de índice Source. Item de Configuração: <literal>APT::" +"SortPkgs::Source</literal>." + +#. type: Content of: <refentry><refsect1><para> +#: apt-sortpkgs.1.xml:74 +msgid "" +"<command>apt-sortpkgs</command> returns zero on normal operation, decimal " +"100 on error." +msgstr "" +"<command>apt-sortpkgs</command> devolve zero na operação normal, 100 decimal " +"em erro." + +#. The last update date +#. type: Content of: <refentry><refentryinfo> +#: apt.conf.5.xml:13 +msgid "" +"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" +"firstname> <surname>Burrows</surname> <contrib>Initial documentation of " +"Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; " +"&apt-product; <date>16 January 2010</date>" +msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" +"firstname> <surname>Burrows</surname> <contrib>Documentação inicial do " +"Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; " +"&apt-product; <date>16 Janeiro 2010</date>" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt.conf.5.xml:28 apt.conf.5.xml:35 +msgid "apt.conf" +msgstr "apt.conf" + +#. type: Content of: <refentry><refmeta><manvolnum> +#: apt.conf.5.xml:29 apt_preferences.5.xml:22 sources.list.5.xml:23 +msgid "5" +msgstr "5" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt.conf.5.xml:36 +msgid "Configuration file for APT" +msgstr "Ficheiro de configuração para o APT" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:40 +msgid "" +"<filename>apt.conf</filename> is the main configuration file for the APT " +"suite of tools, but by far not the only place changes to options can be " +"made. All tools therefore share the configuration files and also use a " +"common command line parser to provide a uniform environment." +msgstr "" +"<filename>apt.conf</filename> é o ficheiro de configuração principal para a " +"suite de ferramentas do APT, as não é o único lugar onde se podem fazer " +"alterações às opções. Então todas as ferramentas partilham os ficheiros de " +"configuração e também usam um analisador de linha de comandos comum para " +"disponibilizar um ambiente uniforme." + +#. type: Content of: <refentry><refsect1><orderedlist><para> +#: apt.conf.5.xml:45 +msgid "" +"When an APT tool starts up it will read the configuration files in the " +"following order:" +msgstr "" +"Quando a ferramenta APT arranca irá ler os ficheiros de configuração pela " +"seguinte ordem:" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:47 +msgid "" +"the file specified by the <envar>APT_CONFIG</envar> environment variable (if " +"any)" +msgstr "" +"o ficheiro especificado pela variável de ambiente <envar>APT_CONFIG</envar> " +"(se existir)" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:49 +msgid "" +"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending " +"order which have no or \"<literal>conf</literal>\" as filename extension and " +"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) " +"characters - otherwise they will be silently ignored." +msgstr "" +"todos os ficheiros em <literal>Dir::Etc::Parts</literal> em ordem ascendente " +"alfanumérica sem extensão ou com \"<literal>conf</literal>\" como extensão " +"do nome de ficheiro e que apenas contêm caracteres alfanuméricos, traço (-), " +"underscore (_) e ponto (.) - caso contrário serão ignorados em silêncio." + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:54 +msgid "" +"the main configuration file specified by <literal>Dir::Etc::main</literal>" +msgstr "" +"o ficheiro de configuração principal especificado por <literal>Dir::Etc::" +"main</literal>" + +#. type: Content of: <refentry><refsect1><orderedlist><listitem><para> +#: apt.conf.5.xml:56 +msgid "" +"the command line options are applied to override the configuration " +"directives or to load even more configuration files." +msgstr "" +"as opções de linha de comandos são aplicadas para sobrepor as directivas de " +"configuração ou para carregar mais ficheiros de configuração." + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:60 +msgid "Syntax" +msgstr "Sintaxe" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:61 +msgid "" +"The configuration file is organized in a tree with options organized into " +"functional groups. Option specification is given with a double colon " +"notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option " +"within the APT tool group, for the Get tool. Options do not inherit from " +"their parent groups." +msgstr "" +"O ficheiro de configuração é organizado numa árvore com as opções " +"organizadas em grupos de funcionamento. A especificação das opções é dada " +"com um sinal de dois pontos duplo , por exemplo <literal>APT::Get::Assume-" +"Yes</literal> é uma opção dentro do grupo de ferramentas do APT, para a " +"ferramenta Get. A opções não herdam dos seus grupos parentes." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:67 +msgid "" +"Syntactically the configuration language is modeled after what the ISC tools " +"such as bind and dhcp use. Lines starting with <literal>//</literal> are " +"treated as comments (ignored), as well as all text between <literal>/*</" +"literal> and <literal>*/</literal>, just like C/C++ comments. Each line is " +"of the form <literal>APT::Get::Assume-Yes \"true\";</literal>. The trailing " +"semicolon and the quotes are required. The value must be on one line, and " +"there is no kind of string concatenation. It must not include inside " +"quotes. The behavior of the backslash \"\\\" and escaped characters inside " +"a value is undefined and it should not be used. An option name may include " +"alphanumerical characters and the \"/-:._+\" characters. A new scope can be " +"opened with curly braces, like:" +msgstr "" +"Sintacticamente a linguagem de configuração é modelada após o que as " +"ferramentas ISC usam, como o bind e o dhcp. As linhas que começam com " +"<literal>//</literal> são tratadas como comentários (ignoradas), assim como " +"todo o texto entre <literal>/*</literal> e <literal>*/</literal>, tal como " +"os comentários de C/C++. Cada linha é do formato <literal>APT::Get::Assume-" +"Yes \"true\";</literal>. O ponto e vírgula à direita e as aspas são " +"necessárias. O valor deve estar numa linha, e não há nenhum tipo de " +"concatenação de string. Não pode incluir aspas interiores. O comportamento " +"da backslash \"\\\" e caracteres de escape dentro de um valor é indefinido e " +"não deve ser usado. Um nome de opção pode incluir caracteres alfanuméricos e " +"os caracteres \"/-:._+\". Um novo scope pode ser aberto com chavetas, como:" + +#. type: Content of: <refentry><refsect1><informalexample><programlisting> +#: apt.conf.5.xml:81 +#, no-wrap +msgid "" +"APT {\n" +" Get {\n" +" Assume-Yes \"true\";\n" +" Fix-Broken \"true\";\n" +" };\n" +"};\n" +msgstr "" +"APT {\n" +" Get {\n" +" Assume-Yes \"true\";\n" +" Fix-Broken \"true\";\n" +" };\n" +"};\n" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:89 +msgid "" +"with newlines placed to make it more readable. Lists can be created by " +"opening a scope and including a single string enclosed in quotes followed by " +"a semicolon. Multiple entries can be included, each separated by a semicolon." +msgstr "" +"com novas linhas colocadas para o tornar mais legível. As listas podem ser " +"criadas ao abrir um scope e incluindo uma string única entre aspas seguida " +"por um ponto e vírgula. Podem ser incluídas múltiplas entradas, cada uma " +"separada por um ponto e vírgula (;)." + +#. type: Content of: <refentry><refsect1><informalexample><programlisting> +#: apt.conf.5.xml:94 +#, no-wrap +msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" +msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:97 +msgid "" +"In general the sample configuration file in <filename>&docdir;examples/apt." +"conf</filename> &configureindex; is a good guide for how it should look." +msgstr "" +"Em geral o exemplo de ficheiro de configuração em <filename>&docdir;examples/" +"apt.conf</filename> &configureindex; é um bom guia de como deve ficar." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:101 +msgid "" +"The names of the configuration items are not case-sensitive. So in the " +"previous example you could use <literal>dpkg::pre-install-pkgs</literal>." +msgstr "" +"Os nomes dos items de configuração não são sensíveis a maiúsculas/" +"minúsculas. Portanto no exemplo prévio você poderia usar <literal>dpkg::pre-" +"install-pkgs</literal>." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:104 +msgid "" +"Names for the configuration items are optional if a list is defined as it " +"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. " +"If you don't specify a name a new entry will simply add a new option to the " +"list. If you specify a name you can override the option as every other " +"option by reassigning a new value to the option." +msgstr "" +"Os nomes dos items de configuração são opcionais se uma lista for definida " +"com pode ser vista no exemplo <literal>DPkg::Pre-Install-Pkgs</literal> " +"acima. Se você não especificar um nome, uma nova entrada irá simplesmente " +"adicionar uma nova opção à lista. Se você especificar um nome, você pode " +"sobrepor a opção como qualquer outra opção ao re-atribuir um novo valor à " +"opção." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:109 +msgid "" +"Two specials are allowed, <literal>#include</literal> (which is deprecated " +"and not supported by alternative implementations) and <literal>#clear</" +"literal>: <literal>#include</literal> will include the given file, unless " +"the filename ends in a slash, then the whole directory is included. " +"<literal>#clear</literal> is used to erase a part of the configuration tree. " +"The specified element and all its descendants are erased. (Note that these " +"lines also need to end with a semicolon.)" +msgstr "" +"São permitidas duas especiais, <literal>#include</literal> (a qual está " +"obsoleta e não é suportada por implementações alternativas) e " +"<literal>#clear</literal>: <literal>#include</literal> irá incluir o " +"ficheiro fornecido, a menos que o nome do ficheiro termine numa barra (/), " +"então todo o directório é incluído. <literal>#clear</literal> é usado para " +"apagar uma parte da árvore de configuração. O elemento especificado e os " +"seus descendentes são apagados. (Note que estas linhas também precisam de " +"acabar com um 'ponto e vírgula' (;) .)" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:117 +msgid "" +"The #clear command is the only way to delete a list or a complete scope. " +"Reopening a scope or the ::-style described below will <emphasis>not</" +"emphasis> override previously written entries. Only options can be " +"overridden by addressing a new value to it - lists and scopes can't be " +"overridden, only cleared." +msgstr "" +"O comando #clear é a única maneira de apagar uma lista ou um scope completo. " +"Reabrindo um scope ou o ::-style descrito abaixo <emphasis>não</emphasis> " +"irá sobrepor entradas escritas anteriormente. Apenas as opções podem ser " +"sobrepostas ao atribuir um novo valor a elas - listas e scopes não podem ser " +"sobrepostos, apenas limpos." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:122 +msgid "" +"All of the APT tools take a -o option which allows an arbitrary " +"configuration directive to be specified on the command line. The syntax is a " +"full option name (<literal>APT::Get::Assume-Yes</literal> for instance) " +"followed by an equals sign then the new value of the option. Lists can be " +"appended too by adding a trailing :: to the list name. (As you might " +"suspect: The scope syntax can't be used on the command line.)" +msgstr "" +"Todas as ferramentas do APT recebem uma opção -o que permite uma directiva " +"de configuração arbitrária para ser especificada na linha de comandos. A " +"sintaxe é um nome de opção completo (<literal>APT::Get::Assume-Yes</literal> " +"por exemplo) seguido por um igual (=) e depois o valor da opção. Também pode " +"ser acrescentadas listas ao adicionar um duplo dois-pontos (::) à direita " +"para o nome da lista. (Como deve suspeitar: A sintaxe de scope não pode ser " +"usada na linha de comandos.)" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:129 +msgid "" +"Note that you can use :: only for appending one item per line to a list and " +"that you should not use it in combination with the scope syntax. (The scope " +"syntax implicit insert ::) Using both syntaxes together will trigger a bug " +"which some users unfortunately relay on: An option with the unusual name " +"\"<literal>::</literal>\" which acts like every other option with a name. " +"These introduces many problems including that a user who writes multiple " +"lines in this <emphasis>wrong</emphasis> syntax in the hope to append to a " +"list will gain the opposite as only the last assignment for this option " +"\"<literal>::</literal>\" will be used. Upcoming APT versions will raise " +"errors and will stop working if they encounter this misuse, so please " +"correct such statements now as long as APT doesn't complain explicit about " +"them." +msgstr "" +"Note que você apenas pode usar :: para acrescentar um item por linha a uma " +"lista e não o deve usar em combinação com a sintaxe scope. (A sintaxe scope " +"implicitamente insere ::). Usar ambas as sintaxes juntamente irá disparar um " +"bug que infelizmente alguns utilizadores nos transmitem: Uma opção com o " +"nome não usual \"<literal>::</literal>\" a qual actua como qualquer outra " +"opção com um nome. Isto introduz muitos problemas incluindo que, um " +"utilizador que escreve múltiplas linhas nesta sintaxe <emphasis>errada</" +"emphasis> na esperança de acrescentar a uma lista, irá ganhar o oposto " +"porque apenas a última atribuição para esta opção \"<literal>::</literal>\" " +"será a usada. Futuras versões do APT irá levantar erros e parar de funcionar " +"se encontrarem esta má utilização, portanto por favor corrija tais " +"declarações agora enquanto o APT não se queixa explicitamente acerca delas." + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:141 +msgid "The APT Group" +msgstr "O Grupo APT" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:142 +msgid "" +"This group of options controls general APT behavior as well as holding the " +"options for all of the tools." +msgstr "" +"Este grupo de opções controla o comportamento geral do APT assim como mantém " +"as opções para todas as ferramentas." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:146 +msgid "Architecture" +msgstr "Architecture" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:147 +msgid "" +"System Architecture; sets the architecture to use when fetching files and " +"parsing package lists. The internal default is the architecture apt was " +"compiled for." +msgstr "" +"System Architecture; define a arquitectura a usar quando procura ficheiros e " +"analisa listas de pacotes. A predefinição interna é a arquitectura para a " +"qual o APT foi compilado." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:152 +msgid "Default-Release" +msgstr "Default-Release" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:153 +msgid "" +"Default release to install packages from if more than one version available. " +"Contains release name, codename or release version. Examples: 'stable', " +"'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'. See also &apt-" +"preferences;." +msgstr "" +"Lançamento predefinido de onde instalar pacotes se existir mais de uma " +"versão disponível. Contém o nome do lançamento, nome de código ou versão de " +"lançamento. Exemplos: 'stable', 'testing', 'unstable', 'lenny', 'squeeze', " +"'4.0', '5.0*'. Veja também &apt-preferences;." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:157 +msgid "Ignore-Hold" +msgstr "Ignore-Hold" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:158 +msgid "" +"Ignore Held packages; This global option causes the problem resolver to " +"ignore held packages in its decision making." +msgstr "" +"Ignore Held packages; Esta opção global faz com que ao resolver problemas, " +"os pacotes segurados sejam ignorados na sua decisão de marcação." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:162 +msgid "Clean-Installed" +msgstr "Clean-Installed" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:163 +msgid "" +"Defaults to on. When turned on the autoclean feature will remove any " +"packages which can no longer be downloaded from the cache. If turned off " +"then packages that are locally installed are also excluded from cleaning - " +"but note that APT provides no direct means to reinstall them." +msgstr "" +"A predefinição é ligada. Quando ligada, a funcionalidade autoclean irá " +"remover quaisquer pacotes que já não possam ser descarregados a partir da " +"cache. Se desligada, então os pacotes que estão instalados localmente são " +"também excluídos da limpeza - mas note que o APT não disponibiliza um meio " +"directo de os reinstalar." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:169 +msgid "Immediate-Configure" +msgstr "Immediate-Configure" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:170 +msgid "" +"Defaults to on which will cause APT to install essential and important " +"packages as fast as possible in the install/upgrade operation. This is done " +"to limit the effect of a failing &dpkg; call: If this option is disabled APT " +"does treat an important package in the same way as an extra package: Between " +"the unpacking of the important package A and his configuration can then be " +"many other unpack or configuration calls, e.g. for package B which has no " +"relation to A, but causes the dpkg call to fail (e.g. because maintainer " +"script of package B generates an error) which results in a system state in " +"which package A is unpacked but unconfigured - each package depending on A " +"is now no longer guaranteed to work as their dependency on A is not longer " +"satisfied. The immediate configuration marker is also applied to all " +"dependencies which can generate a problem if the dependencies e.g. form a " +"circle as a dependency with the immediate flag is comparable with a Pre-" +"Dependency. So in theory it is possible that APT encounters a situation in " +"which it is unable to perform immediate configuration, errors out and refers " +"to this option so the user can deactivate the immediate configuration " +"temporarily to be able to perform an install/upgrade again. Note the use of " +"the word \"theory\" here as this problem was only encountered by now in real " +"world a few times in non-stable distribution versions and was caused by " +"wrong dependencies of the package in question or by a system in an already " +"broken state, so you should not blindly disable this option as the mentioned " +"scenario above is not the only problem immediate configuration can help to " +"prevent in the first place. Before a big operation like <literal>dist-" +"upgrade</literal> is run with this option disabled it should be tried to " +"explicitly <literal>install</literal> the package APT is unable to configure " +"immediately, but please make sure to report your problem also to your " +"distribution and to the APT team with the buglink below so they can work on " +"improving or correcting the upgrade process." +msgstr "" +"A predefinição é ligado o que irá fazer com que o APT instale pacotes " +"essenciais e importantes o mais rápido possível na operação de instalar/" +"actualizar. Isto é feito para limitar o efeito de uma chamada falhada do " +"&dpkg;. Se esta opção for desactivada, o APT trata um pacote importante do " +"mesmo modo que um pacote extra: Entre o desempacotamento do pacote " +"importante A e a sua configuração podem acontecer muitas outras chamadas de " +"desempacotamento e configuração, exemplo, para o pacote B que não tem " +"nenhuma relação com A, mas causa uma falha na chamada ao dpkg (ex, porque o " +"script do responsável do pacote B gera um erro) o qual resulta num estado do " +"sistema em que o pacote A está desempacotado mas ainda não configurado - já " +"não se garante o funcionamento de cada pacote que depende de A porque a sua " +"dependência já não está satisfeita. O marcador de configuração imediata é " +"também aplicado a todas as dependências que possam gerar um problema se as " +"dependências, ex, formam um círculo como uma dependência com a marca de " +"imediato a ser comparável com uma Pré-Dependência. Portanto, em teoria, é " +"possível que o APT encontre uma situação na qual é incapaz de executar " +"configuração imediata, entre em erro e refira esta opção para que o " +"utilizador possa desactivar temporariamente a configuração imediata para ser " +"capaz de executar uma instalação/actualização outra vez. Note o uso da " +"palavra \"teoria\" aqui pois este problema foi poucas vezes encontrado até " +"agora no mundo real em versões de distribuição não-estáveis e causados por " +"dependências erradas do pacote em questão ou por um sistema já num estado " +"corrompido, portanto você não deve desactivar esta opção às cegas porque, em " +"primeiro lugar, o cenário mencionado acima não é o único problema que a " +"configuração imediata pode ajudar a prevenir. Antes de uma grande operação " +"como <literal>dist-upgrade</literal> ser corrida com esta opção desactivada, " +"deve ser tentado primeiro fazer um <literal>install</literal> explicito ao " +"pacote que o APT é incapaz de configurar imediatamente, mas por favor " +"certifique-se de também relatar o seu problema à sua distribuição e à equipa " +"do APT com o link de bug abaixo para que possam trabalhar na melhoria ou " +"correcção do processo de actualização." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:192 +msgid "Force-LoopBreak" +msgstr "Force-LoopBreak" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:193 +msgid "" +"Never Enable this option unless you -really- know what you are doing. It " +"permits APT to temporarily remove an essential package to break a Conflicts/" +"Conflicts or Conflicts/Pre-Depend loop between two essential packages. SUCH " +"A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option will work if the " +"essential packages are not tar, gzip, libc, dpkg, bash or anything that " +"those packages depend on." +msgstr "" +"Nunca Active esta opção a menos que saiba -realmente- o que está a fazer. " +"Permite ao APT remover temporariamente um pacote essencial para interromper " +"um ciclo vicioso de Conflitos/Conflitos ou Conflitos/Pré-Dependência entre " +"dois pacotes essenciais. TAL CICLO VICIOSO NÃO DEVERÁ NUNCA EXISTIR E É UM " +"GRAVE BUG. Esta opção deverá funcionar se os pacotes essenciais não forem " +"tar, gzip, libc, dpkg, bash ou qualquer coisa de que estes dependem." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:201 +msgid "Cache-Limit" +msgstr "Cache-Limit" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:202 +msgid "" +"APT uses a fixed size memory mapped cache file to store the 'available' " +"information. This sets the size of that cache (in bytes)." +msgstr "" +"O APT usa um ficheiro de cache de memória mapeada de tamanho fixo para " +"armazenar a informação 'disponível'. Isto define o tamanho dessa cache (em " +"bytes)." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:206 +msgid "Build-Essential" +msgstr "Build-Essential" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:207 +msgid "Defines which package(s) are considered essential build dependencies." +msgstr "" +"Define quais pacote(s) são considerados dependências essenciais de " +"compilação." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:210 +msgid "Get" +msgstr "Get" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:211 +msgid "" +"The Get subsection controls the &apt-get; tool, please see its documentation " +"for more information about the options here." +msgstr "" +"A subsecção Get controla a ferramenta &apt-get;, por favor veja a sua " +"documentação para mais informação acerca das opções daqui." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:215 +msgid "Cache" +msgstr "Cache" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:216 +msgid "" +"The Cache subsection controls the &apt-cache; tool, please see its " +"documentation for more information about the options here." +msgstr "" +"A subsecção Cache controla a ferramenta &apt-cache;, por favor veja a sua " +"documentação para mais informação acerca das opções daqui." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:220 +msgid "CDROM" +msgstr "CDROM" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:221 +msgid "" +"The CDROM subsection controls the &apt-cdrom; tool, please see its " +"documentation for more information about the options here." +msgstr "" +"A subsecção CDROM controla a ferramenta &apt-cdrom;, por favor veja a sua " +"documentação para mais informação acerca das opções de aqui." + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:227 +msgid "The Acquire Group" +msgstr "O Grupo Acquire" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:232 +msgid "PDiffs" +msgstr "PDiffs" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:233 +msgid "" +"Try to download deltas called <literal>PDiffs</literal> for Packages or " +"Sources files instead of downloading whole ones. True by default." +msgstr "" +"Tenta descarregar deltas chamados <literal>PDiffs</literal> para Pacotes ou " +"ficheiros Fonte em vez de os descarregar por inteiro. Verdadeiro por " +"predefinição." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:236 +msgid "" +"Two sub-options to limit the use of PDiffs are also available: With " +"<literal>FileLimit</literal> can be specified how many PDiff files are " +"downloaded at most to patch a file. <literal>SizeLimit</literal> on the " +"other hand is the maximum precentage of the size of all patches compared to " +"the size of the targeted file. If one of these limits is exceeded the " +"complete file is downloaded instead of the patches." +msgstr "" +"Estão também disponíveis duas sub-opções para limitar o uso de PDiffs: Com " +"<literal>FileLimit</literal> pode ser especificado quantos ficheiros PDiff " +"são descarregados no máximo para aplicar um patch a um ficheiro. Por outro " +"lado <literal>SizeLimit</literal> é a percentagem máxima do tamanho de todas " +"as patches comparadas com o tamanho do ficheiro de destino. Se um destes " +"limites for excedido, é descarregado o ficheiro completo em vez das patches." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:245 +msgid "Queue-Mode" +msgstr "Queue-Mode" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:246 +msgid "" +"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" +"literal> or <literal>access</literal> which determines how APT parallelizes " +"outgoing connections. <literal>host</literal> means that one connection per " +"target host will be opened, <literal>access</literal> means that one " +"connection per URI type will be opened." +msgstr "" +"Modo de fila; <literal>Queue-Mode</literal> pode ser um de <literal>host</" +"literal> ou <literal>access</literal> que determina como o APT paraleliza " +"ligações de saída. <literal>host</literal> significa que será aberta uma " +"ligação por máquina destino, <literal>access</literal> significa que será " +"aberta uma ligação por tipo de URI." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:253 +msgid "Retries" +msgstr "Retries" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:254 +msgid "" +"Number of retries to perform. If this is non-zero APT will retry failed " +"files the given number of times." +msgstr "" +"Número de tentativas a executar. Se isto for diferente de zero o APT irá " +"tentar, no número fornecido de vezes, obter ficheiros falhados." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:258 +msgid "Source-Symlinks" +msgstr "Source-Symlinks" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:259 +msgid "" +"Use symlinks for source archives. If set to true then source archives will " +"be symlinked when possible instead of copying. True is the default." +msgstr "" +"Usa links simbólicos para arquivos fonte. Se definido para verdadeiro, então " +"os arquivos fonte serão links simbólicos, quando possível, em vez de cópias. " +"A predefinição é verdadeiro." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:263 sources.list.5.xml:139 +msgid "http" +msgstr "http" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:264 +msgid "" +"HTTP URIs; http::Proxy is the default http proxy to use. It is in the " +"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " +"host proxies can also be specified by using the form <literal>http::Proxy::" +"<host></literal> with the special keyword <literal>DIRECT</literal> " +"meaning to use no proxies. If no one of the above settings is specified, " +"<envar>http_proxy</envar> environment variable will be used." +msgstr "" +"HTTP URIs; http::Proxy é o proxy http predefinido a usar. Está no formato " +"standard de <literal>http://[[user][:pass]@]host[:port]/</literal>. Também " +"pode ser especificados proxies por máquina ao usar o formato <literal>http::" +"Proxy::<host></literal> com a palavra chave especial <literal>DIRECT</" +"literal> que significa não usar proxies. Se nenhuma das definições acima for " +"especificada, será usada a variável de ambiente <envar>http_proxy</envar>." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:272 +msgid "" +"Three settings are provided for cache control with HTTP/1.1 compliant proxy " +"caches. <literal>No-Cache</literal> tells the proxy to not use its cached " +"response under any circumstances, <literal>Max-Age</literal> is sent only " +"for index files and tells the cache to refresh its object if it is older " +"than the given number of seconds. Debian updates its index files daily so " +"the default is 1 day. <literal>No-Store</literal> specifies that the cache " +"should never store this request, it is only set for archive files. This may " +"be useful to prevent polluting a proxy cache with very large .deb files. " +"Note: Squid 2.0.2 does not support any of these options." +msgstr "" +"São disponibilizadas três definições para controle de cache como caches de " +"proxy compatíveis com HTTP/1.1. <literal>No-Cache</literal> diz ao proxy " +"para não usar a sua resposta em cache sob nenhumas circunstâncias, " +"<literal>Max-Age</literal> é enviado apenas para ficheiros de índice e diz à " +"cache para refrescar o seu objecto se for mais antigo que o número de " +"segundos fornecido. Debian actualiza os seus ficheiros índice diariamente, " +"portanto a predefinição é 1 dia. <literal>No-Store</literal> especifica que " +"a cache nunca deverá armazenar este requisito, é apenas definido para " +"ficheiros de arquivo. Isto pode ser útil para prevenir a poluição de uma " +"cache proxy com ficheiros .deb muito grandes. Nota: o Squid 2.0.2 não " +"suporta nenhuma destas opções." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:282 apt.conf.5.xml:346 +msgid "" +"The option <literal>timeout</literal> sets the timeout timer used by the " +"method, this applies to all things including connection timeout and data " +"timeout." +msgstr "" +"A opção <literal>timeout</literal> define o tempo limite usado por este " +"método, isto aplica-se a todas as coisas incluindo tempos limite de ligação " +"e tempos limite de dados." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:285 +msgid "" +"One setting is provided to control the pipeline depth in cases where the " +"remote server is not RFC conforming or buggy (such as Squid 2.0.2). " +"<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 " +"indicating how many outstanding requests APT should send. A value of zero " +"MUST be specified if the remote host does not properly linger on TCP " +"connections - otherwise data corruption will occur. Hosts which require this " +"are in violation of RFC 2068." +msgstr "" +"É disponibilizada uma definição para controlar a profundidade do pipeline em " +"casos onde o servidor remoto não é compatível com RFC ou é buggy (como o " +"Squid 2.0.2). <literal>Acquire::http::Pipeline-Depth</literal> pode ser um " +"valor de 0 a 5 que indica quantos requerimentos pendentes o APT deve enviar. " +"TEM de ser especificado um valor de 0 se a máquina remota não hesitar " +"propriamente em ligações TCP - de outro modo irá ocorrer corrupção de dados. " +"As máquinas que requerem isto estão em violação de RFC 2068." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:293 +msgid "" +"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" +"literal> which accepts integer values in kilobyte. The default value is 0 " +"which deactivates the limit and tries uses as much as possible of the " +"bandwidth (Note that this option implicit deactivates the download from " +"multiple servers at the same time.)" +msgstr "" +"A largura de banda usada pode ser limitada com <literal>Acquire::http::Dl-" +"Limit</literal> que aceita valores inteiros em kilobytes. O valor " +"predefinido é 0 que desactiva o limite e tenta usar o máximo possível da " +"largura de banda (Note que esta opção implícita desactiva a descarga de " +"múltiplos servidores ao mesmo tempo.)" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:298 +msgid "" +"<literal>Acquire::http::User-Agent</literal> can be used to set a different " +"User-Agent for the http download method as some proxies allow access for " +"clients only if the client uses a known identifier." +msgstr "" +"<literal>Acquire::http::User-Agent</literal> pode ser usado para definir um " +"Utilizador-Agente diferente para o método de download por http, porque " +"alguns proxies apenas permitem acesso a clientes se o cliente usar um " +"identificador conhecido." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:304 +msgid "https" +msgstr "https" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:305 +msgid "" +"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " +"options are the same as for <literal>http</literal> method and will also " +"default to the options from the <literal>http</literal> method if they are " +"not explicitly set for https. <literal>Pipeline-Depth</literal> option is " +"not supported yet." +msgstr "" +"HTTPS URIs. as opções Cache-control, Timeout, AllowRedirect, Dl-Limit e " +"proxy são as mesmas para o método <literal>http</literal> e irá também usar " +"as opções predefinidas do método <literal>http</literal> se não forem " +"explicitamente definidas para https. A opção <literal>Pipeline-Depth</" +"literal> ainda não é suportada." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:311 +msgid "" +"<literal>CaInfo</literal> suboption specifies place of file that holds info " +"about trusted certificates. <literal><host>::CaInfo</literal> is " +"corresponding per-host option. <literal>Verify-Peer</literal> boolean " +"suboption determines whether verify server's host certificate against " +"trusted certificates or not. <literal><host>::Verify-Peer</literal> " +"is corresponding per-host option. <literal>Verify-Host</literal> boolean " +"suboption determines whether verify server's hostname or not. <literal><" +"host>::Verify-Host</literal> is corresponding per-host option. " +"<literal>SslCert</literal> determines what certificate to use for client " +"authentication. <literal><host>::SslCert</literal> is corresponding " +"per-host option. <literal>SslKey</literal> determines what private key to " +"use for client authentication. <literal><host>::SslKey</literal> is " +"corresponding per-host option. <literal>SslForceVersion</literal> overrides " +"default SSL version to use. Can contain 'TLSv1' or 'SSLv3' string. " +"<literal><host>::SslForceVersion</literal> is corresponding per-host " +"option." +msgstr "" +"A sub-opção <literal>CaInfo</literal> especifica o lugar do ficheiro que " +"contém informação acerca de certificados de confiança. <literal><" +"host>::CaInfo</literal> é a opção por máquina correspondente. A sub-opção " +"booleana <literal>Verify-Peer</literal> determina se o certificado da " +"máquina servidora é um certificado de confiança ou não. <literal><" +"host>::Verify-Peer</literal> é a opção por máquina correspondente. A sub-" +"opção <literal>Verify-Host</literal> determina se o nome da máquina " +"servidora é verificado ou não. <literal><host>::Verify-Host</literal> " +"é a opção por máquina correspondente. <literal>SslCert</literal> determina " +"qual certificado a usar para autenticação de clientes <literal><host>::" +"SslCert</literal> é a opção por máquina correspondente. <literal>SslKey</" +"literal> determina qual chave privada a usar para autenticação de clientes. " +"<literal><host>::SslKey</literal> é a opção por máquina " +"correspondente. <literal>SslForceVersion</literal> sobrepõe a versão SSL " +"predefinida a usar. Pode conter strings 'TLSv1' ou 'SSLv3'. <literal><" +"host>::SslForceVersion</literal> é a opção po máquina correspondente." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:329 sources.list.5.xml:150 +msgid "ftp" +msgstr "ftp" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:330 +msgid "" +"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " +"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " +"proxies can also be specified by using the form <literal>ftp::Proxy::<" +"host></literal> with the special keyword <literal>DIRECT</literal> " +"meaning to use no proxies. If no one of the above settings is specified, " +"<envar>ftp_proxy</envar> environment variable will be used. To use a ftp " +"proxy you will have to set the <literal>ftp::ProxyLogin</literal> script in " +"the configuration file. This entry specifies the commands to send to tell " +"the proxy server what to connect to. Please see &configureindex; for an " +"example of how to do this. The substitution variables available are <literal>" +"$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</literal> <literal>" +"$(SITE_USER)</literal> <literal>$(SITE_PASS)</literal> <literal>$(SITE)</" +"literal> and <literal>$(SITE_PORT)</literal> Each is taken from it's " +"respective URI component." +msgstr "" +"URIs FTP; ftp::Proxy é o proxy ftp predefinido a usar. Está no formato " +"standard de <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Os " +"proxies por máquina podem também ser especificados ao usar o formato " +"<literal>ftp::Proxy::<host></literal> com a palavra chave especial " +"<literal>DIRECT</literal> que significa não usar nenhum proxy. Se nenhuma " +"das definições acima for especificada, será usada a variável de ambiente " +"<envar>ftp_proxy</envar>. Para usar um proxy ftp você tem que definir o " +"script <literal>ftp::ProxyLogin</literal> no ficheiro de configuração. Esta " +"entrada especifica os comandos a enviar para dizer ao servidor proxy ao que " +"se ligar. Por favor veja &configureindex; para um exemplo de como fazer " +"isto. As variáveis de substituição disponíveis são <literal>$(PROXY_USER)</" +"literal> <literal>$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> " +"<literal>$(SITE_PASS)</literal> <literal>$(SITE)</literal> e <literal>" +"$(SITE_PORT)</literal>. Cada uma é tirada do seu componente URI respectivo." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:349 +msgid "" +"Several settings are provided to control passive mode. Generally it is safe " +"to leave passive mode on, it works in nearly every environment. However " +"some situations require that passive mode be disabled and port mode ftp used " +"instead. This can be done globally, for connections that go through a proxy " +"or for a specific host (See the sample config file for examples)." +msgstr "" +"São disponibilizadas várias definições para controlar o modo passivo. " +"Geralmente é seguro deixar o modo passivo ligado, funciona em quase todos " +"ambientes. No entanto algumas situações requerem que o modo passivo seja " +"desactivado e em vez disso usar o modo port ftp. Isto pode ser feito " +"globalmente, para ligações que passam por um proxy ou para uma máquina " +"específica (Veja a amostra de ficheiro de configuração para exemplos)." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:356 +msgid "" +"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" +"envar> environment variable to a http url - see the discussion of the http " +"method above for syntax. You cannot set this in the configuration file and " +"it is not recommended to use FTP over HTTP due to its low efficiency." +msgstr "" +"É possível usar proxy FTP sobre HTTP ao definir a variável de ambiente " +"<envar>ftp_proxy</envar> para um url http - veja a discussão do método http " +"em cima para a sintaxe. Você não pode definir isto no ficheiro de " +"configuração e não é recomendado usar FTP sobre HTTP devido à sua baixa " +"eficiência." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:361 +msgid "" +"The setting <literal>ForceExtended</literal> controls the use of RFC2428 " +"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " +"false, which means these commands are only used if the control connection is " +"IPv6. Setting this to true forces their use even on IPv4 connections. Note " +"that most FTP servers do not support RFC2428." +msgstr "" +"A definição <literal>ForceExtended</literal> controla o uso de comandos " +"RFC2428 <literal>EPSV</literal> e <literal>EPRT</literal>. A predefinição é " +"falso, o que significa que estes comandos apenas são usados se a ligação de " +"controle for IPv6. Definir isto para verdadeiro força o seu uso mesmo em " +"ligações IPv4. Note que a maioria dos servidores FTP não suporta RFC2428." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:368 sources.list.5.xml:132 +msgid "cdrom" +msgstr "cdrom" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> +#: apt.conf.5.xml:374 +#, no-wrap +msgid "/cdrom/::Mount \"foo\";" +msgstr "/cdrom/::Mount \"foo\";" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:369 +msgid "" +"CDROM URIs; the only setting for CDROM URIs is the mount point, " +"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " +"drive as specified in <filename>/etc/fstab</filename>. It is possible to " +"provide alternate mount and unmount commands if your mount point cannot be " +"listed in the fstab (such as an SMB mount and old mount packages). The " +"syntax is to put <placeholder type=\"literallayout\" id=\"0\"/> within the " +"cdrom block. It is important to have the trailing slash. Unmount commands " +"can be specified using UMount." +msgstr "" +"CDROM URIs; a única definição para URIs de CDROM é o ponto de montagem, " +"<literal>cdrom::Mount</literal> que deve ser o ponto de montagem para a " +"drive de CDROM como especificado em <filename>/etc/fstab</filename>. É " +"possível fornecer comandos de montar e desmontar alternativos se o seu ponto " +"de montagem não puder ser listado na fstab (como uma montagem SMB e pacotes " +"de montagem antiga). A sintaxe é colocar <placeholder type=\"literallayout" +"\" id=\"0\"/> dentro do bloco cdrom. É importante ter a barra final. " +"Comandos para desmontar podem ser especificados usando UMount." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:379 +msgid "gpgv" +msgstr "gpgv" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:380 +msgid "" +"GPGV URIs; the only option for GPGV URIs is the option to pass additional " +"parameters to gpgv. <literal>gpgv::Options</literal> Additional options " +"passed to gpgv." +msgstr "" +"GPGV URIs;a única opção para GPGV URIs é a opção para passar parâmetros " +"adicionais ao gpgv. <literal>gpgv::Options</literal> Opções adicionais " +"passadas ao gpgv." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:385 +msgid "CompressionTypes" +msgstr "CompressionTypes" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> +#: apt.conf.5.xml:391 +#, no-wrap +msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" +msgstr "Acquire::CompressionTypes::<replaceable>Extensão de Ficheiro</replaceable> \"<replaceable>Nome de método</replaceable>\";" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:386 +msgid "" +"List of compression types which are understood by the acquire methods. " +"Files like <filename>Packages</filename> can be available in various " +"compression formats. Per default the acquire methods can decompress " +"<command>bzip2</command>, <command>lzma</command> and <command>gzip</" +"command> compressed files, with this setting more formats can be added on " +"the fly or the used method can be changed. The syntax for this is: " +"<placeholder type=\"synopsis\" id=\"0\"/>" +msgstr "" +"Lista dos tipos de compressão que são compreendidos pelos métodos de " +"aquisição. Ficheiros como <filename>Packages</filename> podem estar " +"disponíveis em vários formatos de compressão. Por predefinição os métodos de " +"aquisição podem descomprimir ficheiros comprimidos em <command>bzip2</" +"command>, <command>lzma</command> e <command>gzip</command>, mais formatos " +"podem ser adicionados na hora com esta definição ou o método usado pode ser " +"alterado. A sintaxe para isto é: <placeholder type=\"synopsis\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> +#: apt.conf.5.xml:396 +#, no-wrap +msgid "Acquire::CompressionTypes::Order:: \"gz\";" +msgstr "Acquire::CompressionTypes::Order:: \"gz\";" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> +#: apt.conf.5.xml:399 +#, no-wrap +msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" +msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:392 +msgid "" +"Also the <literal>Order</literal> subgroup can be used to define in which " +"order the acquire system will try to download the compressed files. The " +"acquire system will try the first and proceed with the next compression type " +"in this list on error, so to prefer one over the other type simple add the " +"preferred type at first - not already added default types will be added at " +"run time to the end of the list, so e.g. <placeholder type=\"synopsis\" id=" +"\"0\"/> can be used to prefer <command>gzip</command> compressed files over " +"<command>bzip2</command> and <command>lzma</command>. If <command>lzma</" +"command> should be preferred over <command>gzip</command> and " +"<command>bzip2</command> the configure setting should look like this " +"<placeholder type=\"synopsis\" id=\"1\"/> It is not needed to add " +"<literal>bz2</literal> explicit to the list as it will be added automatic." +msgstr "" +"Também o subgrupo <literal>Order</literal> pode ser usado para definir em " +"que ordem o sistema de aquisição irá tentar descarregar os ficheiros " +"comprimidos. O sistema de aquisição irá tentar com o primeiro e prosseguir " +"com o próximo tipo de compressão na lista em caso de erro, portanto para " +"preferir um sobre outro tipo, simplesmente adicione o tipo preferido em " +"primeiro lugar - tipos predefinidos não já adicionados serão adicionados em " +"tempo de execução ao fim da lista, então, ex. <placeholder type=\"synopsis\" " +"id=\"0\"/> pode ser usado para preferir ficheiros comprimidos em " +"<command>gzip</command> sobre <command>bzip2</command> e <command>lzma</" +"command>. Se o <command>lzma</command> deve ser preferido sobre " +"<command>gzip</command> e <command>bzip2</command> a definição de " +"configuração deverá parecer-se com isto: <placeholder type=\"synopsis\" id=" +"\"1\"/>. Não é necessário adicionar explicitamente <literal>bz2</literal> à " +"lista pois será adicionado automaticamente." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> +#: apt.conf.5.xml:403 +#, no-wrap +msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" +msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:401 +msgid "" +"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" +"replaceable></literal> will be checked: If this setting exists the method " +"will only be used if this file exists, e.g. for the bzip2 method (the " +"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also " +"that list entries specified on the command line will be added at the end of " +"the list specified in the configuration files, but before the default " +"entries. To prefer a type in this case over the ones specified in in the " +"configuration files you can set the option direct - not in list style. This " +"will not override the defined list, it will only prefix the list with this " +"type." +msgstr "" +"Note que em tempo de execução será verificado o <literal>Dir::Bin::" +"<replaceable>nome de método</replaceable></literal>: se esta definição " +"existir, o método apenas será usado se este ficheiro existir, ex. para o " +"método bzip2 (o embutido) a definição é <placeholder type=\"literallayout\" " +"id=\"0\"/>. Note também que as entradas na lista especificadas na linha de " +"comandos serão adicionadas no fim da lista especificada nos ficheiros de " +"configuração, mas antes das entradas predefinidas. Para preferir um tipo " +"neste caso sobre aqueles especificados nos ficheiros de configuração você " +"pode definir a opção directamente - não em estilo de lista. Isto não irá " +"sobrepor a lista definida, irá apenas prefixar a lista com este tipo." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:408 +msgid "" +"While it is possible to add an empty compression type to the order list, but " +"APT in its current version doesn't understand it correctly and will display " +"many warnings about not downloaded files - these warnings are most of the " +"time false negatives. Future versions will maybe include a way to really " +"prefer uncompressed files to support the usage of local mirrors." +msgstr "" +"Apesar de ser possível de adicionar um tipo de compressão vazio à lista de " +"ordem, o APT na sua versão actual não o compreende correctamente e irá " +"mostrar muitos avisos acerca de ficheiros não descarregados - estes avisos " +"são na maioria vezes falsos positivos. Futuras versões irão talvez incluir " +"um modo de realmente preferir ficheiros não-comprimidos para suportar a " +"utilização de mirrors locais." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:414 +msgid "Languages" +msgstr "Languages" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:415 +msgid "" +"The Languages subsection controls which <filename>Translation</filename> " +"files are downloaded and in which order APT tries to display the Description-" +"Translations. APT will try to display the first available Description in the " +"Language which is listed at first. Languages can be defined with their short " +"or long Languagecodes. Note that not all archives provide " +"<filename>Translation</filename> files for every Language - especially the " +"long Languagecodes are rare, so please inform you which ones are available " +"before you set here impossible values." +msgstr "" +"A subsecção Languages controla quais ficheiros <filename>Translation</" +"filename> são descarregados e em que ordem o APT tenta mostrar as Traduções " +"das Descrições. O APT irá tentar mostra a primeira Descrição disponível para " +"a Linguagem que está listada em primeiro. As linguagens podem ser definidas " +"com os seus códigos de linguagem curtos ou longos. Note que nem todos os " +"arquivos disponibilizam ficheiros <filename>Translation</filename> para " +"todas as Linguagens - especialmente os códigos de linguagem longos são " +"raros, portanto por favor informe-se sobre os quais estão disponíveis antes " +"de definir aqui valores impossíveis." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> +#: apt.conf.5.xml:431 +#, no-wrap +msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" +msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:421 +msgid "" +"The default list includes \"environment\" and \"en\". " +"\"<literal>environment</literal>\" has a special meaning here: It will be " +"replaced at runtime with the languagecodes extracted from the " +"<literal>LC_MESSAGES</literal> environment variable. It will also ensure " +"that these codes are not included twice in the list. If " +"<literal>LC_MESSAGES</literal> is set to \"C\" only the " +"<filename>Translation-en</filename> file (if available) will be used. To " +"force apt to use no Translation file use the setting <literal>Acquire::" +"Languages=none</literal>. \"<literal>none</literal>\" is another special " +"meaning code which will stop the search for a fitting <filename>Translation</" +"filename> file. This can be used by the system administrator to let APT " +"know that it should download also this files without actually use them if " +"the environment doesn't specify this languages. So the following example " +"configuration will result in the order \"en, de\" in an english and in \"de, " +"en\" in a german localization. Note that \"fr\" is downloaded, but not used " +"if APT is not used in a french localization, in such an environment the " +"order would be \"fr, de, en\". <placeholder type=\"programlisting\" id=\"0" +"\"/>" +msgstr "" +"A lista predefinida inclui \"environment\" e \"en\". \"<literal>environment</" +"literal>\" tem um significado especial aqui: será substituída em tempo de " +"execução por códigos de linguagem extraídos a partir da variável de ambiente " +"<literal>LC_MESSAGES</literal>. Também irá assegurar que estes códigos não " +"são incluídos duas vezes na lista. Se <literal>LC_MESSAGES</literal> estiver " +"definida para \"C\" apenas o ficheiro <filename>Translation-en</filename> " +"será usado (se disponível). Para forçar o apt a não usar nenhum ficheiro de " +"tradução use a definição <literal>Acquire::Languages=none</literal>. " +"\"<literal>none</literal>\" é outro código de significado especial que irá " +"parar a procura por um ficheiro <filename>Translation</filename> apropriado. " +"Isto pode ser usado pelo administrador do sistema para dizer ao APT que deve " +"também descarregar estes ficheiros sem realmente os usar, se o ambiente não " +"especificar estas linguagens. Portanto o seguinte exemplo de configuração " +"irá resultar na ordem \"en, de\" num ambiente em inglês e \"de, en\" num " +"ambiente em alemão. Note que o \"fr\" é descarregado, mas não é usado se o " +"APT não for usado num ambiente em francês, em tal ambiente a ordem deveria " +"ser \"fr, de, en\". <placeholder type=\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:228 +msgid "" +"The <literal>Acquire</literal> group of options controls the download of " +"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" +msgstr "" +"O grupo de opções <literal>Acquire</literal> controla a descarga de pacotes " +"e os manipuladores de URI. <placeholder type=\"variablelist\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:438 +msgid "Directories" +msgstr "Directories" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:440 +msgid "" +"The <literal>Dir::State</literal> section has directories that pertain to " +"local state information. <literal>lists</literal> is the directory to place " +"downloaded package lists in and <literal>status</literal> is the name of the " +"dpkg status file. <literal>preferences</literal> is the name of the APT " +"preferences file. <literal>Dir::State</literal> contains the default " +"directory to prefix on all sub items if they do not start with <filename>/</" +"filename> or <filename>./</filename>." +msgstr "" +"A secção <literal>Dir::State</literal> tem directórios que pertencem à " +"informação de estado local. <literal>lists</literal> é o directório para " +"colocar listas de pacotes descarregadas e <literal>status</literal> é o nome " +"do ficheiro de estado do dpkg. <literal>preferences</literal> é o nome do " +"ficheiro de preferências do APT. <literal>Dir::State</literal> contém o " +"directório predefinido para pré-fixar em todos os sub items que não começam " +"com <filename>/</filename> ou <filename>./</filename>." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:447 +msgid "" +"<literal>Dir::Cache</literal> contains locations pertaining to local cache " +"information, such as the two package caches <literal>srcpkgcache</literal> " +"and <literal>pkgcache</literal> as well as the location to place downloaded " +"archives, <literal>Dir::Cache::archives</literal>. Generation of caches can " +"be turned off by setting their names to be blank. This will slow down " +"startup but save disk space. It is probably preferred to turn off the " +"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the " +"default directory is contained in <literal>Dir::Cache</literal>" +msgstr "" +"<literal>Dir::Cache</literal> contém localizações pertencentes a informação " +"da cache local, como as caches de dois pacotes <literal>srcpkgcache</" +"literal> e <literal>pkgcache</literal> assim como a localização onde colocar " +"arquivos descarregados, <literal>Dir::Cache::archives</literal>. A geração " +"de caches pode ser desligada ao definir os seus nomes para vazio. Isto irá " +"abrandar o arranque mas poupar espaço em disco. Provavelmente é preferível " +"desligar o pkgcache em vez do srcpkgcache. Tal como <literal>Dir::State</" +"literal> o directório predefinido é contido em <literal>Dir::Cache</literal>" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:456 +msgid "" +"<literal>Dir::Etc</literal> contains the location of configuration files, " +"<literal>sourcelist</literal> gives the location of the sourcelist and " +"<literal>main</literal> is the default configuration file (setting has no " +"effect, unless it is done from the config file specified by " +"<envar>APT_CONFIG</envar>)." +msgstr "" +"<literal>Dir::Etc</literal> contém a localização dos ficheiros de " +"configuração, <literal>sourcelist</literal> fornece a localização da " +"sourcelist e <literal>main</literal> é o ficheiro da configuração " +"predefinida (definição não tem efeito, a menos que seja feita a partir do " +"ficheiro de configuração especificado por <envar>APT_CONFIG</envar>)." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:462 +msgid "" +"The <literal>Dir::Parts</literal> setting reads in all the config fragments " +"in lexical order from the directory specified. After this is done then the " +"main config file is loaded." +msgstr "" +"A definição <literal>Dir::Parts</literal> lê todos os fragmentos de " +"configuração em ordem léxica a partir do directório especificado. Após isto " +"estar feito então é carregado o ficheiro de configuração principal." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:466 +msgid "" +"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" +"Bin::Methods</literal> specifies the location of the method handlers and " +"<literal>gzip</literal>, <literal>bzip2</literal>, <literal>lzma</literal>, " +"<literal>dpkg</literal>, <literal>apt-get</literal> <literal>dpkg-source</" +"literal> <literal>dpkg-buildpackage</literal> and <literal>apt-cache</" +"literal> specify the location of the respective programs." +msgstr "" +"Programas binários são apontados por <literal>Dir::Bin</literal>. " +"<literal>Dir::Bin::Methods</literal> especifica a localização dos " +"manipuladores do método e de <literal>gzip</literal>, <literal>bzip2</" +"literal>, <literal>lzma</literal>, <literal>dpkg</literal>, <literal>apt-" +"get</literal> <literal>dpkg-source</literal> <literal>dpkg-buildpackage</" +"literal> e <literal>apt-cache</literal> especifica a localização dos " +"respectivos programas." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:474 +msgid "" +"The configuration item <literal>RootDir</literal> has a special meaning. If " +"set, all paths in <literal>Dir::</literal> will be relative to " +"<literal>RootDir</literal>, <emphasis>even paths that are specified " +"absolutely</emphasis>. So, for instance, if <literal>RootDir</literal> is " +"set to <filename>/tmp/staging</filename> and <literal>Dir::State::status</" +"literal> is set to <filename>/var/lib/dpkg/status</filename>, then the " +"status file will be looked up in <filename>/tmp/staging/var/lib/dpkg/status</" +"filename>." +msgstr "" +"O item de configuração <literal>RootDir</literal> tem um significado " +"especial. Se definido, todos os caminhos em <literal>Dir::</literal> serão " +"relativos a <literal>RootDir</literal>, <emphasis>mesmo caminhos que estão " +"absolutamente especificados</emphasis>. Então, por exemplo, se " +"<literal>RootDir</literal> estiver definido para <filename>/tmp/staging</" +"filename> e <literal>Dir::State::status</literal> estiver definido para " +"<filename>/var/lib/dpkg/status</filename>, então o ficheiro status será " +"procurado em <filename>/tmp/staging/var/lib/dpkg/status</filename>." + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:487 +msgid "APT in DSelect" +msgstr "APT em DSelect" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:489 +msgid "" +"When APT is used as a &dselect; method several configuration directives " +"control the default behaviour. These are in the <literal>DSelect</literal> " +"section." +msgstr "" +"Quando o APT é usado com um método &dselect;, várias directivas de " +"configuração controlam o comportamento predefinido. Estas estão na secção " +"<literal>DSelect</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:493 +msgid "Clean" +msgstr "Clean" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:494 +msgid "" +"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " +"and never. always and prompt will remove all packages from the cache after " +"upgrading, prompt (the default) does so conditionally. auto removes only " +"those packages which are no longer downloadable (replaced with a new version " +"for instance). pre-auto performs this action before downloading new " +"packages." +msgstr "" +"Modo Cache Clean: este valor deve ser um de always, prompt, auto, pre-auto e " +"never. always e prompt irão remover todos os pacotes da cache após a " +"actualização, prompt (a predefinição) fá-lo condicionalmente. auto remove " +"apenas aqueles pacotes que já não podem ser descarregados (por exemplo, " +"substituídos por uma nova versão). pre-auto executa esta acção antes de " +"descarregar novos pacotes." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:503 +msgid "" +"The contents of this variable is passed to &apt-get; as command line options " +"when it is run for the install phase." +msgstr "" +"O conteúdo desta variável é passado ao &apt-get; como opções de linha de " +"comandos quando é corrido para a fase de instalação." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:507 +msgid "Updateoptions" +msgstr "Updateoptions" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:508 +msgid "" +"The contents of this variable is passed to &apt-get; as command line options " +"when it is run for the update phase." +msgstr "" +"O conteúdo desta variável é passado ao &apt-get; como opções de linha de " +"comandos quando é executado para a fase de actualização." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:512 +msgid "PromptAfterUpdate" +msgstr "PromptAfterUpdate" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:513 +msgid "" +"If true the [U]pdate operation in &dselect; will always prompt to continue. " +"The default is to prompt only on error." +msgstr "" +"Se for verdadeira a operação [U]pdate no &dselect; irá sempre avisar para " +"continuar. A predefinição é avisar apenas em caso de erro." + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:519 +msgid "How APT calls dpkg" +msgstr "Como o APT chama o dpkg" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:520 +msgid "" +"Several configuration directives control how APT invokes &dpkg;. These are " +"in the <literal>DPkg</literal> section." +msgstr "" +"Várias directivas de configuração controlam como o APT invoca o invokes " +"&dpkg;. Estas estão na secção <literal>DPkg</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:525 +msgid "" +"This is a list of options to pass to dpkg. The options must be specified " +"using the list notation and each list item is passed as a single argument to " +"&dpkg;." +msgstr "" +"Isto é uma lista de opções para passar ao dpkg. As opções têm de ser " +"especificadas usando a notação de lista e cada item da lista é passado como " +"um argumento único ao &dpkg;." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:530 +msgid "Pre-Invoke" +msgstr "Pre-Invoke" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:530 +msgid "Post-Invoke" +msgstr "Post-Invoke" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:531 +msgid "" +"This is a list of shell commands to run before/after invoking &dpkg;. Like " +"<literal>options</literal> this must be specified in list notation. The " +"commands are invoked in order using <filename>/bin/sh</filename>, should any " +"fail APT will abort." +msgstr "" +"Isto é uma lista de comandos shell para executar antes/após invocar o " +"&dpkg;. Tal como as <literal>opções</literal> isto tem que ser especificado " +"em notação listada. Os comandos são invocados em ordem usando <filename>/" +"bin/sh</filename>, caso algum deles falhe, o APT irá abortar." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:537 +msgid "Pre-Install-Pkgs" +msgstr "Pre-Install-Pkgs" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:538 +msgid "" +"This is a list of shell commands to run before invoking dpkg. Like " +"<literal>options</literal> this must be specified in list notation. The " +"commands are invoked in order using <filename>/bin/sh</filename>, should any " +"fail APT will abort. APT will pass to the commands on standard input the " +"filenames of all .deb files it is going to install, one per line." +msgstr "" +"Isto é uma lista de comandos shell para executar antes de invocar o &dpkg;. " +"Tal como as <literal>opções</literal> isto tem que ser especificado em " +"notação listada. Os comandos são invocados em ordem usando <filename>/bin/" +"sh</filename>, caso algum deles falhe, o APT irá abortar. O APT passa para " +"os comandos na entrada standard os nomes de ficheiros de todos os ficheiros ." +"deb que vai instalar, um por cada linha." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:544 +msgid "" +"Version 2 of this protocol dumps more information, including the protocol " +"version, the APT configuration space and the packages, files and versions " +"being changed. Version 2 is enabled by setting <literal>DPkg::Tools::" +"options::cmd::Version</literal> to 2. <literal>cmd</literal> is a command " +"given to <literal>Pre-Install-Pkgs</literal>." +msgstr "" +"A versão 2 deste protocolo despeja mais informação, incluindo a versão de " +"protocolo, o espaço de configuração do APT e os pacotes, ficheiros e versões " +"que foram alteradas. A versão 2 é activada ao definir <literal>DPkg::Tools::" +"options::cmd::Version</literal> a 2. <literal>cmd</literal> é um comando " +"dado ao <literal>Pre-Install-Pkgs</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:551 +msgid "Run-Directory" +msgstr "Run-Directory" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:552 +msgid "" +"APT chdirs to this directory before invoking dpkg, the default is <filename>/" +"</filename>." +msgstr "" +"O APT muda para este directório (chdir) antes de invocar o dpkg, a " +"predefinição é <filename>/</filename>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:556 +msgid "Build-options" +msgstr "Build-options" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:557 +msgid "" +"These options are passed to &dpkg-buildpackage; when compiling packages, the " +"default is to disable signing and produce all binaries." +msgstr "" +"Estas opções são passadas ao &dpkg-buildpackage; quando compila pacotes, a " +"predefinição é desactivar a assinatura e produzir todos os binários." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt.conf.5.xml:562 +msgid "dpkg trigger usage (and related options)" +msgstr "Utilização trigger do dpkg (e opções relacionadas)" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt.conf.5.xml:563 +msgid "" +"APT can call dpkg in a way so it can make aggressive use of triggers over " +"multiply calls of dpkg. Without further options dpkg will use triggers only " +"in between his own run. Activating these options can therefore decrease the " +"time needed to perform the install / upgrade. Note that it is intended to " +"activate these options per default in the future, but as it changes the way " +"APT calling dpkg drastically it needs a lot more testing. <emphasis>These " +"options are therefore currently experimental and should not be used in " +"productive environments.</emphasis> Also it breaks the progress reporting so " +"all frontends will currently stay around half (or more) of the time in the " +"100% state while it actually configures all packages." +msgstr "" +"APT pode chamar o dpkg num modo que faz uso agressivo dos triggers sobre " +"múltiplas chamadas do dpkg. Sem mais opções o dpkg irá usar triggers apenas " +"entre a sua própria execução. Activando estas opções pode portanto diminuir " +"o tempo necessário para executar a instalação / actualização. Note que é " +"intenção futura activar estas opções por predefinição, mas como muda " +"drasticamente a maneira como o APT chama o dpkg, precisa de muitos mais " +"testes. <emphasis>Estas opções são portanto experimentais e não deve ser " +"usadas em ambientes produtivos.</emphasis> Também interrompe o relatório de " +"progresso, então todos os frontends irão permanecer a cerca de metade (ou " +"mais) do tempo no estado de 100% enquanto na realidade está a configurar " +"todos os pacotes." + +#. type: Content of: <refentry><refsect1><refsect2><para><literallayout> +#: apt.conf.5.xml:578 +#, no-wrap +msgid "" +"DPkg::NoTriggers \"true\";\n" +"PackageManager::Configure \"smart\";\n" +"DPkg::ConfigurePending \"true\";\n" +"DPkg::TriggersPending \"true\";" +msgstr "" +"DPkg::NoTriggers \"true\";\n" +"PackageManager::Configure \"smart\";\n" +"DPkg::ConfigurePending \"true\";\n" +"DPkg::TriggersPending \"true\";" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt.conf.5.xml:572 +msgid "" +"Note that it is not guaranteed that APT will support these options or that " +"these options will not cause (big) trouble in the future. If you have " +"understand the current risks and problems with these options, but are brave " +"enough to help testing them create a new configuration file and test a " +"combination of options. Please report any bugs, problems and improvements " +"you encounter and make sure to note which options you have used in your " +"reports. Asking dpkg for help could also be useful for debugging proposes, " +"see e.g. <command>dpkg --audit</command>. A defensive option combination " +"would be <placeholder type=\"literallayout\" id=\"0\"/>" +msgstr "" +"Note que não é garantido que o APT irá suportar estas opções ou que estas " +"opções não irão causar (grandes) problemas no futuro. Se você compreendeu os " +"riscos e problemas actuais com estas opções, mas tem coragem suficiente para " +"ajudar a testá-la, crie um novo ficheiro de configuração e teste uma " +"combinação de opções. Por favor reporte quaisquer bugs, problemas e " +"melhoramentos que encontre e certifique-se de anotar nos seus relatórios " +"quais as opções que usou. Pedir ajuda ao dpkg também pode ser útil para " +"propósitos de depuração, veja ex. <command>dpkg --audit</command>. Uma " +"combinação de opções defensiva seria <placeholder type=\"literallayout\" id=" +"\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:584 +msgid "DPkg::NoTriggers" +msgstr "DPkg::NoTriggers" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:585 +msgid "" +"Add the no triggers flag to all dpkg calls (except the ConfigurePending " +"call). See &dpkg; if you are interested in what this actually means. In " +"short: dpkg will not run the triggers when this flag is present unless it is " +"explicitly called to do so in an extra call. Note that this option exists " +"(undocumented) also in older apt versions with a slightly different meaning: " +"Previously these option only append --no-triggers to the configure calls to " +"dpkg - now apt will add these flag also to the unpack and remove calls." +msgstr "" +"Adiciona a bandeira 'no triggers' a todas as chamadas do dpkg (excepto a " +"chamada ConfigurePending). Veja &dpkg; se está interessado no que isto " +"realmente representa. Em resumo: o dpkg não irá correr os triggers quando " +"esta bandeira está presente a menos que seja explicitamente chamado a fazê-" +"lo numa chamada extra. Note que esta opção existe (não documentada) também " +"em versões mais antigas do apt com um significado ligeiramente diferente: " +"Anteriormente esta opção apenas acrescentava --no-triggers às chamadas " +"configure para o dpkg - agora o apt irá adicionar esta bandeira também às " +"chamadas unpack e remove." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:592 +msgid "PackageManager::Configure" +msgstr "PackageManager::Configure" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:593 +msgid "" +"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " +"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " +"value and causes APT to configure all packages explicit. The " +"\"<literal>smart</literal>\" way is it to configure only packages which need " +"to be configured before another package can be unpacked (Pre-Depends) and " +"let the rest configure by dpkg with a call generated by the next option. " +"\"<literal>no</literal>\" on the other hand will not configure anything and " +"totally rely on dpkg for configuration (which will at the moment fail if a " +"Pre-Depends is encountered). Setting this option to another than the all " +"value will implicitly activate also the next option per default as otherwise " +"the system could end in an unconfigured status which could be unbootable!" +msgstr "" +"Valores válidos são \"<literal>all</literal>\", \"<literal>smart</literal>\" " +"e \"<literal>no</literal>\". \"<literal>all</literal>\" é o valor " +"predefinido e faz com que o APT configure todos os pacotes explícitos. O " +"modo \"<literal>smart</literal>\" serve para configurar apenas pacotes que " +"precisam de ser configurados antes que outro pacote possa ser desempacotado " +"(pré-dependências) e o resto configurado pelo dpkg com uma chamada gerada " +"pela próxima opção. \"<literal>no</literal>\" por outro lado não irá " +"configurar nada e confiar no dpkg para configurações (o qual irá falhar se " +"encontrar uma pré-dependência). Definir esta opção para outra que não seja o " +"valor all irá implicitamente activar também a próxima opção predefinida, " +"caso contrário o sistema poderia acabar num estado não configurado o qual " +"poderia não arrancar!" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:603 +msgid "DPkg::ConfigurePending" +msgstr "DPkg::ConfigurePending" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:604 +msgid "" +"If this option is set apt will call <command>dpkg --configure --pending</" +"command> to let dpkg handle all required configurations and triggers. This " +"option is activated automatic per default if the previous option is not set " +"to <literal>all</literal>, but deactivating could be useful if you want to " +"run APT multiple times in a row - e.g. in an installer. In these sceneries " +"you could deactivate this option in all but the last run." +msgstr "" +"Se esta opção for definida, o apt irá chamar <command>dpkg --configure --" +"pending</command> para permitir ao dpkg lidar como todas as configurações e " +"triggers requisitados. Esta opção é activada automaticamente por " +"predefinição se a opção anterior não for definida para <literal>all</" +"literal>, mas desactivá-la pode ser útil se deseja correr o APT múltiplas " +"vezes numa fila - ex. numa instalação. Nestes cenários você pode desactivar " +"esta opção em todas excepto na última execução." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:610 +msgid "DPkg::TriggersPending" +msgstr "DPkg::TriggersPending" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:611 +msgid "" +"Useful for <literal>smart</literal> configuration as a package which has " +"pending triggers is not considered as <literal>installed</literal> and dpkg " +"treats them as <literal>unpacked</literal> currently which is a dealbreaker " +"for Pre-Dependencies (see debbugs #526774). Note that this will process all " +"triggers, not only the triggers needed to configure this package." +msgstr "" +"Útil para configuração <literal>smart</literal>, pois um pacote que tenha " +"triggers pendentes não é considerado como <literal>installed</literal> e o " +"dpkg trata-o como actualmente <literal>unpacked</literal> o que é um modo de " +"lidar com pré-dependências (veja debbugs #526774). Note que isto irá " +"processar todos os triggers, e não apenas os triggers necessários para " +"configurar este pacote." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:616 +msgid "PackageManager::UnpackAll" +msgstr "PackageManager::UnpackAll" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:617 +msgid "" +"As the configuration can be deferred to be done at the end by dpkg it can be " +"tried to order the unpack series only by critical needs, e.g. by Pre-" +"Depends. Default is true and therefore the \"old\" method of ordering in " +"various steps by everything. While both method were present in earlier APT " +"versions the <literal>OrderCritical</literal> method was unused, so this " +"method is very experimental and needs further improvements before becoming " +"really useful." +msgstr "" +"Como a configuração pode ser diferida a ser feita no final pelo dpkg, pode " +"ser tentada a ordenar a série de desempacotamento apenas por necessidades " +"críticas, ex. por pré-dependências. A predefinição é verdadeiro e então o " +"método \"antigo\" de ordenar em vários passos por tudo. Enquanto ambos os " +"métodos estão presentes em versões jovens do APT, o método " +"<literal>OrderCritical</literal> não foi usado, portanto este método é muito " +"experimental e necessita de mais melhorias antes de se tornar realmente útil." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:624 +msgid "OrderList::Score::Immediate" +msgstr "OrderList::Score::Immediate" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> +#: apt.conf.5.xml:632 +#, no-wrap +msgid "" +"OrderList::Score {\n" +"\tDelete 500;\n" +"\tEssential 200;\n" +"\tImmediate 10;\n" +"\tPreDepends 50;\n" +"};" +msgstr "" +"OrderList::Score {\n" +"\tDelete 500;\n" +"\tEssential 200;\n" +"\tImmediate 10;\n" +"\tPreDepends 50;\n" +"};" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:625 +msgid "" +"Essential packages (and there dependencies) should be configured immediately " +"after unpacking. It will be a good idea to do this quite early in the " +"upgrade process as these these configure calls require currently also " +"<literal>DPkg::TriggersPending</literal> which will run quite a few triggers " +"(which maybe not needed). Essentials get per default a high score but the " +"immediate flag is relatively low (a package which has a Pre-Depends is " +"higher rated). These option and the others in the same group can be used to " +"change the scoring. The following example shows the settings with there " +"default values. <placeholder type=\"literallayout\" id=\"0\"/>" +msgstr "" +"Os pacotes essenciais ( e as suas dependências) deve ser configurados " +"imediatamente após a descompactação. Será uma boa ideia fazer isto bem cedo " +"no processo de actualização pois estas chamadas de configuração também " +"requerem actualmente <literal>DPkg::TriggersPending</literal> o que irá " +"correr alguns triggers (que talvez não sejam necessários). Os essenciais " +"obtêm por predefinição uma pontuação alta mas a bandeira 'imediato' é " +"relativamente baixa (um pacote que tenha uma pré-dependência tem pontuação " +"mais alta). Esta opção e as outras no mesmo grupo podem ser usadas para " +"alterar a pontuação. O exemplo seguinte mostra as definições que são valores " +"predefinidos. <placeholder type=\"literallayout\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:645 +msgid "Periodic and Archives options" +msgstr "Opções Periodic e Archives" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:646 +msgid "" +"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " +"of options configure behavior of apt periodic updates, which is done by " +"<literal>/etc/cron.daily/apt</literal> script. See header of this script for " +"the brief documentation of these options." +msgstr "" +"Os grupos de opções <literal>APT::Periodic</literal> e <literal>APT::" +"Archives</literal> configuram o comportamento das actualizações periódicas " +"do APT, o que é feito pelo script <literal>/etc/cron.daily/apt</literal>. " +"Veja o cabeçalho deste script para uma breve documentação das suas opções." + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:654 +msgid "Debug options" +msgstr "Opções de depuração" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:656 +msgid "" +"Enabling options in the <literal>Debug::</literal> section will cause " +"debugging information to be sent to the standard error stream of the program " +"utilizing the <literal>apt</literal> libraries, or enable special program " +"modes that are primarily useful for debugging the behavior of <literal>apt</" +"literal>. Most of these options are not interesting to a normal user, but a " +"few may be:" +msgstr "" +"Activar opções na secção <literal>Debug::</literal> irá causar o envio de " +"informação de depuração para o fluxo de erros standard do programa " +"utilizando as bibliotecas do <literal>apt</literal>, ou activar modos " +"especiais do programa que são principalmente úteis para depurar o " +"comportamento do <literal>apt</literal>. A maioria destas opções não têm " +"interesse para o utilizador normal, mas algumas podem ter:" + +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> +#: apt.conf.5.xml:667 +msgid "" +"<literal>Debug::pkgProblemResolver</literal> enables output about the " +"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" +"literal>." +msgstr "" +"<literal>Debug::pkgProblemResolver</literal> activa mensagens na saída " +"acerca das decisões tomadas por <literal>dist-upgrade, upgrade, install, " +"remove, purge</literal>." + +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> +#: apt.conf.5.xml:675 +msgid "" +"<literal>Debug::NoLocking</literal> disables all file locking. This can be " +"used to run some operations (for instance, <literal>apt-get -s install</" +"literal>) as a non-root user." +msgstr "" +"<literal>Debug::NoLocking</literal> desactiva o bloqueio de todos os " +"ficheiros. Isto pode ser usado para executar algumas operações (por exemplo, " +"<literal>apt-get -s install</literal>) como um utilizador não root." + +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> +#: apt.conf.5.xml:684 +msgid "" +"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " +"time that <literal>apt</literal> invokes &dpkg;." +msgstr "" +"<literal>Debug::pkgDPkgPM</literal> escreve a linha de comandos actual de " +"cada vez que o <literal>apt</literal> invoca o &dpkg;." + +#. TODO: provide a +#. motivating example, except I haven't a clue why you'd want +#. to do this. +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> +#: apt.conf.5.xml:692 +msgid "" +"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " +"in CDROM IDs." +msgstr "" +"<literal>Debug::IdentCdrom</literal> desactiva a inclusão de dados statfs em " +"IDs de CDROM." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:702 +msgid "A full list of debugging options to apt follows." +msgstr "Segue-se uma lista completa de opções de depuração para o apt." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:707 +msgid "<literal>Debug::Acquire::cdrom</literal>" +msgstr "<literal>Debug::Acquire::cdrom</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:711 +msgid "" +"Print information related to accessing <literal>cdrom://</literal> sources." +msgstr "" +"Escreve informação relacionada com o acesso a fontes de <literal>cdrom://</" +"literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:718 +msgid "<literal>Debug::Acquire::ftp</literal>" +msgstr "<literal>Debug::Acquire::ftp</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:722 +msgid "Print information related to downloading packages using FTP." +msgstr "" +"Escreve informação relacionada com o descarregamento de pacotes usando FTP." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:729 +msgid "<literal>Debug::Acquire::http</literal>" +msgstr "<literal>Debug::Acquire::http</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:733 +msgid "Print information related to downloading packages using HTTP." +msgstr "" +"Escreve informação relacionada com o descarregamento de pacotes usando HTTP." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:740 +msgid "<literal>Debug::Acquire::https</literal>" +msgstr "<literal>Debug::Acquire::https</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:744 +msgid "Print information related to downloading packages using HTTPS." +msgstr "" +"Escreve informação relacionada com o descarregamento de pacotes usando HTTPS." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:751 +msgid "<literal>Debug::Acquire::gpgv</literal>" +msgstr "<literal>Debug::Acquire::gpgv</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:755 +msgid "" +"Print information related to verifying cryptographic signatures using " +"<literal>gpg</literal>." +msgstr "" +"Escreve informação relacionada com a verificação de assinaturas " +"criptográficas usando <literal>gpg</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:762 +msgid "<literal>Debug::aptcdrom</literal>" +msgstr "<literal>Debug::aptcdrom</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:766 +msgid "" +"Output information about the process of accessing collections of packages " +"stored on CD-ROMs." +msgstr "" +"Escreve informação acerca do processo de aceder a colecções de pacotes " +"armazenados em CD-ROMs." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:773 +msgid "<literal>Debug::BuildDeps</literal>" +msgstr "<literal>Debug::BuildDeps</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:776 +msgid "Describes the process of resolving build-dependencies in &apt-get;." +msgstr "" +"Descreve os processos de resolver dependências de compilação no &apt-get;." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:783 +msgid "<literal>Debug::Hashes</literal>" +msgstr "<literal>Debug::Hashes</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:786 +msgid "" +"Output each cryptographic hash that is generated by the <literal>apt</" +"literal> libraries." +msgstr "" +"Escreve cada hash criptográfico que é gerado pelas bibliotecas do " +"<literal>apt</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:793 +msgid "<literal>Debug::IdentCDROM</literal>" +msgstr "<literal>Debug::IdentCDROM</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:796 +msgid "" +"Do not include information from <literal>statfs</literal>, namely the number " +"of used and free blocks on the CD-ROM filesystem, when generating an ID for " +"a CD-ROM." +msgstr "" +"Não inclui informação de <literal>statfs</literal>, nomeadamente o número de " +"blocos usados e livres no sistema de ficheiros do CD-ROM, quando gera um ID " +"para um CD-ROM." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:804 +msgid "<literal>Debug::NoLocking</literal>" +msgstr "<literal>Debug::NoLocking</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:807 +msgid "" +"Disable all file locking. For instance, this will allow two instances of " +"<quote><literal>apt-get update</literal></quote> to run at the same time." +msgstr "" +"Desactiva o bloqueio de todos os ficheiros. Por exemplo, isto irá permitir o " +"funcionamento de duas instâncias do <quote><literal>apt-get update</" +"literal></quote> ao mesmo tempo." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:815 +msgid "<literal>Debug::pkgAcquire</literal>" +msgstr "<literal>Debug::pkgAcquire</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:819 +msgid "Log when items are added to or removed from the global download queue." +msgstr "" +"Regista no log quando os items são adicionados ou removidos da fila de " +"download global." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:826 +msgid "<literal>Debug::pkgAcquire::Auth</literal>" +msgstr "<literal>Debug::pkgAcquire::Auth</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:829 +msgid "" +"Output status messages and errors related to verifying checksums and " +"cryptographic signatures of downloaded files." +msgstr "" +"Escreve mensagens de estado e erros relacionados com a verificação de " +"checksums e assinaturas criptográficas dos ficheiros descarregados." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:836 +msgid "<literal>Debug::pkgAcquire::Diffs</literal>" +msgstr "<literal>Debug::pkgAcquire::Diffs</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:839 +msgid "" +"Output information about downloading and applying package index list diffs, " +"and errors relating to package index list diffs." +msgstr "" +"Escreve informação acerca do download e aplicação de diffs de lista de " +"índice do pacote, e erros relacionados com as diffs de lista de índice do " +"pacote." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:847 +msgid "<literal>Debug::pkgAcquire::RRed</literal>" +msgstr "<literal>Debug::pkgAcquire::RRed</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:851 +msgid "" +"Output information related to patching apt package lists when downloading " +"index diffs instead of full indices." +msgstr "" +"Escreve informação relacionada com a aplicação de patch na lista de pacotes " +"do apt quando se descarrega diffs de índice em vez de índices completos." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:858 +msgid "<literal>Debug::pkgAcquire::Worker</literal>" +msgstr "<literal>Debug::pkgAcquire::Worker</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:862 +msgid "" +"Log all interactions with the sub-processes that actually perform downloads." +msgstr "" +"Regista todas as interacções com os sub-processos que realmente executam os " +"downloads." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:869 +msgid "<literal>Debug::pkgAutoRemove</literal>" +msgstr "<literal>Debug::pkgAutoRemove</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:873 +msgid "" +"Log events related to the automatically-installed status of packages and to " +"the removal of unused packages." +msgstr "" +"Regista no log eventos relacionados com o estado instalado-automaticamente " +"de pacotes e com a remoção de pacotes não utilizados." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:880 +msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" +msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:883 +msgid "" +"Generate debug messages describing which packages are being automatically " +"installed to resolve dependencies. This corresponds to the initial auto-" +"install pass performed in, e.g., <literal>apt-get install</literal>, and not " +"to the full <literal>apt</literal> dependency resolver; see <literal>Debug::" +"pkgProblemResolver</literal> for that." +msgstr "" +"Gera mensagens de depuração descrevendo quais pacotes estão a ser instalados " +"automaticamente para resolver dependências. Isto corresponde ao passo de " +"instalação-automática inicial executado em, ex, <literal>apt-get install</" +"literal>, e não ao resolvedor de dependências total do <literal>apt</" +"literal>; veja <literal>Debug::pkgProblemResolver</literal> para isso." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:894 +msgid "<literal>Debug::pkgDepCache::Marker</literal>" +msgstr "<literal>Debug::pkgDepCache::Marker</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:897 +msgid "" +"Generate debug messages describing which package is marked as keep/install/" +"remove while the ProblemResolver does his work. Each addition or deletion " +"may trigger additional actions; they are shown indented two additional space " +"under the original entry. The format for each line is <literal>MarkKeep</" +"literal>, <literal>MarkDelete</literal> or <literal>MarkInstall</literal> " +"followed by <literal>package-name <a.b.c -> d.e.f | x.y.z> (section)" +"</literal> where <literal>a.b.c</literal> is the current version of the " +"package, <literal>d.e.f</literal> is the version considered for installation " +"and <literal>x.y.z</literal> is a newer version, but not considered for " +"installation (because of a low pin score). The later two can be omitted if " +"there is none or if it is the same version as the installed. " +"<literal>section</literal> is the name of the section the package appears in." +msgstr "" +"Gera mensagens de depuração descrevendo qual pacote está marcado como manter/" +"instalar/remover enquanto o \"solucionador-de-problemas\" faz o seu " +"trabalho. Cada adição ou remoção pode activar acções adicionais; elas são " +"mostradas indentadas dois espaços adicionais sob da entrada original. O " +"formato de cada linha é <literal>MarkKeep</literal>, <literal>MarkDelete</" +"literal> ou <literal>MarkInstall</literal> seguido por <literal>package-name " +"<a.b.c -> d.e.f | x.y.z> (secção)</literal> onde <literal>a.b.c</" +"literal> é a versão actual do pacote, <literal>d.e.f</literal> é a versão " +"considerada para instalação e <literal>x.y.z</literal> é a versão mais " +"recente, mas não considerada para instalação (devido a baixa pontuação). Os " +"dois últimos podem ser omitidos se não existir nenhum ou for a mesma versão " +"que aquela instalada. <literal>section</literal> é o nome da secção onde o " +"pacote aparece." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:916 +msgid "<literal>Debug::pkgInitConfig</literal>" +msgstr "<literal>Debug::pkgInitConfig</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:919 +msgid "Dump the default configuration to standard error on startup." +msgstr "Despeja a configuração predefinida para o erro standard no arranque." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:926 +msgid "<literal>Debug::pkgDPkgPM</literal>" +msgstr "<literal>Debug::pkgDPkgPM</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:929 +msgid "" +"When invoking &dpkg;, output the precise command line with which it is being " +"invoked, with arguments separated by a single space character." +msgstr "" +"Ao invocar o &dpkg;, escreve com precisão a linha de comandos com a qual " +"está a ser invocado, com argumentos separados por um caractere de espaço " +"único." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:937 +msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" +msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:940 +msgid "" +"Output all the data received from &dpkg; on the status file descriptor and " +"any errors encountered while parsing it." +msgstr "" +"Escreve todos os dados recebidos do &dpkg; no descritor de ficheiro de " +"estado e quaisquer erros encontrados enquanto os analisa." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:947 +msgid "<literal>Debug::pkgOrderList</literal>" +msgstr "<literal>Debug::pkgOrderList</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:951 +msgid "" +"Generate a trace of the algorithm that decides the order in which " +"<literal>apt</literal> should pass packages to &dpkg;." +msgstr "" +"Gera um rastro do algoritmo que decide a ordem na qual o <literal>apt</" +"literal> deve passar os pacotes ao &dpkg;." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:959 +msgid "<literal>Debug::pkgPackageManager</literal>" +msgstr "<literal>Debug::pkgPackageManager</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:963 +msgid "" +"Output status messages tracing the steps performed when invoking &dpkg;." +msgstr "" +"Escreve mensagens de estado seguindo os passos executados quando invoca o " +"&dpkg;." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:970 +msgid "<literal>Debug::pkgPolicy</literal>" +msgstr "<literal>Debug::pkgPolicy</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:974 +msgid "Output the priority of each package list on startup." +msgstr "Escreve a prioridade da cada lista de pacote no arranque." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:980 +msgid "<literal>Debug::pkgProblemResolver</literal>" +msgstr "<literal>Debug::pkgProblemResolver</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:984 +msgid "" +"Trace the execution of the dependency resolver (this applies only to what " +"happens when a complex dependency problem is encountered)." +msgstr "" +"Rastreia a execução do resolvedor de dependências (isto só se aplica ao que " +"acontece quando é encontrado um problema de dependências complexo)." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:992 +msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" +msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:995 +msgid "" +"Display a list of all installed packages with their calculated score used by " +"the pkgProblemResolver. The description of the package is the same as " +"described in <literal>Debug::pkgDepCache::Marker</literal>" +msgstr "" +"Mostra uma lista de todos os pacotes instalados com as suas pontuações " +"calculadas usadas pelo pkgProblemResolver. A descrição do do pacote é a " +"mesma que é descrita em <literal>Debug::pkgDepCache::Marker</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:1003 +msgid "<literal>Debug::sourceList</literal>" +msgstr "<literal>Debug::sourceList</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:1007 +msgid "" +"Print information about the vendors read from <filename>/etc/apt/vendors." +"list</filename>." +msgstr "" +"Escreve informação acerca dos fornecedores lida de <filename>/etc/apt/" +"vendors.list</filename>." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:1030 +msgid "" +"&configureindex; is a configuration file showing example values for all " +"possible options." +msgstr "" +"&configureindex; é um ficheiro de configuração que mostra valores exemplo " +"para todas as opções possíveis." + +#. type: Content of: <refentry><refsect1><variablelist> +#: apt.conf.5.xml:1037 +msgid "&file-aptconf;" +msgstr "&file-aptconf;" + +#. ? reading apt.conf +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:1042 +msgid "&apt-cache;, &apt-config;, &apt-preferences;." +msgstr "&apt-cache;, &apt-config;, &apt-preferences;." + +#. The last update date +#. type: Content of: <refentry><refentryinfo> +#: apt_preferences.5.xml:13 +msgid "" +"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>" +msgstr "" +"&apt-author.team; &apt-email; &apt-product; <date>16 Fevereiro 2010</date>" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt_preferences.5.xml:21 apt_preferences.5.xml:28 +msgid "apt_preferences" +msgstr "apt_preferences" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt_preferences.5.xml:29 +msgid "Preference control file for APT" +msgstr "Ficheiro de controle de preferências para o APT" + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:34 +msgid "" +"The APT preferences file <filename>/etc/apt/preferences</filename> and the " +"fragment files in the <filename>/etc/apt/preferences.d/</filename> folder " +"can be used to control which versions of packages will be selected for " +"installation." +msgstr "" +"O ficheiro de preferências do APT <filename>/etc/apt/preferences</filename> " +"e os ficheiros fragmentados no directório <filename>/etc/apt/preferences.d/</" +"filename> podem ser usados para controlar quais as versões de pacotes irão " +"ser seleccionadas para instalação." + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:39 +msgid "" +"Several versions of a package may be available for installation when the " +"&sources-list; file contains references to more than one distribution (for " +"example, <literal>stable</literal> and <literal>testing</literal>). APT " +"assigns a priority to each version that is available. Subject to dependency " +"constraints, <command>apt-get</command> selects the version with the highest " +"priority for installation. The APT preferences file overrides the " +"priorities that APT assigns to package versions by default, thus giving the " +"user control over which one is selected for installation." +msgstr "" +"Várias versões de um pacote podem estar disponíveis para instalação quando o " +"ficheiro &sources-list; contém referências a mais do que uma distribuição " +"(por exemplo, <literal>stable</literal> e <literal>testing</literal>). O APT " +"atribui uma prioridade a cada versão que está disponível. Sujeito a " +"constrangimentos de dependências, o <command>apt-get</command> selecciona a " +"versão com a prioridade mais alta para instalação. O ficheiro de " +"preferências do APT sobrepõe as prioridades que o APT atribui às versões de " +"pacotes por predefinição, assim dando controle ao utilizador sobre qual é " +"seleccionado para instalação." + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:49 +msgid "" +"Several instances of the same version of a package may be available when the " +"&sources-list; file contains references to more than one source. In this " +"case <command>apt-get</command> downloads the instance listed earliest in " +"the &sources-list; file. The APT preferences file does not affect the " +"choice of instance, only the choice of version." +msgstr "" +"Podem estar disponíveis várias instâncias da mesma versão de um pacote " +"quando o ficheiro &sources-list; contém referências a mais do que uma fonte. " +"Neste caso o <command>apt-get</command> descarrega a instância listada mais " +"cedo no ficheiro &sources-list;. O ficheiro de preferências do APT não " +"afecta a escolha da instância, apenas a escolha da versão." + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:56 +msgid "" +"Preferences are a strong power in the hands of a system administrator but " +"they can become also their biggest nightmare if used without care! APT will " +"not questioning the preferences so wrong settings will therefore lead to " +"uninstallable packages or wrong decisions while upgrading packages. Even " +"more problems will arise if multiply distribution releases are mixed without " +"a good understanding of the following paragraphs. Packages included in a " +"specific release aren't tested in and therefore doesn't always work as " +"expected in older or newer releases or together with other packages from " +"different releases. You have been warned." +msgstr "" +"As preferências são um poder forte nas mãos de um administrador de sistemas " +"mas também se podem tornar no seu maior pesadelo se forem usadas sem " +"cuidado! O APT não irá questionar as preferências, portanto as definições " +"erradas irão acabar em pacotes não instaláveis ou decisões erradas ao " +"actualizar pacotes. Irão surgir ainda mais problemas se forem misturadas " +"múltiplas distribuições sem o perfeito entendimento dos parágrafos " +"seguintes. Os pacotes incluídos num lançamento específico não são testados e " +"por isso nem sempre funcionam como esperado nos lançamentos mais antigos ou " +"recentes ou em conjunto com outros pacotes de lançamentos diferentes. Você " +"foi avisado." + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:67 +msgid "" +"Note that the files in the <filename>/etc/apt/preferences.d</filename> " +"directory are parsed in alphanumeric ascending order and need to obey the " +"following naming convention: The files have no or \"<literal>pref</literal>" +"\" as filename extension and which only contain alphanumeric, hyphen (-), " +"underscore (_) and period (.) characters - otherwise they will be silently " +"ignored." +msgstr "" +"Note que os ficheiros no directório <filename>/etc/apt/preferences.d</" +"filename> são analisados em ordem alfanumérica ascendente e precisam " +"obedecer à convenção de nomes seguinte: Os ficheiros não têm extensão ou têm " +"\"<literal>pref</literal>\" na extensão do nome de ficheiro e os quais " +"apenas contêm caracteres alfanuméricos, traço (-), underscore (_) e ponto " +"(.) - caso contrário serão ignorados em silêncio." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:74 +msgid "APT's Default Priority Assignments" +msgstr "Atribuições de Prioridade Predefinidas do APT" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:89 +#, no-wrap +msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" +msgstr "<command>apt-get install -t testing <replaceable>algum-pacote</replaceable></command>\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:92 +#, no-wrap +msgid "APT::Default-Release \"stable\";\n" +msgstr "APT::Default-Release \"stable\";\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:76 +msgid "" +"If there is no preferences file or if there is no entry in the file that " +"applies to a particular version then the priority assigned to that version " +"is the priority of the distribution to which that version belongs. It is " +"possible to single out a distribution, \"the target release\", which " +"receives a higher priority than other distributions do by default. The " +"target release can be set on the <command>apt-get</command> command line or " +"in the APT configuration file <filename>/etc/apt/apt.conf</filename>. Note " +"that this has precedence over any general priority you set in the <filename>/" +"etc/apt/preferences</filename> file described later, but not over " +"specifically pinned packages. For example, <placeholder type=" +"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>" +msgstr "" +"Senão existir um ficheiro de preferências ou se não existe uma entrada no " +"ficheiro que se aplique a uma versão particular então a prioridade atribuída " +"a essa versão é a prioridade da distribuição à qual essa versão pertence. É " +"possível definir uma distribuição singular, \"o lançamento de destino\", a " +"qual recebe uma prioridade mais alta que as outras distribuições por " +"predefinição. O lançamento de destino pode ser definido na linha de comandos " +"do <command>apt-get</command> ou no ficheiro de configuração do APT " +"<filename>/etc/apt/apt.conf</filename>. Note que isto tem precedências sobre " +"qualquer prioridade geral que possa definir no ficheiro <filename>/etc/apt/" +"preferences</filename> descrito mais tarde, mas não sobre pacotes " +"especificamente imobilizados. Por exemplo, <placeholder type=\"programlisting" +"\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:101 +msgid "priority 100" +msgstr "priority 100" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:102 +msgid "to the version that is already installed (if any)." +msgstr "para a versão que já está instalada (se alguma)." + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:106 +msgid "priority 500" +msgstr "priority 500" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:107 +msgid "" +"to the versions that are not installed and do not belong to the target " +"release." +msgstr "" +"para as versões que não estão instaladas e não pertencem ao lançamento " +"destinado." + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:111 +msgid "priority 990" +msgstr "priority 990" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:112 +msgid "" +"to the versions that are not installed and belong to the target release." +msgstr "" +"para as versões que não estão instaladas e pertencem ao lançamento destinado." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:96 +msgid "" +"If the target release has been specified then APT uses the following " +"algorithm to set the priorities of the versions of a package. Assign: " +"<placeholder type=\"variablelist\" id=\"0\"/>" +msgstr "" +"Se o lançamento destinado foi especificado, então o APT usa o seguinte " +"algoritmo para definir as prioridades das versões de um pacote. Atribuir: " +"<placeholder type=\"variablelist\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:117 +msgid "" +"If the target release has not been specified then APT simply assigns " +"priority 100 to all installed package versions and priority 500 to all " +"uninstalled package versions." +msgstr "" +"Se o lançamento destinado não foi especificado, então o APT simplesmente " +"atribui prioridade 100 a todas as versões de pacotes instalados e prioridade " +"500 e todas as versões de pacotes não instalados." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:121 +msgid "" +"APT then applies the following rules, listed in order of precedence, to " +"determine which version of a package to install." +msgstr "" +"O APT então aplica as seguintes regras, listadas em ordem de precedência, " +"para determinar qual versão de um pacote deve instalar." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:124 +msgid "" +"Never downgrade unless the priority of an available version exceeds 1000. " +"(\"Downgrading\" is installing a less recent version of a package in place " +"of a more recent version. Note that none of APT's default priorities " +"exceeds 1000; such high priorities can only be set in the preferences file. " +"Note also that downgrading a package can be risky.)" +msgstr "" +"Nunca faz downgrade a menos que uma versão disponível exceda 1000. " +"(\"Downgrading\" é instalar uma versão menos recente de um pacote no lugar " +"de uma versão mais recente. Note que nenhuma das prioridades predefinidas do " +"APT excede 1000; tais altas prioridades só podem ser definidas no ficheiro " +"de preferências. Note também que fazer o downgrade a um pacote pode ser " +"arriscado.)" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:130 +msgid "Install the highest priority version." +msgstr "Instala a versão de prioridade mais alta." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:131 +msgid "" +"If two or more versions have the same priority, install the most recent one " +"(that is, the one with the higher version number)." +msgstr "" +"Se duas ou mais versões tiverem a mesma prioridade, instala a mais recente " +"(isto é, aquela com o número de versão mais alto)." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:134 +msgid "" +"If two or more versions have the same priority and version number but either " +"the packages differ in some of their metadata or the <literal>--reinstall</" +"literal> option is given, install the uninstalled one." +msgstr "" +"Se duas ou mais versões têm a mesma prioridade e o mesmo número de versão " +"mas ou os pacotes diferem em alguns dos seus metadados ou a opção <literal>--" +"reinstall</literal> é fornecida, instala a que foi desinstalada." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:140 +msgid "" +"In a typical situation, the installed version of a package (priority 100) " +"is not as recent as one of the versions available from the sources listed in " +"the &sources-list; file (priority 500 or 990). Then the package will be " +"upgraded when <command>apt-get install <replaceable>some-package</" +"replaceable></command> or <command>apt-get upgrade</command> is executed." +msgstr "" +"Numa situação típica, a versão instalada de um pacote (prioridade 100) não é " +"tão recente como uma das versões disponíveis nas fontes listadas no ficheiro " +"&sources-list; (prioridade 500 ou 990). Então o pacote será actualizado " +"quando for executado <command>apt-get install <replaceable>algum-pacote</" +"replaceable></command> ou <command>apt-get upgrade</command>." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:147 +msgid "" +"More rarely, the installed version of a package is <emphasis>more</emphasis> " +"recent than any of the other available versions. The package will not be " +"downgraded when <command>apt-get install <replaceable>some-package</" +"replaceable></command> or <command>apt-get upgrade</command> is executed." +msgstr "" +"Mais raramente, a versão instalada de um pacote é <emphasis>mais</emphasis> " +"recente que qualquer das outras versões disponíveis. O pacote não será " +"regredido para uma versão inferior quando for executado <command>apt-get " +"install <replaceable>algum-pacote</replaceable></command> ou <command>apt-" +"get upgrade</command>." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:152 +msgid "" +"Sometimes the installed version of a package is more recent than the version " +"belonging to the target release, but not as recent as a version belonging to " +"some other distribution. Such a package will indeed be upgraded when " +"<command>apt-get install <replaceable>some-package</replaceable></command> " +"or <command>apt-get upgrade</command> is executed, because at least " +"<emphasis>one</emphasis> of the available versions has a higher priority " +"than the installed version." +msgstr "" +"Por vezes a versão instalada de um pacote é mais recente que a versão " +"pertencente ao lançamento de destino, mas não tão recente que uma versão " +"pertencente a alguma outra distribuição. Tal pacote será de facto " +"actualizado quando for executado <command>apt-get install <replaceable>algum-" +"pacote</replaceable></command> ou <command>apt-get upgrade</command>, porque " +"pelo menos <emphasis>uma</emphasis> das versões disponíveis tem uma " +"prioridade mais alta que a versão instalada." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:161 +msgid "The Effect of APT Preferences" +msgstr "O Efeito das Preferências do APT" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:163 +msgid "" +"The APT preferences file allows the system administrator to control the " +"assignment of priorities. The file consists of one or more multi-line " +"records separated by blank lines. Records can have one of two forms, a " +"specific form and a general form." +msgstr "" +"O ficheiro de preferências do APT permite ao administrador do sistema " +"controlar a atribuição de prioridades. O ficheiro consiste em um ou mais " +"registos de multi-linhas separados por linhas vazias. Os registos podem ter " +"um ou dois formatos, um formato específico e um formato geral." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:169 +msgid "" +"The specific form assigns a priority (a \"Pin-Priority\") to one or more " +"specified packages and specified version or version range. For example, the " +"following record assigns a high priority to all versions of the " +"<filename>perl</filename> package whose version number begins with " +"\"<literal>5.8</literal>\". Multiple packages can be separated by spaces." +msgstr "" +"O formato específico atribui um prioridade (um \"Pin-Priority\") a um ou " +"mais pacotes específicos e versão específica ou série de versões. Por " +"exemplo, o seguinte registo atribui uma alta prioridade a todas as versões " +"do pacote <filename>perl</filename> cujo número de versão começa com " +"\"<literal>5.8</literal>\". Múltiplos pacotes podem ser separados por " +"espaços." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#: apt_preferences.5.xml:176 +#, no-wrap +msgid "" +"Package: perl\n" +"Pin: version 5.8*\n" +"Pin-Priority: 1001\n" +msgstr "" +"Package: perl\n" +"Pin: version 5.8*\n" +"Pin-Priority: 1001\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:182 +msgid "" +"The general form assigns a priority to all of the package versions in a " +"given distribution (that is, to all the versions of packages that are listed " +"in a certain <filename>Release</filename> file) or to all of the package " +"versions coming from a particular Internet site, as identified by the site's " +"fully qualified domain name." +msgstr "" +"O formato geral atribui uma prioridade a todas as versões de pacotes numa " +"dada distribuição (isto é, a todas as versões de pacotes que estão listados " +"num certo ficheiro <filename>Release</filename>) ou a todas as versões de " +"pacotes vindos de um site de Internet particular, como identificado pelo " +"nome de domínio totalmente qualificado do site." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:188 +msgid "" +"This general-form entry in the APT preferences file applies only to groups " +"of packages. For example, the following record assigns a high priority to " +"all package versions available from the local site." +msgstr "" +"Esta entrada general-form no ficheiro de preferências do APT aplica-se " +"apenas a grupos de pacotes. Por exemplo, o seguinte registo atribui uma alta " +"prioridade a todas as versões de pacotes disponíveis a partir de um site " +"local." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#: apt_preferences.5.xml:193 +#, no-wrap +msgid "" +"Package: *\n" +"Pin: origin \"\"\n" +"Pin-Priority: 999\n" +msgstr "" +"Package: *\n" +"Pin: origin \"\"\n" +"Pin-Priority: 999\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:198 +msgid "" +"A note of caution: the keyword used here is \"<literal>origin</literal>\". " +"This should not be confused with the Origin of a distribution as specified " +"in a <filename>Release</filename> file. What follows the \"Origin:\" tag in " +"a <filename>Release</filename> file is not an Internet address but an author " +"or vendor name, such as \"Debian\" or \"Ximian\"." +msgstr "" +"Uma nota de atenção: a palavra chave usada aqui é \"<literal>origin</literal>" +"\". Isto não deve ser confundido com a Origem de uma distribuição como " +"especificada num ficheiro <filename>Release</filename>. O que representa a " +"etiqueta \"Origin:\" num ficheiro <filename>Release</filename> não é um " +"endereço de Internet mas um nome de autor ou marca, tal como \"Debian\" ou " +"\"Ximian\"." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:204 +msgid "" +"The following record assigns a low priority to all package versions " +"belonging to any distribution whose Archive name is \"<literal>unstable</" +"literal>\"." +msgstr "" +"O seguinte registo atribui uma baixa prioridade a todas as versões de " +"pacotes pertencentes a qualquer distribuição cujo nome de Arquivo é " +"\"<literal>unstable</literal>\"." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#: apt_preferences.5.xml:208 +#, no-wrap +msgid "" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 50\n" +msgstr "" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 50\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:213 +msgid "" +"The following record assigns a high priority to all package versions " +"belonging to any distribution whose Codename is \"<literal>squeeze</literal>" +"\"." +msgstr "" +"O seguinte registo atribui uma alta prioridade a todas as versões de pacotes " +"pertencentes a qualquer distribuição cujo nome de código é " +"\"<literal>squeeze</literal>\"." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#: apt_preferences.5.xml:217 +#, no-wrap +msgid "" +"Package: *\n" +"Pin: release n=squeeze\n" +"Pin-Priority: 900\n" +msgstr "" +"Package: *\n" +"Pin: release n=squeeze\n" +"Pin-Priority: 900\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:222 +msgid "" +"The following record assigns a high priority to all package versions " +"belonging to any release whose Archive name is \"<literal>stable</literal>\" " +"and whose release Version number is \"<literal>3.0</literal>\"." +msgstr "" +"O seguinte registo atribui alta prioridade a todas as versões de pacotes " +"pertencentes a qualquer lançamento cujo nome de Arquivo é \"<literal>stable</" +"literal>\" e cujo número de Versão de lançamento é \"<literal>3.0</literal>" +"\"." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#: apt_preferences.5.xml:227 +#, no-wrap +msgid "" +"Package: *\n" +"Pin: release a=stable, v=3.0\n" +"Pin-Priority: 500\n" +msgstr "" +"Package: *\n" +"Pin: release a=stable, v=3.0\n" +"Pin-Priority: 500\n" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:238 +msgid "How APT Interprets Priorities" +msgstr "Como o APT Interpreta as Prioridades" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:246 +msgid "P > 1000" +msgstr "P > 1000" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:247 +msgid "" +"causes a version to be installed even if this constitutes a downgrade of the " +"package" +msgstr "" +"provoca que uma versão seja instalada mesmo que isso constitua uma redução " +"na versão do pacote (downgrade)" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:251 +msgid "990 < P <=1000" +msgstr "990 < P <=1000" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:252 +msgid "" +"causes a version to be installed even if it does not come from the target " +"release, unless the installed version is more recent" +msgstr "" +"provoca que uma versão seja instalada mesmo que não venha do lançamento de " +"destino, a menos que a versão instalada seja mais recente" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:257 +msgid "500 < P <=990" +msgstr "500 < P <=990" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:258 +msgid "" +"causes a version to be installed unless there is a version available " +"belonging to the target release or the installed version is more recent" +msgstr "" +"provoca que uma versão seja instalada a menos que exista uma versão " +"disponível pertencente ao lançamento de destino ou se a versão instalada é " +"mais recente" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:263 +msgid "100 < P <=500" +msgstr "100 < P <=500" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:264 +msgid "" +"causes a version to be installed unless there is a version available " +"belonging to some other distribution or the installed version is more recent" +msgstr "" +"provoca que uma versão seja instalada a menos que exista uma versão " +"disponível pertencente a outra distribuição ou se a versão instalada é mais " +"recente" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:269 +msgid "0 < P <=100" +msgstr "0 < P <=100" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:270 +msgid "" +"causes a version to be installed only if there is no installed version of " +"the package" +msgstr "" +"provoca que uma versão seja instalada apenas se não existir nenhuma versão " +"instalada do pacote" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:274 +msgid "P < 0" +msgstr "P < 0" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:275 +msgid "prevents the version from being installed" +msgstr "previne a instalação da versão" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:241 +msgid "" +"Priorities (P) assigned in the APT preferences file must be positive or " +"negative integers. They are interpreted as follows (roughly speaking): " +"<placeholder type=\"variablelist\" id=\"0\"/>" +msgstr "" +"As prioridades (P) atribuídas no ficheiro de preferências do APT têm de ser " +"inteiros positivos ou negativos. Elas são interpretadas como o seguinte " +"(falando grosso): <placeholder type=\"variablelist\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:280 +msgid "" +"If any specific-form records match an available package version then the " +"first such record determines the priority of the package version. Failing " +"that, if any general-form records match an available package version then " +"the first such record determines the priority of the package version." +msgstr "" +"Se quaisquer registos de formato específico corresponder a uma versão de " +"pacote disponível então o primeiro tal registo determina a prioridade da " +"versão do pacote. Falhando isso, se quaisquer registos em formato geral " +"corresponder a uma versão de pacote disponível então o primeiro tal registo " +"determina a prioridade da versão de pacote." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:286 +msgid "" +"For example, suppose the APT preferences file contains the three records " +"presented earlier:" +msgstr "" +"Por exemplo, suponha que o ficheiro de preferências do APT contém os três " +"registos apresentados atrás:" + +#. type: Content of: <refentry><refsect1><refsect2><programlisting> +#: apt_preferences.5.xml:290 +#, no-wrap +msgid "" +"Package: perl\n" +"Pin: version 5.8*\n" +"Pin-Priority: 1001\n" +"\n" +"Package: *\n" +"Pin: origin \"\"\n" +"Pin-Priority: 999\n" +"\n" +"Package: *\n" +"Pin: release unstable\n" +"Pin-Priority: 50\n" +msgstr "" +"Package: perl\n" +"Pin: version 5.8*\n" +"Pin-Priority: 1001\n" +"\n" +"Package: *\n" +"Pin: origin \"\"\n" +"Pin-Priority: 999\n" +"\n" +"Package: *\n" +"Pin: release unstable\n" +"Pin-Priority: 50\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:303 +msgid "Then:" +msgstr "Então:" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:305 +msgid "" +"The most recent available version of the <literal>perl</literal> package " +"will be installed, so long as that version's version number begins with " +"\"<literal>5.8</literal>\". If <emphasis>any</emphasis> 5.8* version of " +"<literal>perl</literal> is available and the installed version is 5.9*, then " +"<literal>perl</literal> will be downgraded." +msgstr "" +"Será instalada a versão mais recente disponível do pacote <literal>perl</" +"literal>, desde que o número da versão comece com \"<literal>5.8</literal>" +"\". Se <emphasis>qualquer</emphasis> versão 5.8* do <literal>perl</literal> " +"estiver disponível e a versão instalada for 5.9*, então será feito um " +"downgrade ao <literal>perl</literal>." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:310 +msgid "" +"A version of any package other than <literal>perl</literal> that is " +"available from the local system has priority over other versions, even " +"versions belonging to the target release." +msgstr "" +"Uma versão de qualquer pacote que não seja o <literal>perl</literal> e que " +"esteja disponível a partir do sistema local tem prioridade sobre outras " +"versões, mesmo versões que pertencem ao lançamento de destino." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:314 +msgid "" +"A version of a package whose origin is not the local system but some other " +"site listed in &sources-list; and which belongs to an <literal>unstable</" +"literal> distribution is only installed if it is selected for installation " +"and no version of the package is already installed." +msgstr "" +"Uma versão de um pacote cuja origem não é o sistema local mas qualquer outro " +"site listado em &sources-list; e o qual pertence a uma distribuição " +"<literal>unstable</literal> apenas é instalado se for seleccionado para " +"instalação e se nenhuma versão do pacote já estiver instalada." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:324 +msgid "Determination of Package Version and Distribution Properties" +msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:326 +msgid "" +"The locations listed in the &sources-list; file should provide " +"<filename>Packages</filename> and <filename>Release</filename> files to " +"describe the packages available at that location." +msgstr "" +"As localizações listadas no ficheiro &sources-list; devem fornecer os " +"ficheiros <filename>Packages</filename> e <filename>Release</filename> para " +"descrever os pacotes disponíveis nessa localização." + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:338 +msgid "the <literal>Package:</literal> line" +msgstr "a linha <literal>Package:</literal>" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:339 +msgid "gives the package name" +msgstr "fornece o nome do pacote" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:342 apt_preferences.5.xml:392 +msgid "the <literal>Version:</literal> line" +msgstr "a linha <literal>Version:</literal>" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:343 +msgid "gives the version number for the named package" +msgstr "fornece o número de versão do pacote nomeado" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:330 +msgid "" +"The <filename>Packages</filename> file is normally found in the directory " +"<filename>.../dists/<replaceable>dist-name</replaceable>/" +"<replaceable>component</replaceable>/<replaceable>arch</replaceable></" +"filename>: for example, <filename>.../dists/stable/main/binary-i386/" +"Packages</filename>. It consists of a series of multi-line records, one for " +"each package available in that directory. Only two lines in each record are " +"relevant for setting APT priorities: <placeholder type=\"variablelist\" id=" +"\"0\"/>" +msgstr "" +"O ficheiro <filename>Packages</filename> é normalmente encontrado no " +"directório <filename>.../dists/<replaceable>nome-da-distribuição</" +"replaceable>/<replaceable>componente</replaceable>/" +"<replaceable>arquitectura</replaceable></filename>: por exemplo, " +"<filename>.../dists/stable/main/binary-i386/Packages</filename>. Consiste " +"numa série de registos de várias linhas, um para cada pacote disponível " +"nesse directório. Apenas duas linhas em cada registo são relevantes para " +"definir prioridades do APT: <placeholder type=\"variablelist\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:359 +msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" +msgstr "a linha <literal>Archive:</literal> ou <literal>Suite:</literal>" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:360 +msgid "" +"names the archive to which all the packages in the directory tree belong. " +"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " +"that all of the packages in the directory tree below the parent of the " +"<filename>Release</filename> file are in a <literal>stable</literal> " +"archive. Specifying this value in the APT preferences file would require " +"the line:" +msgstr "" +"nomeia o arquivo ao qual pertencem todos os pacotes na árvore de " +"directórios. Por exemplo, a linha \"Archive: stable\" ou \"Suite: stable\" " +"especifica que todos os pacotes na árvore de directórios abaixo do pai do " +"ficheiro <filename>Release</filename> estão num arquivo <literal>stable</" +"literal>. Especificar este valor no ficheiro de preferências do APT irá " +"requerer a linha:" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:370 +#, no-wrap +msgid "Pin: release a=stable\n" +msgstr "Pin: release a=stable\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:376 +msgid "the <literal>Codename:</literal> line" +msgstr "a linha <literal>Codename:</literal>" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:377 +msgid "" +"names the codename to which all the packages in the directory tree belong. " +"For example, the line \"Codename: squeeze\" specifies that all of the " +"packages in the directory tree below the parent of the <filename>Release</" +"filename> file belong to a version named <literal>squeeze</literal>. " +"Specifying this value in the APT preferences file would require the line:" +msgstr "" +"nomeia o nome de código a qual todos os pacotes na árvore de directórios " +"pertencem. Por exemplo, a linha \"Codename: squeeze\" especifica que todos " +"os pacotes na árvore de directórios abaixo do pai do ficheiro " +"<filename>Release</filename> pertencem a uma versão chamada " +"<literal>squeeze</literal>. Especificar este valor no ficheiro de " +"preferências do APT requer a linha:" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:386 +#, no-wrap +msgid "Pin: release n=squeeze\n" +msgstr "Pin: release n=squeeze\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:393 +msgid "" +"names the release version. For example, the packages in the tree might " +"belong to Debian GNU/Linux release version 3.0. Note that there is normally " +"no version number for the <literal>testing</literal> and <literal>unstable</" +"literal> distributions because they have not been released yet. Specifying " +"this in the APT preferences file would require one of the following lines." +msgstr "" +"nomeia a versão de lançamento. Por exemplo, os pacotes na árvore podem " +"pertencer ao lançamento de Debian GNU/Linux versão 3.0. Note que não há " +"normalmente um número de versão para as distribuições <literal>testing</" +"literal> e <literal>unstable</literal>. porque ainda não foram lançadas. " +"Especificar isto no ficheiro de preferências do APT irá requerer uma das " +"seguintes linhas:" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:402 +#, no-wrap +msgid "" +"Pin: release v=3.0\n" +"Pin: release a=stable, v=3.0\n" +"Pin: release 3.0\n" +msgstr "" +"Pin: release v=3.0\n" +"Pin: release a=stable, v=3.0\n" +"Pin: release 3.0\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:411 +msgid "the <literal>Component:</literal> line" +msgstr "a linha <literal>Component:</literal>" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:412 +msgid "" +"names the licensing component associated with the packages in the directory " +"tree of the <filename>Release</filename> file. For example, the line " +"\"Component: main\" specifies that all the packages in the directory tree " +"are from the <literal>main</literal> component, which entails that they are " +"licensed under terms listed in the Debian Free Software Guidelines. " +"Specifying this component in the APT preferences file would require the line:" +msgstr "" +"nomeia o componente de licenciamento associado com os pacotes na árvore de " +"directórios do ficheiro <filename>Release</filename>. Por exemplo, a linha " +"\"Component: main\" especifica que todos os pacotes na árvore de directórios " +"são do componente <literal>main</literal>, o que implica que estão " +"licenciados sob os termos listados em Debian Free Software Guidelines. " +"Especificar este componente no ficheiro de preferências do APT irá requerer " +"a linha:" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:421 +#, no-wrap +msgid "Pin: release c=main\n" +msgstr "Pin: release c=main\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:427 +msgid "the <literal>Origin:</literal> line" +msgstr "a linha <literal>Origin:</literal>" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:428 +msgid "" +"names the originator of the packages in the directory tree of the " +"<filename>Release</filename> file. Most commonly, this is <literal>Debian</" +"literal>. Specifying this origin in the APT preferences file would require " +"the line:" +msgstr "" +"nomeia a originador dos pacotes na árvore de directórios do ficheiro " +"<filename>Release</filename>. Geralmente, isto é <literal>Debian</literal>. " +"Especificar esta etiqueta no ficheiro de preferências do APT irá requerer a " +"linha:" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:434 +#, no-wrap +msgid "Pin: release o=Debian\n" +msgstr "Pin: release o=Debian\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:440 +msgid "the <literal>Label:</literal> line" +msgstr "a linha <literal>Label:</literal>" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:441 +msgid "" +"names the label of the packages in the directory tree of the " +"<filename>Release</filename> file. Most commonly, this is <literal>Debian</" +"literal>. Specifying this label in the APT preferences file would require " +"the line:" +msgstr "" +"nomeia a etiqueta dos pacotes na árvore de directórios do ficheiro " +"<filename>Release</filename>. Geralmente, isto é <literal>Debian</literal>. " +"Especificar esta etiqueta no ficheiro de preferências do APT irá requerer a " +"linha:" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:447 +#, no-wrap +msgid "Pin: release l=Debian\n" +msgstr "Pin: release l=Debian\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:348 +msgid "" +"The <filename>Release</filename> file is normally found in the directory " +"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " +"example, <filename>.../dists/stable/Release</filename>, or <filename>.../" +"dists/woody/Release</filename>. It consists of a single multi-line record " +"which applies to <emphasis>all</emphasis> of the packages in the directory " +"tree below its parent. Unlike the <filename>Packages</filename> file, " +"nearly all of the lines in a <filename>Release</filename> file are relevant " +"for setting APT priorities: <placeholder type=\"variablelist\" id=\"0\"/>" +msgstr "" +"O ficheiro <filename>Release</filename> fica normalmente no directório " +"<filename>.../dists/<replaceable>nome da distribuição</replaceable></" +"filename>: por exemplo, <filename>.../dists/stable/Release</filename>, ou " +"<filename>.../dists/woody/Release</filename>. Consiste num único registo de " +"várias linhas que se aplica a <emphasis>todos</emphasis> os pacotes na " +"árvore de directórios sob o seu pai. Ao contrário do ficheiro " +"<filename>Packages</filename>, quase todas as linhas num ficheiro " +"<filename>Release</filename> são relevantes para definir as prioridades do " +"APT: <placeholder type=\"variablelist\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:454 +msgid "" +"All of the <filename>Packages</filename> and <filename>Release</filename> " +"files retrieved from locations listed in the &sources-list; file are stored " +"in the directory <filename>/var/lib/apt/lists</filename>, or in the file " +"named by the variable <literal>Dir::State::Lists</literal> in the " +"<filename>apt.conf</filename> file. For example, the file <filename>debian." +"lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release</filename> " +"contains the <filename>Release</filename> file retrieved from the site " +"<literal>debian.lcs.mit.edu</literal> for <literal>binary-i386</literal> " +"architecture files from the <literal>contrib</literal> component of the " +"<literal>unstable</literal> distribution." +msgstr "" +"Todos os ficheiros <filename>Packages</filename> e <filename>Release</" +"filename> obtidos das localizações listadas no ficheiro &sources-list; são " +"armazenados no directório <filename>/var/lib/apt/lists</filename>, ou no " +"ficheiro nomeado pela variável <literal>Dir::State::Lists</literal> no " +"ficheiro <filename>apt.conf</filename>. Por exemplo, o ficheiro " +"<filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-" +"i386_Release</filename> contém o ficheiro <filename>Release</filename> " +"obtido do site <literal>debian.lcs.mit.edu</literal> para ficheiros da " +"arquitectura <literal>binary-i386</literal> do componente <literal>contrib</" +"literal> da distribuição <literal>unstable</literal>." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:467 +msgid "Optional Lines in an APT Preferences Record" +msgstr "Linhas Opcionais num Registo de Preferências do APT" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:469 +msgid "" +"Each record in the APT preferences file can optionally begin with one or " +"more lines beginning with the word <literal>Explanation:</literal>. This " +"provides a place for comments." +msgstr "" +"Cada registo no ficheiro de preferências do APT por começar opcionalmente " +"com uma ou mais linhas começadas com a palavra <literal>Explanation:</" +"literal>. Isto disponibiliza um espaço para comentários." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:473 +msgid "" +"The <literal>Pin-Priority:</literal> line in each APT preferences record is " +"optional. If omitted, APT assigns a priority of 1 less than the last value " +"specified on a line beginning with <literal>Pin-Priority: release ...</" +"literal>." +msgstr "" +"A linha <literal>Pin-Priority:</literal> em cada registo de preferências do " +"APT é opcional. Se omitida, o APT atribui uma prioridade de 1 a menos do " +"último valor especificado numa linha que começa com <literal>Pin-Priority: " +"release ...</literal>." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:482 +msgid "Tracking Stable" +msgstr "Acompanhando Stable" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:490 +#, no-wrap +msgid "" +"Explanation: Uninstall or do not install any Debian-originated\n" +"Explanation: package versions other than those in the stable distro\n" +"Package: *\n" +"Pin: release a=stable\n" +"Pin-Priority: 900\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" +msgstr "" +"Explicação: Desinstala ou não instala quaisquer versões de pacotes originais\n" +"Explicação: Debian para além daquelas da distribuição stable\n" +"Package: *\n" +"Pin: release a=stable\n" +"Pin-Priority: 900\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:484 +msgid "" +"The following APT preferences file will cause APT to assign a priority " +"higher than the default (500) to all package versions belonging to a " +"<literal>stable</literal> distribution and a prohibitively low priority to " +"package versions belonging to other <literal>Debian</literal> " +"distributions. <placeholder type=\"programlisting\" id=\"0\"/>" +msgstr "" +"O seguinte ficheiro de preferências do APT irá fazer com que o APT atribua " +"uma prioridade mais alta que o predefinido (500) a todos as versões de " +"pacotes que pertencem a uma distribuição <literal>stable</literal> e uma " +"prioridade proibitivamente baixa a versões de pacotes pertencentes a outras " +"distribuições <literal>Debian</literal>. <placeholder type=\"programlisting" +"\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:507 apt_preferences.5.xml:553 +#: apt_preferences.5.xml:611 +#, no-wrap +msgid "" +"apt-get install <replaceable>package-name</replaceable>\n" +"apt-get upgrade\n" +"apt-get dist-upgrade\n" +msgstr "" +"apt-get install <replaceable>nome-do-pacote</replaceable>\n" +"apt-get upgrade\n" +"apt-get dist-upgrade\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:502 +msgid "" +"With a suitable &sources-list; file and the above preferences file, any of " +"the following commands will cause APT to upgrade to the latest " +"<literal>stable</literal> version(s). <placeholder type=\"programlisting\" " +"id=\"0\"/>" +msgstr "" +"Com um ficheiro &sources-list; apropriado e o ficheiro de preferências " +"acima, qualquer dos seguintes comandos irá fazer com que o APT actualize " +"para as versões <literal>stable</literal> mais recentes. <placeholder type=" +"\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:519 +#, no-wrap +msgid "apt-get install <replaceable>package</replaceable>/testing\n" +msgstr "apt-get install <replaceable>pacote</replaceable>/testing\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:513 +msgid "" +"The following command will cause APT to upgrade the specified package to the " +"latest version from the <literal>testing</literal> distribution; the package " +"will not be upgraded again unless this command is given again. <placeholder " +"type=\"programlisting\" id=\"0\"/>" +msgstr "" +"O seguinte comandos irá fazer com que o APT actualize o pacote especificado " +"para a versão mais recente da distribuição <literal>testing</literal>; o " +"pacote não será actualizado de novo a menos que seja executado este comando " +"outra vez. <placeholder type=\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:525 +msgid "Tracking Testing or Unstable" +msgstr "Acompanhando Testing ou Unstable" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:534 +#, no-wrap +msgid "" +"Package: *\n" +"Pin: release a=testing\n" +"Pin-Priority: 900\n" +"\n" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 800\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" +msgstr "" +"Package: *\n" +"Pin: release a=testing\n" +"Pin-Priority: 900\n" +"\n" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 800\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:527 +msgid "" +"The following APT preferences file will cause APT to assign a high priority " +"to package versions from the <literal>testing</literal> distribution, a " +"lower priority to package versions from the <literal>unstable</literal> " +"distribution, and a prohibitively low priority to package versions from " +"other <literal>Debian</literal> distributions. <placeholder type=" +"\"programlisting\" id=\"0\"/>" +msgstr "" +"O seguinte ficheiro de preferências do APT irá fazer com que o APT atribua " +"uma prioridade alta a versões de pacotes da distribuição <literal>testing</" +"literal>, uma prioridade mais baixa a versões de pacotes da distribuição " +"<literal>unstable</literal>, e uma prioridade proibitivamente baixa a " +"versões de pacotes de outras distribuições <literal>Debian</literal>. " +"<placeholder type=\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:548 +msgid "" +"With a suitable &sources-list; file and the above preferences file, any of " +"the following commands will cause APT to upgrade to the latest " +"<literal>testing</literal> version(s). <placeholder type=\"programlisting\" " +"id=\"0\"/>" +msgstr "" +"Com um ficheiro &sources-list; apropriado e o ficheiro de preferências " +"acima, qualquer dos seguintes comandos irá fazer com que o APT actualize " +"para as versões <literal>testing</literal> mais recentes. <placeholder type=" +"\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:568 +#, no-wrap +msgid "apt-get install <replaceable>package</replaceable>/unstable\n" +msgstr "apt-get install <replaceable>pacote</replaceable>/unstable\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:559 +msgid "" +"The following command will cause APT to upgrade the specified package to the " +"latest version from the <literal>unstable</literal> distribution. " +"Thereafter, <command>apt-get upgrade</command> will upgrade the package to " +"the most recent <literal>testing</literal> version if that is more recent " +"than the installed version, otherwise, to the most recent <literal>unstable</" +"literal> version if that is more recent than the installed version. " +"<placeholder type=\"programlisting\" id=\"0\"/>" +msgstr "" +"O comando seguinte irá fazer com que o APT actualize o pacote especificado " +"para a versão mais recente da distribuição <literal>unstable</literal>. " +"Posteriormente, o <command>apt-get upgrade</command> irá actualizar o pacote " +"para a versão <literal>testing</literal> mais recente se essa for mais " +"recente que a versão instalada, caso contrário, para a versão " +"<literal>unstable</literal> mais recente se essa for mais recente que a " +"versão instalada. <placeholder type=\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:575 +msgid "Tracking the evolution of a codename release" +msgstr "Acompanhando a evolução de um nome de código de lançamento" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:589 +#, no-wrap +msgid "" +"Explanation: Uninstall or do not install any Debian-originated package versions\n" +"Explanation: other than those in the distribution codenamed with squeeze or sid\n" +"Package: *\n" +"Pin: release n=squeeze\n" +"Pin-Priority: 900\n" +"\n" +"Explanation: Debian unstable is always codenamed with sid\n" +"Package: *\n" +"Pin: release a=sid\n" +"Pin-Priority: 800\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" +msgstr "" +"Explicação: Desinstala ou não instala nenhumas versões de pacotes originais Debian\n" +"Explicação: para além daquelas da distribuição com nome de código squeeze ou sid\n" +"Package: *\n" +"Pin: release n=squeeze\n" +"Pin-Priority: 900\n" +"\n" +"Explicação: Debian unstable tem sempre o nome de código sid\n" +"Package: *\n" +"Pin: release a=sid\n" +"Pin-Priority: 800\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:577 +msgid "" +"The following APT preferences file will cause APT to assign a priority " +"higher than the default (500) to all package versions belonging to a " +"specified codename of a distribution and a prohibitively low priority to " +"package versions belonging to other <literal>Debian</literal> distributions, " +"codenames and archives. Note that with this APT preference APT will follow " +"the migration of a release from the archive <literal>testing</literal> to " +"<literal>stable</literal> and later <literal>oldstable</literal>. If you " +"want to follow for example the progress in <literal>testing</literal> " +"notwithstanding the codename changes you should use the example " +"configurations above. <placeholder type=\"programlisting\" id=\"0\"/>" +msgstr "" +"O seguinte ficheiro de preferências do APT irá fazer com que o APT atribua " +"uma prioridade mais alta que a predefinida (500) a todas as versões de " +"pacotes pertencentes a um nome de código especificado de uma distribuição " +"com uma prioridade proibitivamente baixa a versões de pacotes pertencentes a " +"outras distribuições, nomes de código ou arquivos <literal>Debian</literal>. " +"Note que com estas preferências o APT irá seguir a migração de um lançamento " +"a partir do arquivo <literal>testing</literal> para <literal>stable</" +"literal> e mais tarde <literal>oldstable</literal>. Se você que seguir por " +"exemplo o progresso em <literal>testing</literal> não obstante as alterações " +"do nome de código, você deve usar as configurações exemplo acima. " +"<placeholder type=\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:606 +msgid "" +"With a suitable &sources-list; file and the above preferences file, any of " +"the following commands will cause APT to upgrade to the latest version(s) in " +"the release codenamed with <literal>squeeze</literal>. <placeholder type=" +"\"programlisting\" id=\"0\"/>" +msgstr "" +"Com um ficheiro &sources-list; apropriado e o ficheiro de preferências " +"acima, qualquer dos seguintes comandos fará com que o APT actualize para a " +"versão mais recente no lançamento com nome de código <literal>squeeze</" +"literal>. <placeholder type=\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:626 +#, no-wrap +msgid "apt-get install <replaceable>package</replaceable>/sid\n" +msgstr "apt-get install <replaceable>pacote</replaceable>/sid\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:617 +msgid "" +"The following command will cause APT to upgrade the specified package to the " +"latest version from the <literal>sid</literal> distribution. Thereafter, " +"<command>apt-get upgrade</command> will upgrade the package to the most " +"recent <literal>squeeze</literal> version if that is more recent than the " +"installed version, otherwise, to the most recent <literal>sid</literal> " +"version if that is more recent than the installed version. <placeholder " +"type=\"programlisting\" id=\"0\"/>" +msgstr "" +"O seguinte comando irá fazer com que o APT actualize o pacote especificado " +"para a versão mais recente da distribuição <literal>sid</literal> " +"distribution. Posteriormente, <command>apt-get upgrade</command> irá " +"actualizar o pacote para a versão <literal>squeeze</literal> mais recente se " +"essa for mais recente que a versão instalada, caso contrário, para a versão " +"<literal>sid</literal> mais recente se essa for mais recente que a versão " +"instalada. <placeholder type=\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><variablelist> +#: apt_preferences.5.xml:635 +msgid "&file-preferences;" +msgstr "&file-preferences;" + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:641 +msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" +msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" + +#. type: Content of: <refentry><refnamediv><refname> +#: sources.list.5.xml:22 sources.list.5.xml:29 +msgid "sources.list" +msgstr "sources.list" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: sources.list.5.xml:30 +msgid "Package resource list for APT" +msgstr "Lista de recursos de pacote para APT" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:34 +msgid "" +"The package resource list is used to locate archives of the package " +"distribution system in use on the system. At this time, this manual page " +"documents only the packaging system used by the Debian GNU/Linux system. " +"This control file is <filename>/etc/apt/sources.list</filename>." +msgstr "" +"A lista de recursos de pacote é usada para localizar arquivos do sistema de " +"distribuição de pacotes usado no sistema. Neste momento, este manual " +"documenta apenas o sistema de pacotes usado pelo sistema Debian GNU/Linux. " +"Este ficheiro de controle é <filename>/etc/apt/sources.list</filename>." + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:39 +msgid "" +"The source list is designed to support any number of active sources and a " +"variety of source media. The file lists one source per line, with the most " +"preferred source listed first. The format of each line is: <literal>type uri " +"args</literal> The first item, <literal>type</literal> determines the format " +"for <literal>args</literal>. <literal>uri</literal> is a Universal Resource " +"Identifier (URI), which is a superset of the more specific and well-known " +"Universal Resource Locator, or URL. The rest of the line can be marked as a " +"comment by using a #." +msgstr "" +"A lista de fontes é desenhada para suportar qualquer número de fontes " +"activas e uma variedade de médias fonte. O ficheiro lista uma fonte por " +"linha, com a fonte mais preferida listada em primeiro lugar. O formato para " +"cada linha é: <literal>tipo uri argumentos</literal>. O primeiro item, " +"<literal>tipo</literal> determina o formato para <literal>argumentos</" +"literal>. <literal>uri</literal> é um Universal Resource Identifier (URI), o " +"que é um super-conjunto para o mais específico e conhecido Universal " +"Resource Locator, ou URL. O resto da linha pode ser marcado como um " +"comentário usando um #." + +#. type: Content of: <refentry><refsect1><title> +#: sources.list.5.xml:50 +msgid "sources.list.d" +msgstr "sources.list.d" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:51 +msgid "" +"The <filename>/etc/apt/sources.list.d</filename> directory provides a way to " +"add sources.list entries in separate files. The format is the same as for " +"the regular <filename>sources.list</filename> file. File names need to end " +"with <filename>.list</filename> and may only contain letters (a-z and A-Z), " +"digits (0-9), underscore (_), hyphen (-) and period (.) characters. " +"Otherwise they will be silently ignored." +msgstr "" +"O directório <filename>/etc/apt/sources.list.d</filename> disponibiliza um " +"modo de adicionar entradas na sources.list em ficheiros separados. O formato " +"é o mesmo que para o ficheiro <filename>sources.list</filename> regular. Os " +"nomes de ficheiros precisam acabar com <filename>.list</filename> e apenas " +"podem conter letras (a-z e A-Z), dígitos (0-9), e os caracteres underscore " +"(_), menos (-) e ponto (.). De outro modo serão ignorados em silêncio." + +#. type: Content of: <refentry><refsect1><title> +#: sources.list.5.xml:60 +msgid "The deb and deb-src types" +msgstr "Os tipos deb e deb-src" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:61 +msgid "" +"The <literal>deb</literal> type describes a typical two-level Debian " +"archive, <filename>distribution/component</filename>. Typically, " +"<literal>distribution</literal> is generally one of <literal>stable</" +"literal> <literal>unstable</literal> or <literal>testing</literal> while " +"component is one of <literal>main</literal> <literal>contrib</literal> " +"<literal>non-free</literal> or <literal>non-us</literal>. The <literal>deb-" +"src</literal> type describes a debian distribution's source code in the same " +"form as the <literal>deb</literal> type. A <literal>deb-src</literal> line " +"is required to fetch source indexes." +msgstr "" +"O tipo <literal>deb</literal> descreve um arquivo Debian típico de dois " +"níveis, <filename>distribution/component</filename>. Tipicamente " +"<literal>distribution</literal> é geralmente um de <literal>stable</literal> " +"<literal>unstable</literal> ou <literal>testing</literal> enquanto component " +"é um de <literal>main</literal> <literal>contrib</literal> <literal>non-" +"free</literal> ou <literal>non-us</literal>. O tipo <literal>deb-src</" +"literal> descreve um código fonte de distribuição debian no mesmo formato " +"que o tipo <literal>deb</literal>. Uma linha <literal>deb-src</literal> é " +"necessária para obter índices fonte." + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:73 +msgid "" +"The format for a <filename>sources.list</filename> entry using the " +"<literal>deb</literal> and <literal>deb-src</literal> types is:" +msgstr "" +"O formato para uma entrada na <filename>sources.list</filename> usando os " +"tipos <literal>deb</literal> e <literal>deb-src</literal> é:" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:76 +#, no-wrap +msgid "deb uri distribution [component1] [component2] [...]" +msgstr "deb uri distribuição [componente1] [componente2] [...]" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:78 +msgid "" +"The URI for the <literal>deb</literal> type must specify the base of the " +"Debian distribution, from which APT will find the information it needs. " +"<literal>distribution</literal> can specify an exact path, in which case the " +"components must be omitted and <literal>distribution</literal> must end with " +"a slash (/). This is useful for when the case only a particular sub-section " +"of the archive denoted by the URI is of interest. If <literal>distribution</" +"literal> does not specify an exact path, at least one <literal>component</" +"literal> must be present." +msgstr "" +"O URI para o tipo <literal>deb</literal> tem de especificar a base da " +"distribuição Debian, a partir do qual o APT irá encontrar a informação que " +"precisa. <literal>distribution</literal> pode especificar um caminho exacto, " +"que no caso os componente têm de ser omitidos e <literal>distribution</" +"literal> deve terminar com uma barra (/). Isto é útil para o caso de apenas " +"ser de interesse uma sub-secção particular do arquivo denotado pelo URI. Se " +"<literal>distribution</literal> não especificar um caminho exacto, pelo " +"menos um <literal>component</literal> tem de estar presente." + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:87 +msgid "" +"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" +"</literal> which expands to the Debian architecture (i386, m68k, " +"powerpc, ...) used on the system. This permits architecture-independent " +"<filename>sources.list</filename> files to be used. In general this is only " +"of interest when specifying an exact path, <literal>APT</literal> will " +"automatically generate a URI with the current architecture otherwise." +msgstr "" +"<literal>distribution</literal> também pode conter uma variável. <literal>" +"$(ARCH)</literal> a qual se expande à arquitectura Debian (i386, m68k, " +"powerpc, ...) usada no sistema. Isto permite que seja usados ficheiros " +"<filename>sources.list</filename> independentes da arquitectura. Em geral, " +"isto é apenas de interesse quando se especifica um caminho exacto. De outro " +"modo o <literal>APT</literal> irá gerar automaticamente um URI com a " +"arquitectura actual." + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:95 +msgid "" +"Since only one distribution can be specified per line it may be necessary to " +"have multiple lines for the same URI, if a subset of all available " +"distributions or components at that location is desired. APT will sort the " +"URI list after it has generated a complete set internally, and will collapse " +"multiple references to the same Internet host, for instance, into a single " +"connection, so that it does not inefficiently establish an FTP connection, " +"close it, do something else, and then re-establish a connection to that same " +"host. This feature is useful for accessing busy FTP sites with limits on the " +"number of simultaneous anonymous users. APT also parallelizes connections to " +"different hosts to more effectively deal with sites with low bandwidth." +msgstr "" +"Como apenas pode ser especificada por linha uma distribuição, pode ser " +"necessário ter várias linhas para o mesmo URI, se só for desejado um sub-" +"conjunto de todas as distribuições e componentes dessa localização. O APT " +"irá ordenar a lista de URI após ter gerado internamente um conjunto " +"completo, e irá desabar as várias referências à mesma máquina na Internet, " +"por exemplo, numa única ligação, para que não estabeleça uma ligação FTP " +"ineficiente, a feche, faça outra coisa, e depois volte a estabelecer ligação " +"à mesma máquina. Esta funcionalidade é útil para aceder a sites FTP ocupados " +"que limitam o número de utilizadores anónimos em simultâneo. O APT também " +"paraleliza ligações a máquinas diferentes para lidar mais eficientemente com " +"sites com baixa largura de banda." + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:107 +msgid "" +"It is important to list sources in order of preference, with the most " +"preferred source listed first. Typically this will result in sorting by " +"speed from fastest to slowest (CD-ROM followed by hosts on a local network, " +"followed by distant Internet hosts, for example)." +msgstr "" +"É importante listar as fontes por ordem de preferência, com a fonte mais " +"preferida listada em primeiro lugar. Tipicamente isto irá resultar numa " +"ordenação por velocidades desde o mais rápido até ao mais lento (CD-ROM " +"seguido por máquinas numa rede local, seguido por máquinas distantes na " +"Internet, por exemplo)." + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:112 +msgid "Some examples:" +msgstr "Alguns exemplos:" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:114 +#, no-wrap +msgid "" +"deb http://http.us.debian.org/debian stable main contrib non-free\n" +"deb http://http.us.debian.org/debian dists/stable-updates/\n" +" " +msgstr "" +"deb http://http.us.debian.org/debian stable main contrib non-free\n" +"deb http://http.us.debian.org/debian dists/stable-updates/\n" +" " + +#. type: Content of: <refentry><refsect1><title> +#: sources.list.5.xml:120 +msgid "URI specification" +msgstr "Especificação da URI" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: sources.list.5.xml:125 +msgid "file" +msgstr "file" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:127 +msgid "" +"The file scheme allows an arbitrary directory in the file system to be " +"considered an archive. This is useful for NFS mounts and local mirrors or " +"archives." +msgstr "" +"O esquema file permite que um directório arbitrário do sistema de ficheiros " +"seja considerado um arquivo. Isto é útil para montagens NFS e mirrors ou " +"arquivos locais." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:134 +msgid "" +"The cdrom scheme allows APT to use a local CDROM drive with media swapping. " +"Use the &apt-cdrom; program to create cdrom entries in the source list." +msgstr "" +"O esquema cdrom permite ao APT usar uma drive de CDROM local com mudança de " +"media. Use o programa &apt-cdrom; para criar entradas cdrom na lista de " +"fontes." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:141 +msgid "" +"The http scheme specifies an HTTP server for the archive. If an environment " +"variable <envar>http_proxy</envar> is set with the format http://server:" +"port/, the proxy server specified in <envar>http_proxy</envar> will be used. " +"Users of authenticated HTTP/1.1 proxies may use a string of the format " +"http://user:pass@server:port/. Note that this is an insecure method of " +"authentication." +msgstr "" +"O esquema http especifica um servidor HTTP para o arquivo. Se uma variável " +"de ambiente <envar>http_proxy</envar> estiver definida com o formato http://" +"server:port/, será usado o servidor proxy especificado em <envar>http_proxy</" +"envar>. Os utilizadores de proxies HTTP/1.1 autenticados pode usar uma " +"string do formato http://user:pass@server:port/. Note que este não é um " +"método de autenticação seguro." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:152 +msgid "" +"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " +"is highly configurable; for more information see the &apt-conf; manual page. " +"Please note that a ftp proxy can be specified by using the <envar>ftp_proxy</" +"envar> environment variable. It is possible to specify a http proxy (http " +"proxy servers often understand ftp urls) using this method and ONLY this " +"method. ftp proxies using http specified in the configuration file will be " +"ignored." +msgstr "" +"O esquema ftp especifica um servidor FTP para o arquivo. o comportamento FTP " +"do APT é altamente configurável; para mais informação veja o manual &apt-" +"conf;. Por favor note que um proxy ftp pode ser especificado ao usar a " +"variável de ambiente <envar>ftp_proxy</envar>. É possível especificar um " +"proxy http (os servidores de proxy http geralmente compreendem urls de ftp) " +"usando este método e APENAS este método. Os proxies ftp que usam http e seja " +"especificados no ficheiro de configuração serão ignorados." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: sources.list.5.xml:161 +msgid "copy" +msgstr "copy" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:163 +msgid "" +"The copy scheme is identical to the file scheme except that packages are " +"copied into the cache directory instead of used directly at their location. " +"This is useful for people using a zip disk to copy files around with APT." +msgstr "" +"O esquema copy é idêntico ao esquema file com a excepção que os pacotes são " +"copiados para o directório cache em vez serem usados directamente da sua " +"localização. Isto é útil para quem use um disco zip para copiar ficheiros " +"com o APT." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: sources.list.5.xml:168 +msgid "rsh" +msgstr "rsh" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: sources.list.5.xml:168 +msgid "ssh" +msgstr "ssh" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:170 +msgid "" +"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given " +"user and access the files. It is a good idea to do prior arrangements with " +"RSA keys or rhosts. Access to files on the remote uses standard " +"<command>find</command> and <command>dd</command> commands to perform the " +"file transfers from the remote." +msgstr "" +"O método rsh/ssh invoca rsh/ssh a ligar a uma máquina remota como um " +"utilizador fornecido e acede aos ficheiros. É uma boa ideia fazer " +"preparações prévias com chaves RSA ou rhosts. O acesso a ficheiros remotos " +"usa os comandos standard <command>find</command> e <command>dd</command> " +"para executar as transferências de ficheiros remotos." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: sources.list.5.xml:178 +msgid "more recognizable URI types" +msgstr "tipos de URI mais reconhecíveis" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:180 +msgid "" +"APT can be extended with more methods shipped in other optional packages " +"which should follow the nameing scheme <literal>apt-transport-" +"<replaceable>method</replaceable></literal>. The APT team e.g. maintains " +"also the <literal>apt-transport-https</literal> package which provides " +"access methods for https-URIs with features similar to the http method, but " +"other methods for using e.g. debtorrent are also available, see " +"<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></" +"refentrytitle> <manvolnum>1</manvolnum></citerefentry>." +msgstr "" +"O APT pode ser estendido com mais métodos lançados em outros pacotes " +"opcionais que devem seguir o esquema de nomeação <literal>apt-transport-" +"<replaceable>método</replaceable></literal>. A equipa do APT, por exemplo, " +"mantém também o pacote <literal>apt-transport-https</literal> que " +"disponibiliza métodos de acesso para URIs https com funcionalidades " +"semelhantes ao método http, mas estão também disponíveis outros métodos para " +"usar por exemplo o debtorrent, veja <citerefentry> " +"<refentrytitle><filename>apt-transport-debtorrent</filename></refentrytitle> " +"<manvolnum>1</manvolnum></citerefentry>." + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:122 +msgid "" +"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, " +"rsh. <placeholder type=\"variablelist\" id=\"0\"/>" +msgstr "" +"Os tipos de URI actualmente reconhecidos são cdrom, file, http, ftp, copy, " +"ssh, rsh. <placeholder type=\"variablelist\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:194 +msgid "" +"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " +"stable/main, stable/contrib, and stable/non-free." +msgstr "" +"Usa o arquivo armazenado localmente (ou montagem NFS) em /home/jason/debian " +"para stable/main, stable/contrib, e stable/non-free." + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:196 +#, no-wrap +msgid "deb file:/home/jason/debian stable main contrib non-free" +msgstr "deb file:/home/jason/debian stable main contrib non-free" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:198 +msgid "As above, except this uses the unstable (development) distribution." +msgstr "" +"Como em cima, excepto que usa a distribuição unstable (de desenvolvimento)." + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:199 +#, no-wrap +msgid "deb file:/home/jason/debian unstable main contrib non-free" +msgstr "deb file:/home/jason/debian unstable main contrib non-free" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:201 +msgid "Source line for the above" +msgstr "Linha de fonte para o referido acima" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:202 +#, no-wrap +msgid "deb-src file:/home/jason/debian unstable main contrib non-free" +msgstr "deb-src file:/home/jason/debian unstable main contrib non-free" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:204 +msgid "" +"Uses HTTP to access the archive at archive.debian.org, and uses only the " +"hamm/main area." +msgstr "" +"Usa HTTP para aceder ao arquivo em archive.debian.org, e usa apenas a área " +"hamm/main." + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:206 +#, no-wrap +msgid "deb http://archive.debian.org/debian-archive hamm main" +msgstr "deb http://archive.debian.org/debian-archive hamm main" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:208 +msgid "" +"Uses FTP to access the archive at ftp.debian.org, under the debian " +"directory, and uses only the stable/contrib area." +msgstr "" +"Usa FTP para aceder ao arquivo em ftp.debian.org, sob o directório Debian, e " +"usa apenas a área stable/contrib." + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:210 +#, no-wrap +msgid "deb ftp://ftp.debian.org/debian stable contrib" +msgstr "deb ftp://ftp.debian.org/debian stable contrib" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:212 +msgid "" +"Uses FTP to access the archive at ftp.debian.org, under the debian " +"directory, and uses only the unstable/contrib area. If this line appears as " +"well as the one in the previous example in <filename>sources.list</filename> " +"a single FTP session will be used for both resource lines." +msgstr "" +"Usa FTP para aceder ao arquivo em ftp.debian.org, sob o directório debian, e " +"usa apenas a área unstable/contrib. Se esta linha aparecer também como " +"aquela no exemplo anterior em <filename>sources.list</filename> será usada " +"uma única sessão FTP para ambas linhas de recurso." + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:216 +#, no-wrap +msgid "deb ftp://ftp.debian.org/debian unstable contrib" +msgstr "deb ftp://ftp.debian.org/debian unstable contrib" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:218 +msgid "" +"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US " +"directory." +msgstr "" +"Usa HTTP para aceder ao arquivo em nonus.debian.org, sob o directório debian-" +"non-US." + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:220 +#, no-wrap +msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" +msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" + +#. type: Content of: <refentry><refsect1><para><literallayout> +#: sources.list.5.xml:229 +#, no-wrap +msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/" +msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:222 +msgid "" +"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US " +"directory, and uses only files found under <filename>unstable/binary-i386</" +"filename> on i386 machines, <filename>unstable/binary-m68k</filename> on " +"m68k, and so forth for other supported architectures. [Note this example " +"only illustrates how to use the substitution variable; non-us is no longer " +"structured like this] <placeholder type=\"literallayout\" id=\"0\"/>" +msgstr "" +"Usa HTTP para aceder ao arquivo em nonus.debian.org, sob o directório debian-" +"non-US, e usa apenas os ficheiros encontrados sob <filename>unstable/binary-" +"i386</filename> em máquinas i386, <filename>unstable/binary-m68k</filename> " +"em m68k, e assim por diante para outras arquitecturas suportadas. [Note que " +"este exemplo apenas mostra como usar a variável de substituição; non-us já " +"não é mais estruturado desta maneira] <placeholder type=\"literallayout\" id=" +"\"0\"/>" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:234 +msgid "&apt-cache; &apt-conf;" +msgstr "&apt-cache; &apt-conf;" + +#. type: <title> +#: guide.sgml:4 +msgid "APT User's Guide" +msgstr "Guia de Utilizador do APT" + +#. type: +#: guide.sgml:6 offline.sgml:6 +msgid "Jason Gunthorpe jgg@debian.org" +msgstr "Jason Gunthorpe jgg@debian.org" + +#. type: +#: guide.sgml:7 +msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $" +msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $" + +#. type: +#: guide.sgml:11 +msgid "" +"This document provides an overview of how to use the the APT package manager." +msgstr "" +"Este documento disponibiliza uma visão geral de como usar o gestor de " +"pacotes APT." + +#. type: +#: guide.sgml:15 +msgid "Copyright © Jason Gunthorpe, 1998." +msgstr "Copyright © Jason Gunthorpe, 1998." + +#. type:

+#: guide.sgml:21 offline.sgml:22 +msgid "" +"\"APT\" and this document are free software; you can redistribute them and/" +"or modify them under the terms of the GNU General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." +msgstr "" +"\"APT\" and this document are free software; you can redistribute them and/" +"or modify them under the terms of the GNU General Public License as " +"published by the Free Software Foundation; either version 2 of the License, " +"or (at your option) any later version." + +#. type:

+#: guide.sgml:24 offline.sgml:25 +msgid "" +"For more details, on Debian GNU/Linux systems, see the file /usr/share/" +"common-licenses/GPL for the full license." +msgstr "" +"Para mais detalhes em sistemas Debian GNU/Linux, veja o ficheiro /usr/share/" +"common-licenses/GPL para a licença completa." + +#. type: +#: guide.sgml:32 +msgid "General" +msgstr "Geral" + +#. type:

+#: guide.sgml:38 +msgid "" +"The APT package currently contains two sections, the APT dselect method and the apt-get command line user interface. Both " +"provide a way to install and remove packages as well as download new " +"packages from the Internet." +msgstr "" +"O pacote APT contém actualmente duas secções, o método dselect " +"do APT e a interface de utilizador de linha de comandos apt-get. Ambos disponibilizam uma maneira de instalar e remover pacotes assim " +"como descarregar novos pacotes da Internet." + +#. type: +#: guide.sgml:39 +msgid "Anatomy of the Package System" +msgstr "Anatomia do Sistema de Pacotes" + +#. type:

+#: guide.sgml:44 +msgid "" +"The Debian packaging system has a large amount of information associated " +"with each package to help assure that it integrates cleanly and easily into " +"the system. The most prominent of its features is the dependency system." +msgstr "" +"O sistema de pacotes Debian tem uma grande quantidade de informação " +"associada a cada pacote para ajudar a assegurar que este se integra de modo " +"limpo e fácil no sistema. A mais proeminente das suas funcionalidades é o " +"sistema de dependências." + +#. type:

+#: guide.sgml:52 +msgid "" +"The dependency system allows individual programs to make use of shared " +"elements in the system such as libraries. It simplifies placing infrequently " +"used portions of a program in separate packages to reduce the number of " +"things the average user is required to install. Also, it allows for choices " +"in mail transport agents, X servers and so on." +msgstr "" +"O sistema de dependências permite a programas individuais fazerem uso de " +"elementos partilhados no sistema tais como as bibliotecas. Facilita a " +"colocação de porções de um programa usadas raramente em pacotes separados " +"para reduzir o número de coisas que é necessário instalar ao utilizador " +"médio. Também permite opções em agentes de transporte de mail, servidores X " +"e mais." + +#. type:

+#: guide.sgml:57 +msgid "" +"The first step to understanding the dependency system is to grasp the " +"concept of a simple dependency. The meaning of a simple dependency is that a " +"package requires another package to be installed at the same time to work " +"properly." +msgstr "" +"O primeiro passo para compreender o sistema de dependências é pegar no " +"conceito de uma dependência simples. O significado de uma dependência " +"simples é que um pacote requer outro pacote seja instalado ao mesmo tempo " +"para funcionar correctamente." + +#. type:

+#: guide.sgml:63 +msgid "" +"For instance, mailcrypt is an emacs extension that aids in encrypting email " +"with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a " +"simple dependency on GPG. Also, because it is an emacs extension it has a " +"simple dependency on emacs, without emacs it is completely useless." +msgstr "" +"Por exemplo, mailcrypt é uma extensão do emacs que ajuda a encriptar mail " +"com GPG. Sem o GPGP instalado o mailcrypt é inútil, então o mailcrypt tem " +"uma dependência simples do GPG. Também, porque é uma extensão do emacs, tem " +"uma dependência simples do emacs, e sem o emacs é completamente inútil." + +#. type:

+#: guide.sgml:73 +msgid "" +"The other important dependency to understand is a conflicting dependency. It " +"means that a package, when installed with another package, will not work and " +"may possibly be extremely harmful to the system. As an example consider a " +"mail transport agent such as sendmail, exim or qmail. It is not possible to " +"have two mail transport agents installed because both need to listen to the " +"network to receive mail. Attempting to install two will seriously damage the " +"system so all mail transport agents have a conflicting dependency with all " +"other mail transport agents." +msgstr "" +"A outra dependência importante a compreender é a dependência de conflito. " +"Significa que um pacote, quando instalado com outro pacote, não irá " +"funcionar e pode ser extremamente prejudicial para o sistema. Como exemplo " +"considere um agente de transporte de mail como o sendmail, exim ou qmail. " +"Não é possível ter dois agentes de transporte de mail instalados porque " +"ambos precisam de escutar na rede para receberem mail. Tentar instalar dois " +"irá danificar seriamente o sistema, por isso todos os agentes de transporte " +"de mail têm uma dependência de conflito com todos os outros agentes de " +"transporte de mail." + +#. type:

+#: guide.sgml:83 +msgid "" +"As an added complication there is the possibility for a package to pretend " +"to be another package. Consider that exim and sendmail for many intents are " +"identical, they both deliver mail and understand a common interface. Hence, " +"the package system has a way for them to declare that they are both mail-" +"transport-agents. So, exim and sendmail both declare that they provide a " +"mail-transport-agent and other packages that need a mail transport agent " +"depend on mail-transport-agent. This can add a great deal of confusion when " +"trying to manually fix packages." +msgstr "" +"Como uma complicação adicional existe a possibilidade de um pacote fingir " +"ser outro pacote. Considere que exim e sendmail para muitas intenções são " +"idênticos, ambos entregam mail e compreendem uma interface comum. Por isso, " +"o sistema de pacotes tem um modo para eles declararem que são ambos mail-" +"transport-agents. Portanto, ambos exim e sendmail declaram que " +"disponibilizam um mail-transport-agent e outros pacotes que precisam de um " +"agente de transporte de mail dependem de um mail-transport-agent. Isto pode " +"adicionar uma grande confusão quando se tenta corrigir pacotes manualmente." + +#. type:

+#: guide.sgml:88 +msgid "" +"At any given time a single dependency may be met by packages that are " +"already installed or it may not be. APT attempts to help resolve dependency " +"issues by providing a number of automatic algorithms that help in selecting " +"packages for installation." +msgstr "" +"Em qualquer altura uma única dependência pode ser satisfeita por pacotes que " +"já estão instalados ou podem não estar. O APT tenta ajudar a resolver " +"problemas com dependências ao disponibilizar um número de algoritmos " +"automáticos que ajudam a seleccionar os pacotes para instalação." + +#. type:

+#: guide.sgml:102 +msgid "" +"apt-get provides a simple way to install packages from the " +"command line. Unlike dpkg, apt-get does not " +"understand .deb files, it works with the package's proper name and can only " +"install .deb archives from a Source." +msgstr "" +"apt-get fornece uma maneira simples de instalar pacotes a " +"partir da linha de comandos. Ao contrário do dpkg, o apt-" +"get não compreende os ficheiros .deb, funciona com o nome próprio do " +"pacote e apenas pode instalar arquivos .deb a partir de uma Source." + +#. type:

+#: guide.sgml:109 +msgid "" +"The first

If you are using an http proxy server you must set " +"the http_proxy environment variable first, see sources.list(5)

thing that should be done before using apt-get is to " +"fetch the package lists from the Sources so that it knows what " +"packages are available. This is done with apt-get update. For " +"instance," +msgstr "" +"O primeira

se você está a usar um servidor proxy http você tem " +"que definir a variável de ambiente http_proxy primeiro, veja sources.list(5)" +"

 coisa que deve ser feita antes de usar apt-get " +"é obter as listas de pacotes a partir das Sources para que ele " +"saiba que pacotes estão disponíveis. Isto é feito com apt-get update. Por exemplo," + +#. type: +#: guide.sgml:116 +#, no-wrap +msgid "" +"# apt-get update\n" +"Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n" +"Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n" +"Reading Package Lists... Done\n" +"Building Dependency Tree... Done" +msgstr "" +"# apt-get update\n" +"Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n" +"Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n" +"Reading Package Lists... Done\n" +"Building Dependency Tree... Done" + +#. type:

+#: guide.sgml:120 +msgid "Once updated there are several commands that can be used:" +msgstr "Uma vez actualizado existem vários comandos que podem ser usados:" + +#. type:

+#: guide.sgml:131 +msgid "" +"Upgrade will attempt to gently upgrade the whole system. Upgrade will never " +"install a new package or remove an existing package, nor will it ever " +"upgrade a package that might cause some other package to break. This can be " +"used daily to relatively safely upgrade the system. Upgrade will list all of " +"the packages that it could not upgrade, this usually means that they depend " +"on new packages or conflict with some other package. dselect or " +"apt-get install can be used to force these packages to install." +msgstr "" +"Upgrade irá tentar actualizar gentilmente todo o sistema. Upgrade nunca irá " +"instalar um pacote novo ou remover um pacote existente, nem nunca irá " +"actualizar um pacote que possa causar a quebra de outro pacote. Isto pode " +"ser usado diariamente para actualizar o sistema com relativa segurança. " +"Upgrade ira listar todos os pacotes que não pode actualizar, isto geralmente " +"significa que eles dependem de novos pacotes ou entram em conflito com algum " +"outro pacote. dselect ou apt-get install podem ser " +"usados para forçar estes pacotes a instalar." + +#. type:

+#: guide.sgml:140 +msgid "" +"Install is used to install packages by name. The package is automatically " +"fetched and installed. This can be useful if you already know the name of " +"the package to install and do not want to go into a GUI to select it. Any " +"number of packages may be passed to install, they will all be fetched. " +"Install automatically attempts to resolve dependency problems with the " +"listed packages and will print a summary and ask for confirmation if " +"anything other than its arguments are changed." +msgstr "" +"Install é usado para instalar pacotes pelo nome. O pacote é obtido " +"automaticamente e instalado. Isto pode ser útil se você já conhecer o nome " +"do pacote a instalar e não quer ir para uma GUI para o seleccionar. Podem " +"ser passados qualquer número de pacotes para instalar, todos eles serão " +"obtidos. Install tenta automaticamente resolver problemas de dependências " +"com os pacotes listados e irá escrever um sumário e pedir confirmação se " +"algo mais que os seus argumentos serão alterados." + +#. type:

+#: guide.sgml:149 +msgid "" +"Dist-upgrade is a complete upgrader designed to simplify upgrading between " +"releases of Debian. It uses a sophisticated algorithm to determine the best " +"set of packages to install, upgrade and remove to get as much of the system " +"to the newest release. In some situations it may be desired to use dist-" +"upgrade rather than spend the time manually resolving dependencies in " +"dselect. Once dist-upgrade has completed then dselect can be used to install any packages that may have been left out." +msgstr "" +"Dist-upgrade é um actualizador completo desenhado para simplificar a " +"actualização entre lançamentos da Debian. Usa um algoritmo sofisticado para " +"determinar o melhor conjunto de pacotes a instalar, actualizar ou remover " +"para obter o máximo do sistema para o novo lançamento. Em algumas situações " +"pode ser desejável usar o dist-upgrade em vez de passar o tempo a resolver " +"dependências manualmente no dselect. Assim que o dist-upgrade " +"tiver terminado então pode ser usado o dselect para instalar " +"quaisquer pacotes que tenham ficado de fora." + +#. type:

+#: guide.sgml:152 +msgid "" +"It is important to closely look at what dist-upgrade is going to do, its " +"decisions may sometimes be quite surprising." +msgstr "" +"É importante observar de perto o que o dist-upgrade vai fazer, as suas " +"decisões podem por vezes ser bastante surpreendentes." + +#. type:

+#: guide.sgml:163 +msgid "" +"apt-get has several command line options that are detailed in " +"its man page, . The most useful " +"option is -d which does not install the fetched files. If the " +"system has to download a large number of package it would be undesired to " +"start installing them in case something goes wrong. When -d is used " +"the downloaded archives can be installed by simply running the command that " +"caused them to be downloaded again without -d." +msgstr "" +"apt-get tem várias opções de linha de comandos que estão " +"detalhados no seu manual, . A opção " +"mais útil é -d que não instala os pacotes obtidos, Se o sistema " +"tiver que descarregar um grande número de pacotes seria indesejável começar " +"a instalá-los no caso de algo correr mal. Quando se usa -d os " +"arquivos descarregados podem ser instalados simplesmente ao correr de novo " +"comando que s descarregou mas sem o -d." + +#. type: +#: guide.sgml:168 +msgid "DSelect" +msgstr "DSelect" + +#. type:

+#: guide.sgml:173 +msgid "" +"The APT dselect method provides the complete APT system with " +"the dselect package selection GUI. dselect is used " +"to select the packages to be installed or removed and APT actually installs " +"them." +msgstr "" +"O método dselect do APT disponibiliza o sistema APT completo " +"com a GUI de selecção de pacotes dselect. O dselect é usado para seleccionar os pacotes a serem instalados ou removidos e " +"o APT instala-os." + +#. type:

+#: guide.sgml:184 +msgid "" +"To enable the APT method you need to select [A]ccess in dselect " +"and then choose the APT method. You will be prompted for a set of " +"Sources which are places to fetch archives from. These can be " +"remote Internet sites, local Debian mirrors or CDROMs. Each source can " +"provide a fragment of the total Debian archive, APT will automatically " +"combine them to form a complete set of packages. If you have a CDROM then it " +"is a good idea to specify it first and then specify a mirror so that you " +"have access to the latest bug fixes. APT will automatically use packages on " +"your CDROM before downloading from the Internet." +msgstr "" +"Para activar o método APT você precisa de seleccionar [A]ccess no " +"dselect e depois escolher o método APT. Ser-lhe-à perguntado " +"por um conjunto de Sources que são os lugares de onde obter os " +"arquivos. Estes podem ser sites remotos da Internet, mirrors Debian locais " +"ou CDROMs. Cada source pode disponibilizar um fragmento do arquivo Debian " +"total. O APT irá automaticamente combiná-los para formar um conjunto " +"completo de pacotes. Se tem um CDROM, então é boa ideia especificá-lo em " +"primeiro lugar e depois especificar um mirror para ter acesso às correcções " +"de bugs mais recentes. O APT irá automaticamente usar os pacotes no seu " +"CDROM antes de descarregar da Internet." + +#. type: +#: guide.sgml:198 +#, no-wrap +msgid "" +" Set up a list of distribution source locations\n" +"\t \n" +" Please give the base URL of the debian distribution.\n" +" The access schemes I know about are: http file\n" +"\t \n" +" For example:\n" +" file:/mnt/debian,\n" +" ftp://ftp.debian.org/debian,\n" +" http://ftp.de.debian.org/debian,\n" +" \n" +" \n" +" URL [http://llug.sep.bnl.gov/debian]:" +msgstr "" +" Configurar uma lista de localizações fonte da distribuição\n" +"\t \n" +" Por favor forneça o URL base da distribuição Debian.\n" +" Os esquemas de acesso que conheço são: http file\n" +"\t \n" +" Por exemplo:\n" +" file:/mnt/debian,\n" +" ftp://ftp.debian.org/debian,\n" +" http://ftp.de.debian.org/debian,\n" +" \n" +" \n" +" URL [http://llug.sep.bnl.gov/debian]:" + +#. type:

+#: guide.sgml:205 +msgid "" +"The Sources setup starts by asking for the base of the Debian " +"archive, defaulting to a HTTP mirror. Next it asks for the distribution to " +"get." +msgstr "" +"A configuração de Sources começa por perguntar pela base do arquivo " +"Debian, usando por predefinição um mirror HTTP. Depois pergunta qual a " +"distribuição a obter." + +#. type: +#: guide.sgml:212 +#, no-wrap +msgid "" +" Please give the distribution tag to get or a path to the\n" +" package file ending in a /. The distribution\n" +" tags are typically something like: stable unstable testing non-US\n" +" \n" +" Distribution [stable]:" +msgstr "" +" Por favor forneça a etiqueta da distribuição a obter ou um caminho para o\n" +" ficheiro package terminando com um /. As etiquetas da\n" +" distribuição são tipicamente algo como: stable unstable testing non-US\n" +" \n" +" Distribution [stable]:" + +#. type:

+#: guide.sgml:222 +msgid "" +"The distribution refers to the Debian version in the archive, stable refers to the latest released version and unstable refers to " +"the developmental version. non-US is only available on some mirrors " +"and refers to packages that contain encryption technology or other things " +"that cannot be exported from the United States. Importing these packages " +"into the US is legal however." +msgstr "" +"A distribuição refere-se à versão Debian no arquivo, stable refere-" +"se à última versão lançada e unstable refere-se à versão de " +"desenvolvimento. non-US apenas está disponível em alguns mirrors e " +"refere-se a pacotes que contém tecnologia de encriptação ou outras coisas " +"que não podem ser exportadas dos Estados Unidos. No entanto importar estes " +"pacotes para os US é legal." + +#. type: +#: guide.sgml:228 +#, no-wrap +msgid "" +" Please give the components to get\n" +" The components are typically something like: main contrib non-free\n" +" \n" +" Components [main contrib non-free]:" +msgstr "" +" Por favor forneça os componentes a obter\n" +" Tipicamente os componentes são algo como: main contrib non-free\n" +" \n" +" Componentes [main contrib non-free]:" + +#. type:

+#: guide.sgml:236 +msgid "" +"The components list refers to the list of sub distributions to fetch. The " +"distribution is split up based on software licenses, main being DFSG free " +"packages while contrib and non-free contain things that have various " +"restrictions placed on their use and distribution." +msgstr "" +"A lista de componentes refere-se à lista das sub-distribuições a obter. A " +"distribuição é dividida baseando-se nas licenças do software, sendo main " +"pacotes livres DFSG enquanto contrib e non-free contêm coisas que têm várias " +"restrições colocadas no seu uso e distribuição." + +#. type:

+#: guide.sgml:240 +msgid "" +"Any number of sources can be added, the setup script will continue to prompt " +"until you have specified all that you want." +msgstr "" +"Pode ser adicionado qualquer número de fontes, o script de configuração irá " +"continuar a perguntar-lhe até que tenha especificado todas as que deseja." + +#. type:

+#: guide.sgml:247 +msgid "" +"Before starting to use dselect it is necessary to update the " +"available list by selecting [U]pdate from the menu. This is a superset of " +"apt-get update that makes the fetched information available to " +"dselect. [U]pdate must be performed even if apt-get update has been run before." +msgstr "" +"Antes de começar a usar o dselect é necessário actualizar a " +"lista disponível ao seleccionar [U]pdate no menu. Isto é um super-conjunto " +"do apt-get update que torna a informação obtida disponível ao " +"dselect. Deve ser executado o [U]pdate mesmo que tenha sido " +"feito apt-get update antes." + +#. type:

+#: guide.sgml:253 +msgid "" +"You can then go on and make your selections using [S]elect and then perform " +"the installation using [I]nstall. When using the APT method the [C]onfig and " +"[R]emove commands have no meaning, the [I]nstall command performs both of " +"them together." +msgstr "" +"Você pode depois fazer as suas selecções usando [S]elect e depois executar a " +"instalação usando [I]nstall. Quando se usa o método APT os comandos [C]onfig " +"e [R]emove não fazem sentido, o comando [I]nstall executa ambos juntamente." + +#. type:

+#: guide.sgml:258 +msgid "" +"By default APT will automatically remove the package (.deb) files once they " +"have been successfully installed. To change this behavior place Dselect::" +"clean \"prompt\"; in /etc/apt/apt.conf." +msgstr "" +"Por predefinição o APT irá automaticamente remover o ficheiro de pacote (." +"deb) assim que ele tenha sido instalado com sucesso. Para alterar este " +"comportamento coloque Dselect::clean \"prompt\"; em /etc/apt/apt." +"conf." + +#. type: +#: guide.sgml:264 +msgid "The Interface" +msgstr "A Interface" + +#. type:

+#: guide.sgml:278 +msgid "" +"Both that APT dselect method and apt-get share the " +"same interface. It is a simple system that generally tells you what it will " +"do and then goes and does it.

The dselect method " +"actually is a set of wrapper scripts to apt-get. The method " +"actually provides more functionality than is present in apt-get " +"alone.

 After printing out a summary of what will happen APT " +"then will print out some informative status messages so that you can " +"estimate how far along it is and how much is left to do." +msgstr "" +"Ambos método dselect do APT e apt-get partilham a " +"mesma interface. É um sistema simples que geralmente lhe diz o que vai fazer " +"e depois fá-lo.

O método dselect na verdade é um " +"conjunto de scripts wrapper para o apt-get. O método " +"disponibiliza mais funcionalidades que aquelas presentes no apt-get sozinho.

 Após escrever um sumário do que vai acontecer, " +"o APT depois irá escrever algumas mensagens de estado informativo para que " +"você possa estimar o progresso e quanto falta fazer." + +#. type: +#: guide.sgml:280 +msgid "Startup" +msgstr "Arranque" + +#. type:

+#: guide.sgml:284 +msgid "" +"Before all operations except update, APT performs a number of actions to " +"prepare its internal state. It also does some checks of the system's state. " +"At any time these operations can be performed by running apt-get check." +msgstr "" +"Antes de todas as operações, excepto a update, o APT executa um número de " +"acções para preparar o seu estado interno. Também faz algumas verificações " +"do estado do sistema. A qualquer altura estas operações pode ser executadas " +"correndo apt-get check." + +#. type: +#: guide.sgml:289 +#, no-wrap +msgid "" +"# apt-get check\n" +"Reading Package Lists... Done\n" +"Building Dependency Tree... Done" +msgstr "" +"# apt-get check\n" +"Reading Package Lists... Done\n" +"Building Dependency Tree... Done" + +#. type:

+#: guide.sgml:297 +msgid "" +"The first thing it does is read all the package files into memory. APT uses " +"a caching scheme so this operation will be faster the second time it is run. " +"If some of the package files are not found then they will be ignored and a " +"warning will be printed when apt-get exits." +msgstr "" +"A primeira coisa que faz é ler todos os ficheiros de pacotes para a memória. " +"O APT usa um esquema de cache para que esta operação seja mais rápida na " +"segunda vez que é executada. Se alguns dos ficheiros de pacotes não forem " +"encontrados serão ignorados e será mostrado um aviso quando o apt-get " +"terminar." + +#. type:

+#: guide.sgml:303 +msgid "" +"The final operation performs a detailed analysis of the system's " +"dependencies. It checks every dependency of every installed or unpacked " +"package and considers if it is OK. Should this find a problem then a report " +"will be printed out and apt-get will refuse to run." +msgstr "" +"A operação final executa uma análise detalhada das dependências do sistema. " +"Verifica cada dependência de cada pacote instalado ou desempacotado e " +"considera se está OK. Caso isto encontre um problema, então é escrito um " +"relatório e o apt-get recusa-se a funcionar." + +#. type: +#: guide.sgml:320 +#, no-wrap +msgid "" +"# apt-get check\n" +"Reading Package Lists... Done\n" +"Building Dependency Tree... Done\n" +"You might want to run apt-get -f install' to correct these.\n" +"Sorry, but the following packages have unmet dependencies:\n" +" 9fonts: Depends: xlib6g but it is not installed\n" +" uucp: Depends: mailx but it is not installed\n" +" blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n" +" adduser: Depends: perl-base but it is not installed\n" +" aumix: Depends: libgpmg1 but it is not installed\n" +" debiandoc-sgml: Depends: sgml-base but it is not installed\n" +" bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n" +" cthugha: Depends: svgalibg1 but it is not installed\n" +" Depends: xlib6g (>= 3.3-5) but it is not installed\n" +" libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)" +msgstr "" +"# apt-get check\n" +"Reading Package Lists... Done\n" +"Building Dependency Tree... Done\n" +"You might want to run apt-get -f install' to correct these.\n" +"Sorry, but the following packages have unmet dependencies:\n" +" 9fonts: Depends: xlib6g but it is not installed\n" +" uucp: Depends: mailx but it is not installed\n" +" blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n" +" adduser: Depends: perl-base but it is not installed\n" +" aumix: Depends: libgpmg1 but it is not installed\n" +" debiandoc-sgml: Depends: sgml-base but it is not installed\n" +" bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n" +" cthugha: Depends: svgalibg1 but it is not installed\n" +" Depends: xlib6g (>= 3.3-5) but it is not installed\n" +" libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)" + +#. type:

+#: guide.sgml:329 +msgid "" +"In this example the system has many problems, including a serious problem " +"with libreadlineg2. For each package that has unmet dependencies a line is " +"printed out indicating the package with the problem and the dependencies " +"that are unmet. A short explanation of why the package has a dependency " +"problem is also included." +msgstr "" +"Neste exemplo o sistema tem muitos problemas, incluindo um sério problema " +"com libreadlineg2. Para cada pacote que tem dependências não satisfeitas, é " +"escrita uma linha indicando o pacote com o problema e as dependências que " +"não estão satisfeitas. É também incluída uma explicação curta de porquê o " +"pacote tem um problema de dependência." + +#. type:

+#: guide.sgml:337 +msgid "" +"There are two ways a system can get into a broken state like this. The first " +"is caused by dpkg missing some subtle relationships between " +"packages when performing upgrades.

APT however considers all " +"known dependencies and attempts to prevent broken packages

. " +"The second is if a package installation fails during an operation. In this " +"situation a package may have been unpacked without its dependents being " +"installed." +msgstr "" +"Existem duas maneiras de um sistema entrar num estado de quebra como este. A " +"primeira é causada pelo dpkg que não vê algumas relações subtis " +"entre pacotes quando executa actualizações.

No entanto o APT " +"considera todas as dependências conhecidas e tenta prevenir pacotes " +"quebrados

. A segunda é se uma instalação de pacote falha " +"durante uma operação. Nesta situação um pacote pode ter sido desempacotado " +"sem que as suas dependências tenham sido instaladas." + +#. type:

+#: guide.sgml:345 +msgid "" +"The second situation is much less serious than the first because APT places " +"certain constraints on the order that packages are installed. In both cases " +"supplying the -f option to apt-get will cause APT to " +"deduce a possible solution to the problem and then continue on. The APT " +"dselect method always supplies the -f option to allow " +"for easy continuation of failed maintainer scripts." +msgstr "" +"A segunda situação é muito menos séria que a primeira porque o APT coloca " +"certos constrangimentos na ordem que os pacotes são instalados. Em ambos os " +"casos, fornecer a opção -f ao apt-get irá fazer com " +"que o APT deduza uma solução possível para o problema e depois continue. O " +"método dselect do APT fornece sempre a opção -f para " +"permitir uma continuação fácil de scripts do responsável com falhas." + +#. type:

+#: guide.sgml:351 +msgid "" +"However, if the -f option is used to correct a seriously broken " +"system caused by the first case then it is possible that it will either fail " +"immediately or the installation sequence will fail. In either case it is " +"necessary to manually use dpkg (possibly with forcing options) to correct " +"the situation enough to allow APT to proceed." +msgstr "" +"No entanto, se for usada a opção -f para corrigir um sistema " +"seriamente quebrado causado pelo primeiro caso, então é possível que ou " +"falhe imediatamente ou falhe na sequência de instalação. Em qualquer dos " +"casos é necessário usar o dpkg manualmente (possivelmente com opções de " +"forçar) para corrigir a situação o suficiente para permitir ao APT continuar." + +#. type: +#: guide.sgml:356 +msgid "The Status Report" +msgstr "O Relatório de Estado" + +#. type:

+#: guide.sgml:363 +msgid "" +"Before proceeding apt-get will present a report on what will " +"happen. Generally the report reflects the type of operation being performed " +"but there are several common elements. In all cases the lists reflect the " +"final state of things, taking into account the -f option and any " +"other relevant activities to the command being executed." +msgstr "" +"Antes de prosseguir, o apt-get irá apresentar um relatório do " +"que irá acontecer. Geralmente o relatório reflecte o tipo de operações a ser " +"executadas mas há vários elementos comuns. Em todos os casos a lista " +"reflecte o estado final das coisas, tendo em conta a opção -f e " +"quaisquer outras actividades relevantes ao comando que vai ser executado." + +#. type: +#: guide.sgml:364 +msgid "The Extra Package list" +msgstr "A lista de Pacotes Extra" + +#. type: +#: guide.sgml:372 +#, no-wrap +msgid "" +"The following extra packages will be installed:\n" +" libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n" +" mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n" +" bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n" +" squake pgp-i python-base debmake ldso perl libreadlineg2\n" +" ssh" +msgstr "" +"Os seguinte pacotes extra serão instalados:\n" +" libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n" +" mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n" +" bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n" +" squake pgp-i python-base debmake ldso perl libreadlineg2\n" +" ssh" + +#. type:

+#: guide.sgml:379 +msgid "" +"The Extra Package list shows all of the packages that will be installed or " +"upgraded in excess of the ones mentioned on the command line. It is only " +"generated for an install command. The listed packages are often the " +"result of an Auto Install." +msgstr "" +"A lista de Pacotes Extra mostra todos os pacotes que irão ser instalados ou " +"actualizados em excesso daqueles mencionados na linha de comandos. É apenas " +"gerada para um comando install. Os pacotes listados são geralmente " +"o resultado de uma Auto instalação." + +#. type: +#: guide.sgml:382 +msgid "The Packages to Remove" +msgstr "Os Pacotes para Remover" + +#. type: +#: guide.sgml:389 +#, no-wrap +msgid "" +"The following packages will be REMOVED:\n" +" xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n" +" xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n" +" xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n" +" nas xpilot xfig" +msgstr "" +"Os seguintes pacotes irão ser REMOVIDOS:\n" +" xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n" +" xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n" +" xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n" +" nas xpilot xfig" + +#. type:

+#: guide.sgml:399 +msgid "" +"The Packages to Remove list shows all of the packages that will be removed " +"from the system. It can be shown for any of the operations and should be " +"given a careful inspection to ensure nothing important is to be taken off. " +"The -f option is especially good at generating packages to remove " +"so extreme care should be used in that case. The list may contain packages " +"that are going to be removed because they are only partially installed, " +"possibly due to an aborted installation." +msgstr "" +"A lista Pacotes para Remover mostra todos os pacotes que irão ser removidos " +"do sistema. Pode ser mostrada para qualquer das operações e deve ser-lhe " +"dada uma inspecção cuidadosa para assegurar que nada de importante vai ser " +"removido. A opção -f é especialmente boa a gerar pacotes para " +"remover, portanto neste caso deve-se usar cuidados extremos. A lista pode " +"conter pacotes que vão ser removidos porque estão apenas parcialmente " +"instalados, possivelmente devido a uma instalação abortada." + +#. type: +#: guide.sgml:402 +msgid "The New Packages list" +msgstr "A lista de Novos Pacotes" + +#. type: +#: guide.sgml:406 +#, no-wrap +msgid "" +"The following NEW packages will installed:\n" +" zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base" +msgstr "" +"Os seguintes pacotes NOVOS irão ser instalados:\n" +" zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base" + +#. type:

+#: guide.sgml:411 +msgid "" +"The New Packages list is simply a reminder of what will happen. The packages " +"listed are not presently installed in the system but will be when APT is " +"done." +msgstr "" +"A lista de Novos Pacotes é simplesmente um lembrete do que vai acontecer. Os " +"pacotes listados não estão instalados presentemente no sistema mas irão " +"estar quando o APT terminar." + +#. type: +#: guide.sgml:414 +msgid "The Kept Back list" +msgstr "A lista Kept Back" + +#. type: +#: guide.sgml:419 +#, no-wrap +msgid "" +"The following packages have been kept back\n" +" compface man-db tetex-base msql libpaper svgalib1\n" +" gs snmp arena lynx xpat2 groff xscreensaver" +msgstr "" +"Os seguintes pacotes formam mantidos na versão antiga\n" +" compface man-db tetex-base msql libpaper svgalib1\n" +" gs snmp arena lynx xpat2 groff xscreensaver" + +#. type:

+#: guide.sgml:428 +msgid "" +"Whenever the whole system is being upgraded there is the possibility that " +"new versions of packages cannot be installed because they require new things " +"or conflict with already installed things. In this case the package will " +"appear in the Kept Back list. The best way to convince packages listed there " +"to install is with apt-get install or by using dselect " +"to resolve their problems." +msgstr "" +"Sempre que todo o sistema é actualizado existe a possibilidade que novas " +"versões de pacotes não possam ser instaladas porque requerem coisas novas ou " +"entram em conflito com coisas já instaladas. Nestes casos o pacote irá " +"aparecer na lista Kept Back. A melhor maneira de convencer os pacotes " +"listados aqui a instalarem é com o apt-get install ou usando o " +"dselect para resolver os seus problemas." + +#. type: +#: guide.sgml:431 +msgid "Held Packages warning" +msgstr "Aviso de Pacotes Mantidos" + +#. type: +#: guide.sgml:435 +#, no-wrap +msgid "" +"The following held packages will be changed:\n" +" cvs" +msgstr "" +"Os seguintes pacotes mantidos irão ser alterados:\n" +" cvs" + +#. type:

+#: guide.sgml:441 +msgid "" +"Sometimes you can ask APT to install a package that is on hold, in such a " +"case it prints out a warning that the held package is going to be changed. " +"This should only happen during dist-upgrade or install." +msgstr "" +"Por vezes você pode pedir ao APT para instalar um pacote que está retido, " +"nestes casos ele mostra um aviso que o pacote retido vai ser alterado. Isto " +"apenas deve acontecer durante um dist-upgrade ou install." + +#. type: +#: guide.sgml:444 +msgid "Final summary" +msgstr "Sumário final" + +#. type:

+#: guide.sgml:447 +msgid "" +"Finally, APT will print out a summary of all the changes that will occur." +msgstr "" +"Finalmente, o APT irá escrever um sumário de todas as alterações que irão " +"acontecer." + +#. type: +#: guide.sgml:452 +#, no-wrap +msgid "" +"206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n" +"12 packages not fully installed or removed.\n" +"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used." +msgstr "" +"206 pacotes actualizados, 8 instalados de novo, 23 para remover e 51 não actualizados.\n" +"12 pacotes não totalmente instalados ou removidos.\n" +"É necessário obter 65.7M/66.7M de arquivos. Após desempacotamento será usado 26.5M." + +#. type:

+#: guide.sgml:470 +msgid "" +"The first line of the summary simply is a reduced version of all of the " +"lists and includes the number of upgrades - that is packages already " +"installed that have new versions available. The second line indicates the " +"number of poorly configured packages, possibly the result of an aborted " +"installation. The final line shows the space requirements that the " +"installation needs. The first pair of numbers refer to the size of the " +"archive files. The first number indicates the number of bytes that must be " +"fetched from remote locations and the second indicates the total size of all " +"the archives required. The next number indicates the size difference between " +"the presently installed packages and the newly installed packages. It is " +"roughly equivalent to the space required in /usr after everything is done. " +"If a large number of packages are being removed then the value may indicate " +"the amount of space that will be freed." +msgstr "" +"A primeira linha do sumário é simplesmente uma versão reduzida de todas as " +"listas e inclui o número de actualizações - que é os pacotes já instalados " +"que têm novas versões disponíveis. A segunda linha indica o número de " +"pacotes mal configurados, possivelmente o resultado de uma instalação " +"abortada. A linha final mostra os requisitos de espaço que a instalação " +"precisa. O primeiro par de número refere-se ao tamanho dos ficheiros de " +"arquivos. O primeiro número indica o número de bytes que precisam ser " +"obtidos a partir das localizações remotas e o segundo indica o tamanho total " +"do todos os arquivos necessários. O número seguinte indica a diferença de " +"tamanho entre os pacotes presentemente instalados e os pacotes instalados de " +"fresco. É aproximadamente equivalente ao espaço requerido em /usr após tudo " +"estar feito. Se forem removidos um grande número de pacotes então o valor " +"pode indicar a quantidade de espaço que irá ser libertado." + +#. type:

+#: guide.sgml:473 +msgid "" +"Some other reports can be generated by using the -u option to show packages " +"to upgrade, they are similar to the previous examples." +msgstr "" +"Outros relatórios podem ser gerados ao usar a opção -u para mostrar os " +"pacotes a actualizar, e são semelhantes aos exemplos prévios." + +#. type: +#: guide.sgml:477 +msgid "The Status Display" +msgstr "O Mostrador de Estado" + +#. type:

+#: guide.sgml:481 +msgid "" +"During the download of archives and package files APT prints out a series of " +"status messages." +msgstr "" +"Durante a descarga dos arquivos e ficheiros de pacotes, o APT escreve uma " +"série de mensagens de estado." + +#. type: +#: guide.sgml:490 +#, no-wrap +msgid "" +"# apt-get update\n" +"Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n" +"Get:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n" +"Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n" +"Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n" +"Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n" +"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s" +msgstr "" +"# apt-get update\n" +"Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n" +"Get:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n" +"Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n" +"Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n" +"Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n" +"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s" + +#. type:

+#: guide.sgml:500 +msgid "" +"The lines starting with Get are printed out when APT begins to " +"fetch a file while the last line indicates the progress of the download. The " +"first percent value on the progress line indicates the total percent done of " +"all files. Unfortunately since the size of the Package files is unknown " +"apt-get update estimates the percent done which causes some " +"inaccuracies." +msgstr "" +"A linhas iniciadas com Get são escritas quando o APT começa a obter " +"um ficheiro enquanto a última linha indica o progresso da descarga. O " +"primeiro valor percentual na linha de progresso indica a percentagem total " +"completa de todos os ficheiros. Infelizmente como o tamanho dos ficheiros de " +"Pacotes é desconhecido o apt-get update estima a percentagem de " +"pronto o que causa algumas imprecisões." + +#. type:

+#: guide.sgml:509 +msgid "" +"The next section of the status line is repeated once for each download " +"thread and indicates the operation being performed and some useful " +"information about what is happening. Sometimes this section will simply read " +"Forking which means the OS is loading the download module. The " +"first word after the [ is the fetch number as shown on the history lines. " +"The next word is the short form name of the object being downloaded. For " +"archives it will contain the name of the package that is being fetched." +msgstr "" +"A secção seguinte da linha de estado é repetida para cada processo de " +"descarga e indica a operação a ser executada e alguma informação útil acerca " +"do que está a acontecer. Por vezes esta secção irá simplesmente ler " +"Forking o que representa que o SO está a carregar o módulo de " +"download. A primeira palavra após o [ é o número de obtenção como mostrado " +"nas linhas de histórico. A palavra seguinte é o nome em formato curto do " +"objecto a ser descarregado. Para os arquivos irá conter o nome do pacote que " +"está a ser descarregado." + +#. type:

+#: guide.sgml:524 +msgid "" +"Inside of the single quote is an informative string indicating the progress " +"of the negotiation phase of the download. Typically it progresses from " +"Connecting to Waiting for file to Downloading or " +"Resuming. The final value is the number of bytes downloaded from " +"the remote site. Once the download begins this is represented as " +"102/10.2k indicating that 102 bytes have been fetched and 10.2 " +"kilobytes is expected. The total size is always shown in 4 figure notation " +"to preserve space. After the size display is a percent meter for the file " +"itself. The second last element is the instantaneous average speed. This " +"values is updated every 5 seconds and reflects the rate of data transfer for " +"that period. Finally is shown the estimated transfer time. This is updated " +"regularly and reflects the time to complete everything at the shown transfer " +"rate." +msgstr "" +"Dentro da única citação está uma string de informação que indica o progresso " +"da fase de negociação do download. Progride tipicamente de A Ligar " +"para À espera do ficheiro para A descarregar ou A " +"resumir. O valor final é o número de bytes descarregados a partir do " +"site remoto. Uma vez começado a descarga isto é representado como " +"102/10.2k indicando que 102 bytes foram obtidos e são esperados " +"10.2kilobytes. O tamanho total é sempre representado numa anotação de 4 " +"figuras para preservar espaço. Após a amostragem do tamanho está um medidor " +"de percentagem para o próprio ficheiro. O segundo último elemento é a " +"velocidade média instantânea. Estes valores são actualizados a cada 5 " +"segundos e reflectem a taxa de dados transferidos para esse período. " +"Finalmente é mostrado o tempo estimado de transferência. Isto é actualizado " +"regularmente e reflecte o tempo para completar tudo ao ritmo de " +"transferência mostrado." + +#. type:

+#: guide.sgml:530 +msgid "" +"The status display updates every half second to provide a constant feedback " +"on the download progress while the Get lines scroll back whenever a new file " +"is started. Since the status display is constantly updated it is unsuitable " +"for logging to a file, use the -q option to remove the status " +"display." +msgstr "" +"O mostrador de estado actualiza-se a cada meio segundo para disponibilizar " +"uma informação de retorno constante do progresso de descarga enquanto as " +"linhas Get deslocam-se para trás sempre que uma nova linha é iniciada. Como " +"o mostrador de estado é constantemente actualizado não é apropriado para " +"registar num ficheiro, use a opção -q para remover o mostrador de " +"estado." + +#. type: +#: guide.sgml:535 +msgid "Dpkg" +msgstr "Dpkg" + +#. type:

+#: guide.sgml:542 +msgid "" +"APT uses dpkg for installing the archives and will switch over " +"to the dpkg interface once downloading is completed. " +"dpkg will also ask a number of questions as it processes the " +"packages and the packages themselves may also ask several questions. Before " +"each question there is usually a description of what it is asking and the " +"questions are too varied to discuss completely here." +msgstr "" +"O APT usa o dpkg para instalar os arquivos e irá mudar para a " +"interface do dpkg assim que a descarga estiver completa. O " +"dpkg irá também fazer um número de perguntas conforme vai " +"processando os pacotes e os próprios pacotes podem também fazer várias " +"questões. Antes de cada pergunta há geralmente uma descrição do que se está " +"a perguntar e as perguntas são demasiado variadas para serem discutidas aqui." + +#. type: +#: offline.sgml:4 +msgid "Using APT Offline" +msgstr "Usando o APT Offline" + +#. type: +#: offline.sgml:7 +msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $" +msgstr "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $" + +#. type: +#: offline.sgml:12 +msgid "" +"This document describes how to use APT in a non-networked environment, " +"specifically a 'sneaker-net' approach for performing upgrades." +msgstr "" +"Este documento descreve como usar o APT num ambiente sem rede, " +"especificamente uma aproximação 'sneaker-net' para executar actualizações." + +#. type: +#: offline.sgml:16 +msgid "Copyright © Jason Gunthorpe, 1999." +msgstr "Copyright © Jason Gunthorpe, 1999." + +#. type: +#: offline.sgml:32 +msgid "Introduction" +msgstr "Introdução" + +#. type: +#: offline.sgml:34 offline.sgml:65 offline.sgml:180 +msgid "Overview" +msgstr "Visão geral" + +#. type:

+#: offline.sgml:40 +msgid "" +"Normally APT requires direct access to a Debian archive, either from a local " +"media or through a network. Another common complaint is that a Debian " +"machine is on a slow link, such as a modem and another machine has a very " +"fast connection but they are physically distant." +msgstr "" +"Normalmente o APT requer acesso directo a um arquivo Debian, seja duma media " +"local ou através de rede. Outra queixa comum e que uma máquina Debian está " +"numa ligação lenta, como um modem e outra máquina tem uma ligação muito " +"rápida mas estão fisicamente distantes." + +#. type:

+#: offline.sgml:51 +msgid "" +"The solution to this is to use large removable media such as a Zip disc or a " +"SuperDisk disc. These discs are not large enough to store the entire Debian " +"archive but can easily fit a subset large enough for most users. The idea is " +"to use APT to generate a list of packages that are required and then fetch " +"them onto the disc using another machine with good connectivity. It is even " +"possible to use another Debian machine with APT or to use a completely " +"different OS and a download tool like wget. Let remote host mean " +"the machine downloading the packages, and target host the one with " +"bad or no connection." +msgstr "" +"A solução para isto é usar grandes médias amovíveis como um disco Zip ou um " +"disco SuperDisk. Estes discos não são suficientemente grandes para armazenar " +"o arquivo Debian inteiro mas podem facilmente conter um subconjunto " +"suficientemente grande para a maioria dos utilizadores. A ideia é usar o APT " +"para gerar uma lista de pacotes que são necessários e depois obter-los para " +"o disco usando outra máquina com boa ligação. É até possível usar outra " +"máquina Debian com APT ou usar um SO completamente diferente e uma " +"ferramenta de download como o wget. Deixe remote host representar a " +"máquina que descarrega os pacotes, e target host aquela com má ou " +"nenhuma ligação." + +#. type:

+#: offline.sgml:57 +msgid "" +"This is achieved by creatively manipulating the APT configuration file. The " +"essential premise to tell APT to look on a disc for it's archive files. Note " +"that the disc should be formated with a filesystem that can handle long file " +"names such as ext2, fat32 or vfat." +msgstr "" +"Isto é conseguido ao manipular criativamente o ficheiro de configuração do " +"APT. A premissa essencial para dizer ao APT para procurar num disco pelos " +"seus ficheiros de arquivo. Note que o disco deve estar formatado com um " +"sistema de ficheiros que saiba lidar com nomes de ficheiros longos como o " +"ext2, fat32 ou vfat." + +#. type: +#: offline.sgml:63 +msgid "Using APT on both machines" +msgstr "Usando o APT em ambas máquinas" + +#. type:

+#: offline.sgml:71 +msgid "" +"APT being available on both machines gives the simplest configuration. The " +"basic idea is to place a copy of the status file on the disc and use the " +"remote machine to fetch the latest package files and decide which packages " +"to download. The disk directory structure should look like:" +msgstr "" +"Estando o APT disponível em ambas máquinas dá a configuração mais simples. A " +"ideia básica é colocar uma cópia do ficheiro de estado no disco e usar a " +"máquina remota para obter os ficheiros de pacotes mais recentes e decidir " +"quais pacotes descarregar. A estrutura de directórios do disco deverá " +"parecer-se com:" + +#. type: +#: offline.sgml:80 +#, no-wrap +msgid "" +" /disc/\n" +" archives/\n" +" partial/\n" +" lists/\n" +" partial/\n" +" status\n" +" sources.list\n" +" apt.conf" +msgstr "" +" /disc/\n" +" archives/\n" +" partial/\n" +" lists/\n" +" partial/\n" +" status\n" +" sources.list\n" +" apt.conf" + +#. type: +#: offline.sgml:88 +msgid "The configuration file" +msgstr "O ficheiro de configuração" + +#. type:

+#: offline.sgml:96 +msgid "" +"The configuration file should tell APT to store its files on the disc and to " +"use the configuration files on the disc as well. The sources.list should " +"contain the proper sites that you wish to use from the remote machine, and " +"the status file should be a copy of /var/lib/dpkg/status from the " +"target host. Please note, if you are using a local archive you must " +"use copy URIs, the syntax is identical to file URIs." +msgstr "" +"O ficheiro de configuração deve dizer ao APT para armazenar os seus ficheiro " +"no disco e usar os ficheiros de configuração do disco também. O sources.list " +"deve conter os sites apropriados que deseja usar a partir da máquina remota, " +"e o ficheiro de estado deve ser uma cópia de /var/lib/dpkg/status a " +"partir do target host. Por favor note, se está a usar um arquivo " +"local você deve usar copy URIs, a sintaxe é idêntica a file URIs." + +#. type:

+#: offline.sgml:100 +msgid "" +"apt.conf must contain the necessary information to make APT use the " +"disc:" +msgstr "" +"apt.conf tem de conter a informação necessária para fazer o APT " +"usar o disco:" + +#. type: +#: offline.sgml:124 +#, no-wrap +msgid "" +" APT\n" +" {\n" +" /* This is not necessary if the two machines are the same arch, it tells\n" +" the remote APT what architecture the target machine is */\n" +" Architecture \"i386\";\n" +" \n" +" Get::Download-Only \"true\";\n" +" };\n" +" \n" +" Dir\n" +" {\n" +" /* Use the disc for state information and redirect the status file from\n" +" the /var/lib/dpkg default */\n" +" State \"/disc/\";\n" +" State::status \"status\";\n" +"\n" +" // Binary caches will be stored locally\n" +" Cache::archives \"/disc/archives/\";\n" +" Cache \"/tmp/\";\n" +" \n" +" // Location of the source list.\n" +" Etc \"/disc/\";\n" +" };" +msgstr "" +" APT\n" +" {\n" +" /* Isto não é necessário se as duas máquinas forem da mesma arquitectura, diz\n" +" ao APT remoto que arquitectura tem a máquina de destino */\n" +" Architecture \"i386\";\n" +" \n" +" Get::Download-Only \"true\";\n" +" };\n" +" \n" +" Dir\n" +" {\n" +" /* Usa o disco para informação de estado e redirecciona o ficheiro de estado a partir de\n" +" the /var/lib/dpkg default */\n" +" State \"/disc/\";\n" +" State::status \"status\";\n" +"\n" +" // Caches binárias serão armazenadas localmente\n" +" Cache::archives \"/disc/archives/\";\n" +" Cache \"/tmp/\";\n" +" \n" +" // Localização da lista de fontes.\n" +" Etc \"/disc/\";\n" +" };" + +#. type:

+#: offline.sgml:129 +msgid "" +"More details can be seen by examining the apt.conf man page and the sample " +"configuration file in /usr/share/doc/apt/examples/apt.conf." +msgstr "" +"Mais detalhes podem ser vistos ao examinar o manual do apt.conf e o exemplo " +"de ficheiro de configuração em /usr/share/doc/apt/examples/apt.conf." + +#. type:

+#: offline.sgml:136 +msgid "" +"On the target machine the first thing to do is mount the disc and copy /" +"var/lib/dpkg/status to it. You will also need to create the directories " +"outlined in the Overview, archives/partial/ and lists/partial/. Then take the disc to the remote machine and configure the sources." +"list. On the remote machine execute the following:" +msgstr "" +"Na máquina de destino a primeira coisa a fazer é montar o disco e copiar " +"/var/lib/dpkg/status para ele. Você também precisa de criar os " +"directórios delineados na Visão Geral, archives/partial/ e " +"lists/partial/. Depois leve o disco até à máquina remota e " +"configure o sources.list. Na máquina remota execute o seguinte:" + +#. type: +#: offline.sgml:142 +#, no-wrap +msgid "" +" # export APT_CONFIG=\"/disc/apt.conf\"\n" +" # apt-get update\n" +" [ APT fetches the package files ]\n" +" # apt-get dist-upgrade\n" +" [ APT fetches all the packages needed to upgrade the target machine ]" +msgstr "" +" # export APT_CONFIG=\"/disc/apt.conf\"\n" +" # apt-get update\n" +" [ APT obtém os ficheiros de pacotes ]\n" +" # apt-get dist-upgrade\n" +" [ APT obtém todos os pacotes necessários para actualizar a máquina de destino ]" + +#. type:

+#: offline.sgml:149 +msgid "" +"The dist-upgrade command can be replaced with any other standard APT " +"commands, particularly dselect-upgrade. You can even use an APT front end " +"such as dselect. However this presents a problem in communicating " +"your selections back to the local computer." +msgstr "" +"O comando dist-upgrade pode ser substituído por qualquer outro comando APT " +"standard, particularmente dselect-upgrade. Você até pode usar um front-end " +"do APT como o dselect. No entanto isto apresenta um problema ao " +"comunicar as suas selecções de volta ao computador local." + +#. type:

+#: offline.sgml:153 +msgid "" +"Now the disc contains all of the index files and archives needed to upgrade " +"the target machine. Take the disc back and run:" +msgstr "" +"Agora o disco contém todos os ficheiros de índice e os arquivos necessários " +"para actualizar a máquina de destino. Devolva o disco e corra:" + +#. type: +#: offline.sgml:159 +#, no-wrap +msgid "" +" # export APT_CONFIG=\"/disc/apt.conf\"\n" +" # apt-get check\n" +" [ APT generates a local copy of the cache files ]\n" +" # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n" +" [ Or any other APT command ]" +msgstr "" +" # export APT_CONFIG=\"/disc/apt.conf\"\n" +" # apt-get check\n" +" [ APT gera uma cópia local dos ficheiros de cache ]\n" +" # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n" +" [ Ou qualquer outro comando APT ]" + +#. type:

+#: offline.sgml:165 +msgid "" +"It is necessary for proper function to re-specify the status file to be the " +"local one. This is very important!" +msgstr "" +"Para uma função apropriada é necessário re-especificar que o ficheiro de " +"estado seja o ficheiro local. Isto é muito importante!" + +#. type:

+#: offline.sgml:172 +msgid "" +"If you are using dselect you can do the very risky operation of copying disc/" +"status to /var/lib/dpkg/status so that any selections you made on the remote " +"machine are updated. I highly recommend that people only make selections on " +"the local machine - but this may not always be possible. DO NOT copy the " +"status file if dpkg or APT have been run in the mean time!!" +msgstr "" +"Se está a usar dselect você pode fazer a operação muito arriscada de copiar " +"disc/status para /var/lib/dpkg/status para que quaisquer selecções que faça " +"na máquina remota sejam actualizadas. Eu recomendo altamente que as pessoas " +"apenas façam selecções na máquina local - mas isto pode nem sempre ser " +"possível. NÃO copie o ficheiro de estado se entretanto correu o dpkg ou o " +"APT!!" + +#. type: +#: offline.sgml:178 +msgid "Using APT and wget" +msgstr "Usando APT e wget" + +#. type:

+#: offline.sgml:185 +msgid "" +"wget is a popular and portable download tool that can run on nearly " +"any machine. Unlike the method above this requires that the Debian machine " +"already has a list of available packages." +msgstr "" +"wget é uma ferramenta popular e portável de download que pode " +"correr praticamente em qualquer máquina. Ao contrário do método acima, este " +"requer que a máquina Debian já tenha uma lista de pacotes disponíveis." + +#. type:

+#: offline.sgml:190 +msgid "" +"The basic idea is to create a disc that has only the archive files " +"downloaded from the remote site. This is done by using the --print-uris " +"option to apt-get and then preparing a wget script to actually fetch the " +"packages." +msgstr "" +"A ideia básica é criar um disco que tem apenas os ficheiros de arquivo " +"descarregados do site remoto. Isto é feito ao usar a opção --print-uris no " +"apt-get e depois preparar um script wget para realmente ir buscar os pacotes." + +#. type: +#: offline.sgml:196 +msgid "Operation" +msgstr "Operação" + +#. type:

+#: offline.sgml:200 +msgid "" +"Unlike the previous technique no special configuration files are required. " +"We merely use the standard APT commands to generate the file list." +msgstr "" +"Ao contrário da técnica anterior, não são necessários ficheiros de " +"configuração especiais. Nós usamos meramente os comandos standard do APT " +"para gerar a lista de ficheiros." + +#. type: +#: offline.sgml:205 +#, no-wrap +msgid "" +" # apt-get dist-upgrade \n" +" [ Press no when prompted, make sure you are happy with the actions ]\n" +" # apt-get -qq --print-uris dist-upgrade > uris\n" +" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script" +msgstr "" +" # apt-get dist-upgrade \n" +" [ Escolha não quando perguntado, certifique-se que está contente com as acções ]\n" +" # apt-get -qq --print-uris dist-upgrade > uris\n" +" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script" + +#. type:

+#: offline.sgml:210 +msgid "" +"Any command other than dist-upgrade could be used here, including dselect-" +"upgrade." +msgstr "" +"Qualquer comando além do dist-upgrade pode ser usado aqui, incluindo dselect-" +"upgrade." + +#. type:

+#: offline.sgml:216 +msgid "" +"The /disc/wget-script file will now contain a list of wget commands to " +"execute in order to fetch the necessary archives. This script should be run " +"with the current directory as the disc's mount point so as to save the " +"output on the disc." +msgstr "" +"O ficheiro /disc/wget-script irá agora conter uma lista de comandos do wget " +"para executar de modo a obter os arquivos necessários. Este script deve ser " +"corrido com o directório actual sendo o ponto de montagem do disco para que " +"grave os resultados no disco." + +#. type:

+#: offline.sgml:219 +msgid "The remote machine would do something like" +msgstr "A máquina remota deverá fazer algo como" + +#. type: +#: offline.sgml:223 +#, no-wrap +msgid "" +" # cd /disc\n" +" # sh -x ./wget-script\n" +" [ wait.. ]" +msgstr "" +" # cd /disc\n" +" # sh -x ./wget-script\n" +" [ wait.. ]" + +#. type: +#: offline.sgml:228 +msgid "" +"Once the archives are downloaded and the disc returned to the Debian machine " +"installation can proceed using," +msgstr "" +"Após os arquivos serem descarregados e o disco retornado à máquina Debian, a " +"instalação pode prosseguir usando," + +#. type: +#: offline.sgml:230 +#, no-wrap +msgid " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade" +msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade" + +#. type:

+#: offline.sgml:234 +msgid "Which will use the already fetched archives on the disc." +msgstr "O qual irá usar os arquivos já obtidos e que estão no disco." + +#~ msgid "/etc/apt/trusted.gpg" +#~ msgstr "/etc/apt/trusted.gpg" + +#~ msgid "Keyring of local trusted keys, new keys will be added here." +#~ msgstr "" +#~ "Chaveiro das chaves de confiança locais, as novas chaves serão " +#~ "adicionadas aqui." + +#~ msgid "" +#~ "apt.conf is the main configuration file for the APT " +#~ "suite of tools, all tools make use of the configuration file and a common " +#~ "command line parser to provide a uniform environment. When an APT tool " +#~ "starts up it will read the configuration specified by the " +#~ "APT_CONFIG environment variable (if any) and then read the " +#~ "files in Dir::Etc::Parts then read the main " +#~ "configuration file specified by Dir::Etc::main then " +#~ "finally apply the command line options to override the configuration " +#~ "directives, possibly loading even more config files." +#~ msgstr "" +#~ "apt.conf é o ficheiro de configuração principal para " +#~ "a suite de ferramentas do APT, todas as ferramentas usam o ficheiro de " +#~ "configuração e um analisador de linha de comandos comum para " +#~ "disponibilizar um ambiente uniforme. Quando uma ferramenta do APT arranca " +#~ "lê a configuração especificada pela variável de ambiente " +#~ "APT_CONFIG (se existir alguma) e depois lê os ficheiros em " +#~ "Dir::Etc::Parts, depois lê o ficheiro de configuração " +#~ "principal especificado por Dir::Etc::main e finalmente " +#~ "aplica as opções de linha de comandos para sobrepor as directivas de " +#~ "configuração, possivelmente carregando ainda mais ficheiros de " +#~ "configuração." -- cgit v1.2.3 From d8b3cbb61d93228ec984befefa1abfb16555f12a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 19 Mar 2010 12:36:20 +0100 Subject: modify and clarify the comments for the translation placeholders a bit and as it was only a comment change unfuzzy the translations. --- doc/apt.ent | 9 +++++++-- doc/po/apt-doc.pot | 26 +++++++++++++++++++------- doc/po/de.po | 23 +++++++++++++++-------- doc/po/es.po | 21 ++++++++++++++------- doc/po/fr.po | 23 +++++++++++++++-------- doc/po/it.po | 21 ++++++++++++++------- doc/po/ja.po | 23 +++++++++++++++-------- doc/po/pl.po | 26 ++++++++++++++------------ doc/po/pt.po | 23 +++++++++++++++-------- doc/po/pt_BR.po | 26 ++++++++++++++++---------- 10 files changed, 144 insertions(+), 77 deletions(-) diff --git a/doc/apt.ent b/doc/apt.ent index c23d906e2..19da4429e 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -367,9 +367,11 @@ "> + - + in a shipped manpage newer/modified paragraphs will maybe appear in english in + the generated manpage. This sentence is therefore here to tell the reader that this + is not a mistake by the translator - obviously the target is that at least for stable + releases this sentence is not needed. :) --> \n" "Language-Team: LANGUAGE \n" @@ -799,16 +799,22 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:371 -msgid "" +#: apt.ent:373 +#, no-wrap +msgid "" +"\n" +"\n" msgstr "" #. type: Plain text -#: apt.ent:380 +#: apt.ent:382 #, no-wrap msgid "" "\n" @@ -823,12 +829,18 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:387 +#: apt.ent:392 #, no-wrap msgid "" "\n" +" in a shipped manpage newer/modified paragraphs will maybe appear in " +"english in\n" +" the generated manpage. This sentence is therefore here to tell the " +"reader that this\n" +" is not a mistake by the translator - obviously the target is that at " +"least for stable\n" +" releases this sentence is not needed. :) -->\n" "\n" -"POT-Creation-Date: 2010-03-14 16:41+0100\n" +"POT-Creation-Date: 2010-03-19 11:14+0100\n" "PO-Revision-Date: 2009-12-31 17:41+GMT\n" "Last-Translator: Chris Leick \n" "Language-Team: German \n" @@ -1097,15 +1097,19 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:371 -msgid "" -msgstr "" +#: apt.ent:373 +#, no-wrap +msgid "" +"\n" +"\n" +msgstr "\n" #. type: Plain text -#: apt.ent:380 +#: apt.ent:382 #, no-wrap msgid "" -"\n" "\n" #. type: Plain text -#: apt.ent:387 +#: apt.ent:392 #, no-wrap msgid "" "\n" +" in a shipped manpage newer/modified paragraphs will maybe appear in english in\n" +" the generated manpage. This sentence is therefore here to tell the reader that this\n" +" is not a mistake by the translator - obviously the target is that at least for stable\n" +" releases this sentence is not needed. :) -->\n" "\n" "Language-Team: Debian Spanish l10n \n" @@ -1131,15 +1131,19 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:371 -msgid "" +#: apt.ent:373 +#, no-wrap +msgid "" +"\n" +"\n" msgstr "" #. type: Plain text -#: apt.ent:380 +#: apt.ent:382 #, no-wrap msgid "" -"\n" "\n" +" in a shipped manpage newer/modified paragraphs will maybe appear in english in\n" +" the generated manpage. This sentence is therefore here to tell the reader that this\n" +" is not a mistake by the translator - obviously the target is that at least for stable\n" +" releases this sentence is not needed. :) -->\n" "\n" "Language-Team: French \n" @@ -1096,15 +1096,19 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:371 -msgid "" -msgstr "" +#: apt.ent:373 +#, no-wrap +msgid "" +"\n" +"\n" +msgstr "\n" #. type: Plain text -#: apt.ent:380 +#: apt.ent:382 #, no-wrap msgid "" -"\n" "\n" #. type: Plain text -#: apt.ent:387 +#: apt.ent:392 #, no-wrap msgid "" "\n" +" in a shipped manpage newer/modified paragraphs will maybe appear in english in\n" +" the generated manpage. This sentence is therefore here to tell the reader that this\n" +" is not a mistake by the translator - obviously the target is that at least for stable\n" +" releases this sentence is not needed. :) -->\n" "\n" "Language-Team: \n" @@ -773,15 +773,19 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:371 -msgid "" +#: apt.ent:373 +#, no-wrap +msgid "" +"\n" +"\n" msgstr "" #. type: Plain text -#: apt.ent:380 +#: apt.ent:382 #, no-wrap msgid "" -"\n" "\n" +" in a shipped manpage newer/modified paragraphs will maybe appear in english in\n" +" the generated manpage. This sentence is therefore here to tell the reader that this\n" +" is not a mistake by the translator - obviously the target is that at least for stable\n" +" releases this sentence is not needed. :) -->\n" "\n" "Language-Team: LANGUAGE \n" @@ -1100,15 +1100,19 @@ msgid "" msgstr "取得中状態情報格納エリア。設定項目 - Dir::State::Lists (必然的に不完全)" #. type: Plain text -#: apt.ent:371 -msgid "" -msgstr "" +#: apt.ent:373 +#, no-wrap +msgid "" +"\n" +"\n" +msgstr "\n" #. type: Plain text -#: apt.ent:380 +#: apt.ent:382 #, no-wrap msgid "" -"\n" "\n" #. type: Plain text -#: apt.ent:387 +#: apt.ent:392 #, no-wrap msgid "" "\n" +" in a shipped manpage newer/modified paragraphs will maybe appear in english in\n" +" the generated manpage. This sentence is therefore here to tell the reader that this\n" +" is not a mistake by the translator - obviously the target is that at least for stable\n" +" releases this sentence is not needed. :) -->\n" "\n" "Language-Team: \n" @@ -1105,15 +1105,19 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:371 -msgid "" +#: apt.ent:373 +#, no-wrap +msgid "" +"\n" +"\n" msgstr "" #. type: Plain text -#: apt.ent:380 +#: apt.ent:382 #, no-wrap msgid "" -"\n" "debian-l10n-dummy@lists.debian.org.\n" "\">\n" msgstr "" -"\n" "robert@debian.org, 2000-2010.\n" " Tłumaczenie przewodnika offline: Krzysztof Fiertek akfedux@megapolis.pl, 2004\n" "\">\n" #. type: Plain text -#: apt.ent:387 +#: apt.ent:392 #, no-wrap msgid "" "\n" +" in a shipped manpage newer/modified paragraphs will maybe appear in english in\n" +" the generated manpage. This sentence is therefore here to tell the reader that this\n" +" is not a mistake by the translator - obviously the target is that at least for stable\n" +" releases this sentence is not needed. :) -->\n" "\n" msgstr "" -"\n" "\n" "Language-Team: Portuguese \n" @@ -1089,15 +1089,19 @@ msgstr "" "\">\n" #. type: Plain text -#: apt.ent:371 -msgid "" -msgstr "" +#: apt.ent:373 +#, no-wrap +msgid "" +"\n" +"\n" +msgstr "\n" #. type: Plain text -#: apt.ent:380 +#: apt.ent:382 #, no-wrap msgid "" -"\n" "\n" #. type: Plain text -#: apt.ent:387 +#: apt.ent:392 #, no-wrap msgid "" "\n" +" in a shipped manpage newer/modified paragraphs will maybe appear in english in\n" +" the generated manpage. This sentence is therefore here to tell the reader that this\n" +" is not a mistake by the translator - obviously the target is that at least for stable\n" +" releases this sentence is not needed. :) -->\n" "\n" "Language-Team: \n" @@ -816,16 +816,19 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:371 -#, fuzzy -msgid "" -msgstr "" +#: apt.ent:373 +#, no-wrap +msgid "" +"\n" +"\n" +msgstr "\n" #. type: Plain text -#: apt.ent:380 -#, fuzzy, no-wrap +#: apt.ent:382 +#, no-wrap msgid "" -"\n" "\n" #. type: Plain text -#: apt.ent:387 +#: apt.ent:392 #, no-wrap msgid "" "\n" +" in a shipped manpage newer/modified paragraphs will maybe appear in english in\n" +" the generated manpage. This sentence is therefore here to tell the reader that this\n" +" is not a mistake by the translator - obviously the target is that at least for stable\n" +" releases this sentence is not needed. :) -->\n" " Date: Fri, 19 Mar 2010 13:06:48 +0100 Subject: add a missing non-const & Accessors to the Iterator class --- apt-pkg/cacheiterators.h | 1 + 1 file changed, 1 insertion(+) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 28e062f3c..e2ca74683 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -62,6 +62,7 @@ template class pkgCache::Iterator { inline Str const *operator ->() const {return S;}; inline operator Str *() {return S == OwnerPointer() ? 0 : S;}; inline operator Str const *() const {return S == OwnerPointer() ? 0 : S;}; + inline Str &operator *() {return *S;}; inline Str const &operator *() const {return *S;}; inline pkgCache *Cache() {return Owner;}; -- cgit v1.2.3 From 22d1b5c9bcfa69cfc4279370a5e8938079d28773 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 19 Mar 2010 16:29:40 +0100 Subject: first-time build the translated manpages and remove the directories in the veryclean target to get right of all autogenerated files. --- doc/makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/doc/makefile b/doc/makefile index 93504e23e..8a889c94c 100644 --- a/doc/makefile +++ b/doc/makefile @@ -51,10 +51,7 @@ doc: for i in $(shell ls po/*.po | sed -r 's#po/([a-z]+[A-Z_]*).po#\1#'); do \ test -d $$i || mkdir $$i; \ test -f $$i/makefile || sed "s#@@LANG@@#$$i#" lang.makefile > $$i/makefile; \ - done - # it is likely that we have changed the list, so SUBDIRS is incorrect - for dir in $(dir $(wildcard */makefile)); do\ - $(MAKE) -C $$dir $@; \ + $(MAKE) -C $$i $@; \ done clean: clean-subdirs @@ -67,7 +64,7 @@ clean-subdirs: veryclean-subdirs: for dir in $(SUBDIRS); do\ - $(MAKE) -C $$dir veryclean; \ + rm -rf $$dir; \ done ifdef PO4A -- cgit v1.2.3 From aa85a4e2a7ef7c057d979f4e115f92993e04bbe8 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 19 Mar 2010 16:41:35 +0100 Subject: add a missing \n to pl translation i had removed previously by accident --- doc/po/pl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/po/pl.po b/doc/po/pl.po index 78b2faba6..577a002a0 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -1111,7 +1111,7 @@ msgid "" "\n" "\n" -msgstr "" +msgstr "\n" #. type: Plain text #: apt.ent:382 -- cgit v1.2.3 From 6bc703c22970055d9e1a1b4e3e0efe74f4cefda5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 21 Mar 2010 21:48:09 +0100 Subject: =?UTF-8?q?Add=20with=20pkgCacheGen::Essential=20a=20way=20to=20co?= =?UTF-8?q?ntrol=20which=20packages=20get=20the=20essential=20flag:=20*=20?= =?UTF-8?q?native=20is=20the=20default=20and=20will=20only=20mark=20packag?= =?UTF-8?q?es=20of=20the=20main=20arch=20*=20all=20will=20mark=20all=20pac?= =?UTF-8?q?kages=20which=20have=20these=20flag=20in=20Packages=20*=20none?= =?UTF-8?q?=20will=20obviously=20do=20the=20opposite=20*=20installed=20wil?= =?UTF-8?q?l=20only=20mark=20packages=20which=20are=20installed=20as=20ess?= =?UTF-8?q?ential,=20=20=20so=20it=20will=20behave=20in=20the=20same=20way?= =?UTF-8?q?=20as=20dpkg=20does=20it.=20It=20is=20mostly=20needed=20sometim?= =?UTF-8?q?es=20for=20debugging=20but=20some=20users=20with=20special=20ne?= =?UTF-8?q?eds=20might=20like=20to=20switch=20the=20mode=20as=20well=20und?= =?UTF-8?q?er=20the=20expense=20to=20be=20on=20their=20own=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apt-pkg/deb/deblistparser.cc | 16 +++++++++++++--- doc/examples/configure-index | 2 ++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 5c9cf6d4b..947e060e3 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -255,9 +255,13 @@ bool debListParser::UsePackage(pkgCache::PkgIterator Pkg, if (Pkg->Section == 0) Pkg->Section = UniqFindTagWrite("Section"); - // Packages which are not from "our" arch doesn't get the essential flag + // Packages which are not from the "native" arch doesn't get the essential flag + // in the default "native" mode - it is also possible to mark "all" or "none". + // The "installed" mode is handled by ParseStatus(), See #544481 and friends. string const static myArch = _config->Find("APT::Architecture"); - if (Pkg->Arch != 0 && myArch == Pkg.Arch()) + string const static essential = _config->Find("pkgCacheGen::Essential", "native"); + if ((essential == "native" && Pkg->Arch != 0 && myArch == Pkg.Arch()) || + essential == "all") if (Section.FindFlag("Essential",Pkg->Flags,pkgCache::Flag::Essential) == false) return false; if (Section.FindFlag("Important",Pkg->Flags,pkgCache::Flag::Important) == false) @@ -333,7 +337,13 @@ bool debListParser::ParseStatus(pkgCache::PkgIterator Pkg, const char *Stop; if (Section.Find("Status",Start,Stop) == false) return true; - + + // UsePackage() is responsible for setting the flag in the default case + bool const static essential = _config->Find("pkgCacheGen::Essential", "") == "installed"; + if (essential == true && + Section.FindFlag("Essential",Pkg->Flags,pkgCache::Flag::Essential) == false) + return false; + // Isolate the first word const char *I = Start; for(; I < Stop && *I != ' '; I++); diff --git a/doc/examples/configure-index b/doc/examples/configure-index index f07302efd..f08a42ec7 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -432,6 +432,8 @@ Debug } +pkgCacheGen::Essential "native"; // other modes: all, none, installed + /* Whatever you do, do not use this configuration file!! Take out ONLY the portions you need! */ This Is Not A Valid Config File -- cgit v1.2.3 From 66905344357d03c206d99964a0d941b261f7146c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 22 Mar 2010 18:25:37 +0100 Subject: * ftparchive/writer.cc: - write LongDescriptions if they shouldn't be included in Packages file into i18n/Translation-en by default. It is ensured that each package+description is listed only ones in the Translation file even if we generate multiple Packages file in one run. The file is only generated in "generate" - the simple file commands can't create it by now. Also, the LongDescription is currently a global setting, so generating archives with and without LongDescriptions in the Packages file in the same run are currently not possible. --- debian/changelog | 3 +++ ftparchive/apt-ftparchive.cc | 47 +++++++++++++++++++++++++++++++++------- ftparchive/writer.cc | 51 ++++++++++++++++++++++++++++++++++++++++++-- ftparchive/writer.h | 19 +++++++++++++++++ 4 files changed, 110 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index d08bfb20c..d8b8244bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,6 +51,9 @@ apt (0.7.26) UNRELEASED; urgency=low - merge versions correctly even if multiple different versions with the same version number are available. Thanks to Magnus Holmgren for the patch! (Closes: #351056) + * ftparchive/writer.cc: + - write LongDescriptions if they shouldn't be included in Packages + file into i18n/Translation-en by default. [ Julian Andres Klode ] * cmdline/apt-mark: diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index f1a182e52..e69c88ddd 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -62,6 +62,9 @@ struct PackageMap string SrcOverride; string SrcExtraOverride; + // Translation master file + TranslationWriter *TransWriter; + // Contents string Contents; string ContentsHead; @@ -100,8 +103,9 @@ struct PackageMap vector::iterator End, unsigned long &Left); - PackageMap() : DeLinkLimit(0), Permissions(1), ContentsDone(false), - PkgDone(false), SrcDone(false), ContentsMTime(0) {}; + PackageMap() : TransWriter(NULL), DeLinkLimit(0), Permissions(1), + ContentsDone(false), PkgDone(false), SrcDone(false), + ContentsMTime(0) {}; }; /*}}}*/ @@ -169,6 +173,8 @@ bool PackageMap::GenPackages(Configuration &Setup,struct CacheDB::Stats &Stats) Packages.DirStrip = ArchiveDir; Packages.InternalPrefix = flCombine(ArchiveDir,InternalPrefix); + Packages.TransWriter = TransWriter; + Packages.Stats.DeLinkBytes = Stats.DeLinkBytes; Packages.DeLinkLimit = DeLinkLimit; @@ -436,6 +442,8 @@ void LoadTree(vector &PkgList,Configuration &Setup) "$(DIST)/$(SECTION)/source/"); string DPkg = Setup.Find("TreeDefault::Packages", "$(DIST)/$(SECTION)/binary-$(ARCH)/Packages"); + string DTrans = Setup.Find("TreeDefault::Translation", + "$(DIST)/$(SECTION)/i18n/Translation-en"); string DIPrfx = Setup.Find("TreeDefault::InternalPrefix", "$(DIST)/$(SECTION)/"); string DContents = Setup.Find("TreeDefault::Contents", @@ -461,15 +469,25 @@ void LoadTree(vector &PkgList,Configuration &Setup) string Section; while (ParseQuoteWord(Sections,Section) == true) { - string Tmp2 = Block.Find("Architectures"); string Arch; + struct SubstVar const Vars[] = {{"$(DIST)",&Dist}, + {"$(SECTION)",&Section}, + {"$(ARCH)",&Arch}, + {}}; + TranslationWriter *TransWriter; + if (DTrans.empty() == false) + { + string const TranslationFile = flCombine(Setup.FindDir("Dir::ArchiveDir"), + SubstVar(Block.Find("Translation", DTrans.c_str()), Vars)); + TransWriter = new TranslationWriter(TranslationFile); + } + else + TransWriter = NULL; + + string const Tmp2 = Block.Find("Architectures"); const char *Archs = Tmp2.c_str(); while (ParseQuoteWord(Archs,Arch) == true) { - struct SubstVar Vars[] = {{"$(DIST)",&Dist}, - {"$(SECTION)",&Section}, - {"$(ARCH)",&Arch}, - {}}; PackageMap Itm; Itm.BinOverride = SubstVar(Block.Find("BinOverride"),Vars); @@ -491,6 +509,11 @@ void LoadTree(vector &PkgList,Configuration &Setup) Itm.PkgFile = SubstVar(Block.Find("Packages",DPkg.c_str()),Vars); Itm.Tag = SubstVar("$(DIST)/$(SECTION)/$(ARCH)",Vars); Itm.Arch = Arch; + if (TransWriter != NULL) + { + TransWriter->IncreaseRefCounter(); + Itm.TransWriter = TransWriter; + } Itm.Contents = SubstVar(Block.Find("Contents",DContents.c_str()),Vars); Itm.ContentsHead = SubstVar(Block.Find("Contents::Header",DContentsH.c_str()),Vars); Itm.FLFile = SubstVar(Block.Find("FileList",DFLFile.c_str()),Vars); @@ -500,6 +523,9 @@ void LoadTree(vector &PkgList,Configuration &Setup) Itm.GetGeneral(Setup,Block); PkgList.push_back(Itm); } + // we didn't use this TransWriter, so we can release it + if (TransWriter != NULL && TransWriter->GetRefCounter() == 0) + delete TransWriter; } Top = Top->Next; @@ -788,7 +814,12 @@ bool Generate(CommandLine &CmdL) delete [] List; } - + + // close the Translation master files + for (vector::iterator I = PkgList.begin(); I != PkgList.end(); I++) + if (I->TransWriter != NULL && I->TransWriter->DecreaseRefCounter() == 0) + delete I->TransWriter; + if (_config->FindB("APT::FTPArchive::Contents",true) == false) return true; diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index 9e5b7d4f3..b395903b7 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -300,7 +300,7 @@ bool FTWScanner::Delink(string &FileName,const char *OriginalPath, /* */ PackagesWriter::PackagesWriter(string const &DB,string const &Overrides,string const &ExtOverrides, string const &Arch) : - FTWScanner(Arch), Db(DB), Stats(Db.Stats) + FTWScanner(Arch), Db(DB), Stats(Db.Stats), TransWriter(NULL) { Output = stdout; SetExts(".deb .udeb"); @@ -317,7 +317,7 @@ PackagesWriter::PackagesWriter(string const &DB,string const &Overrides,string c if (Db.Loaded() == false) DoContents = false; - + // Read the override file if (Overrides.empty() == false && Over.ReadOverride(Overrides) == false) return; @@ -448,6 +448,8 @@ bool PackagesWriter::DoPackage(string FileName) descmd5.Add(desc.c_str()); DescriptionMd5 = descmd5.Result().Value(); SetTFRewriteData(Changes[End++], "Description-md5", DescriptionMd5.c_str()); + if (TransWriter != NULL) + TransWriter->DoPackage(Package, desc, DescriptionMd5); } // Rewrite the maintainer field if necessary @@ -494,6 +496,51 @@ bool PackagesWriter::DoPackage(string FileName) } /*}}}*/ +// TranslationWriter::TranslationWriter - Constructor /*{{{*/ +// --------------------------------------------------------------------- +/* Create a Translation-Master file for this Packages file */ +TranslationWriter::TranslationWriter(string const &File) : Output(NULL), + RefCounter(0) +{ + if (File.empty() == true) + return; + + Output = fopen(File.c_str(), "w"); +} + /*}}}*/ +// TranslationWriter::DoPackage - Process a single package /*{{{*/ +// --------------------------------------------------------------------- +/* Create a Translation-Master file for this Packages file */ +bool TranslationWriter::DoPackage(string const &Pkg, string const &Desc, + string const &MD5) +{ + if (Output == NULL) + return true; + + // Different archs can include different versions and therefore + // different descriptions - so we need to check for both name and md5. + string const Record = Pkg + ":" + MD5; + + if (Included.find(Record) != Included.end()) + return true; + + fprintf(Output, "Package: %s\nDescription-md5: %s\nDescription-en: %s\n", + Pkg.c_str(), MD5.c_str(), Desc.c_str()); + + Included.insert(Record); + return true; +} + /*}}}*/ +// TranslationWriter::~TranslationWriter - Destructor /*{{{*/ +// --------------------------------------------------------------------- +/* */ +TranslationWriter::~TranslationWriter() +{ + if (Output != NULL) + fclose(Output); +} + /*}}}*/ + // SourcesWriter::SourcesWriter - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ diff --git a/ftparchive/writer.h b/ftparchive/writer.h index af7ba4edd..2afd1af1f 100644 --- a/ftparchive/writer.h +++ b/ftparchive/writer.h @@ -19,6 +19,7 @@ #include #include #include +#include #include "cachedb.h" #include "override.h" @@ -72,6 +73,23 @@ class FTWScanner FTWScanner(string const &Arch = string()); }; +class TranslationWriter +{ + FILE *Output; + std::set Included; + unsigned short RefCounter; + + public: + void IncreaseRefCounter() { ++RefCounter; }; + unsigned short DecreaseRefCounter() { return (RefCounter == 0) ? 0 : --RefCounter; }; + unsigned short GetRefCounter() const { return RefCounter; }; + bool DoPackage(string const &Pkg, string const &Desc, string const &MD5); + + TranslationWriter(string const &File); + TranslationWriter() : Output(NULL), RefCounter(0) {}; + ~TranslationWriter(); +}; + class PackagesWriter : public FTWScanner { Override Over; @@ -93,6 +111,7 @@ class PackagesWriter : public FTWScanner string DirStrip; FILE *Output; struct CacheDB::Stats &Stats; + TranslationWriter *TransWriter; inline bool ReadOverride(string const &File) {return Over.ReadOverride(File);}; inline bool ReadExtraOverride(string const &File) -- cgit v1.2.3 From 1c56c17a3c5548a3bb86c0d7967c0f790c7c2cca Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 26 Mar 2010 17:02:27 +0100 Subject: cherry pick -r 1956..1957 lp:~donkult/apt/sid --- apt-pkg/deb/debversion.cc | 18 ++++++++++++++++-- debian/changelog | 9 +++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/apt-pkg/deb/debversion.cc b/apt-pkg/deb/debversion.cc index ad45e9a44..755ffbe96 100644 --- a/apt-pkg/deb/debversion.cc +++ b/apt-pkg/deb/debversion.cc @@ -190,8 +190,22 @@ int debVersioningSystem::DoCmpVersion(const char *A,const char *AEnd, dlhs++; if (drhs != rhs) drhs++; - - return CmpFragment(dlhs,AEnd,drhs,BEnd); + + // no debian revision need to be treated like -0 + if (*(dlhs-1) == '-' && *(drhs-1) == '-') + return CmpFragment(dlhs,AEnd,drhs,BEnd); + else if (*(dlhs-1) == '-') + { + const char* null = "0"; + return CmpFragment(dlhs,AEnd,null, null+1); + } + else if (*(drhs-1) == '-') + { + const char* null = "0"; + return CmpFragment(null, null+1, drhs, BEnd); + } + else + return 0; } /*}}}*/ // debVS::CheckDep - Check a single dependency /*{{{*/ diff --git a/debian/changelog b/debian/changelog index 4164fd726..bf07b9f30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +apt (0.7.25.3ubuntu4) UNRELEASED; urgency=low + + [ David Kalnischkies ] + * apt-pkg/deb/debversion.cc: + - consider absent of debian revision equivalent to 0 (Closes: #573592) + LP: #540228 + + -- Michael Vogt Fri, 26 Mar 2010 16:57:49 +0100 + apt (0.7.25.3ubuntu3) lucid; urgency=low * apt-pkg/indexfile.cc: -- cgit v1.2.3 From 7a511e5d959f59ec6062a84b3a1ae372ff4f8e86 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 26 Mar 2010 17:25:04 +0100 Subject: * cmdline/apt-get.cc, apt-pkg/cdrom.cc: - fix memory leaks in error conditions in DoSource() --- apt-pkg/cdrom.cc | 3 ++- cmdline/apt-get.cc | 6 +++++- debian/changelog | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 96d4e9c91..783ffc430 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -289,7 +289,8 @@ bool pkgCdrom::DropRepeats(vector &List,const char *Name) List[J] = string(); } } - + delete[] Inodes; + // Wipe erased entries for (unsigned int I = 0; I < List.size();) { diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index ea236676b..0bc8fc571 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2315,6 +2315,7 @@ bool DoSource(CommandLine &CmdL) { for (unsigned I = 0; I != J; I++) ioprintf(cout,_("Fetch source %s\n"),Dsc[I].Package.c_str()); + delete[] Dsc; return true; } @@ -2325,6 +2326,7 @@ bool DoSource(CommandLine &CmdL) for (; I != Fetcher.UriEnd(); I++) cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' << I->Owner->FileSize << ' ' << I->Owner->HashSum() << endl; + delete[] Dsc; return true; } @@ -2350,6 +2352,7 @@ bool DoSource(CommandLine &CmdL) if (_config->FindB("APT::Get::Download-only",false) == true) { c1out << _("Download complete and in download only mode") << endl; + delete[] Dsc; return true; } @@ -2411,7 +2414,8 @@ bool DoSource(CommandLine &CmdL) _exit(0); } - + delete[] Dsc; + // Wait for the subprocess int Status = 0; while (waitpid(Process,&Status,0) != Process) diff --git a/debian/changelog b/debian/changelog index bf07b9f30..5f5a43098 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ apt (0.7.25.3ubuntu4) UNRELEASED; urgency=low * apt-pkg/deb/debversion.cc: - consider absent of debian revision equivalent to 0 (Closes: #573592) LP: #540228 + * cmdline/apt-get.cc, apt-pkg/cdrom.cc: + - fix memory leaks in error conditions in DoSource() -- Michael Vogt Fri, 26 Mar 2010 16:57:49 +0100 -- cgit v1.2.3 From c5a4be87d94e3f48aad955107bbaf17b0a7c93cc Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 26 Mar 2010 17:27:47 +0100 Subject: cherry pick -r 1954..1955 lp:~donkult/apt/sid --- apt-pkg/deb/dpkgpm.cc | 16 +++++++++------- debian/changelog | 2 ++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 8ecb683d4..18c731788 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -575,35 +575,37 @@ void pkgDPkgPM::WriteHistoryTag(FILE *history_out, string tag, string value) // DPkgPM::OpenLog /*{{{*/ bool pkgDPkgPM::OpenLog() { - string logdir = _config->FindDir("Dir::Log"); + string const logdir = _config->FindDir("Dir::Log"); if(not FileExists(logdir)) return _error->Error(_("Directory '%s' missing"), logdir.c_str()); // get current time char timestr[200]; - time_t t = time(NULL); - struct tm *tmp = localtime(&t); + time_t const t = time(NULL); + struct tm const * const tmp = localtime(&t); strftime(timestr, sizeof(timestr), "%F %T", tmp); // open terminal log - string logfile_name = flCombine(logdir, + string const logfile_name = flCombine(logdir, _config->Find("Dir::Log::Terminal")); if (!logfile_name.empty()) { term_out = fopen(logfile_name.c_str(),"a"); if (term_out == NULL) - return _error->WarningE(_("Could not open file '%s'"), logfile_name.c_str()); + return _error->WarningE("OpenLog", _("Could not open file '%s'"), logfile_name.c_str()); chmod(logfile_name.c_str(), 0600); fprintf(term_out, "\nLog started: %s\n", timestr); } - // write - string history_name = flCombine(logdir, + // write your history + string const history_name = flCombine(logdir, _config->Find("Dir::Log::History")); if (!history_name.empty()) { FILE *history_out = fopen(history_name.c_str(),"a"); + if (history_out == NULL) + return _error->WarningE("OpenLog", _("Could not open file '%s'"), history_name.c_str()); chmod(history_name.c_str(), 0644); fprintf(history_out, "\nStart-Date: %s\n", timestr); string remove, purge, install, upgrade, downgrade; diff --git a/debian/changelog b/debian/changelog index 5f5a43098..b26f18153 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ apt (0.7.25.3ubuntu4) UNRELEASED; urgency=low LP: #540228 * cmdline/apt-get.cc, apt-pkg/cdrom.cc: - fix memory leaks in error conditions in DoSource() + * apt-pkg/deb/dpkgpm.cc: + - fix error message construction in OpenLog() -- Michael Vogt Fri, 26 Mar 2010 16:57:49 +0100 -- cgit v1.2.3 From 6db054c2bfba42b423ac2c5e45bf0f53fd3c5f60 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 26 Mar 2010 18:09:28 +0100 Subject: releasing version 0.7.25.3ubuntu4 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b26f18153..1b7a9adc6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.7.25.3ubuntu4) UNRELEASED; urgency=low +apt (0.7.25.3ubuntu4) lucid; urgency=low [ David Kalnischkies ] * apt-pkg/deb/debversion.cc: -- cgit v1.2.3 From 4e794c509becfd7e2bddfddc1205dc81397a48bd Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Mar 2010 19:18:21 +0100 Subject: Inclusion of Long Descriptions in the Packages files can be set now also in TreeDefaults and Tree to support generation of archives which should support and which shouldn't support splitted out Translation-en files in the same run. --- doc/apt-ftparchive.1.xml | 27 +++++++++++++++++++++++---- ftparchive/apt-ftparchive.cc | 11 +++++++++-- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index f88dbe631..e639924ce 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -289,7 +289,20 @@ Sets the output Sources file. Defaults to $(DIST)/$(SECTION)/source/Sources - + + Translation + + Set the output Translation-en master file with the long descriptions if they + should be not included in the Packages file. Defaults to + $(DIST)/$(SECTION)/i18n/Translation-en + + + LongDescription + + Sets if long descriptions should be included in the Packages file or split + out into a master Translation-en file. + + InternalPrefix Sets the path prefix that causes a symlink to be @@ -371,7 +384,13 @@ for i in Sections do architectures that appear under search section. The special architecture 'source' is used to indicate that this tree has a source archive. - + + LongDescription + + Sets if long descriptions should be included in the Packages file or split + out into a master Translation-en file. + + BinOverride Sets the binary override file. The override file @@ -568,8 +587,8 @@ for i in Sections do This configuration option defaults to "true" and should only be set to "false" if the Archive generated with &apt-ftparchive; also provides - Translation files. Note that it is currently not possible to create these - files with apt-ftparchive. + Translation files. Note that the Translation-en + master file can only be created in the generate command. diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index e69c88ddd..f3e91d90d 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -63,6 +63,7 @@ struct PackageMap string SrcExtraOverride; // Translation master file + bool LongDesc; TranslationWriter *TransWriter; // Contents @@ -103,7 +104,7 @@ struct PackageMap vector::iterator End, unsigned long &Left); - PackageMap() : TransWriter(NULL), DeLinkLimit(0), Permissions(1), + PackageMap() : LongDesc(true), TransWriter(NULL), DeLinkLimit(0), Permissions(1), ContentsDone(false), PkgDone(false), SrcDone(false), ContentsMTime(0) {}; }; @@ -174,6 +175,7 @@ bool PackageMap::GenPackages(Configuration &Setup,struct CacheDB::Stats &Stats) Packages.InternalPrefix = flCombine(ArchiveDir,InternalPrefix); Packages.TransWriter = TransWriter; + Packages.LongDescription = LongDesc; Packages.Stats.DeLinkBytes = Stats.DeLinkBytes; Packages.DeLinkLimit = DeLinkLimit; @@ -456,6 +458,9 @@ void LoadTree(vector &PkgList,Configuration &Setup) string DFLFile = Setup.Find("TreeDefault::FileList", ""); string DSFLFile = Setup.Find("TreeDefault::SourceFileList", ""); + bool const LongDescription = Setup.FindB("TreeDefault::LongDescription", + _config->FindB("APT::FTPArchive::LongDescription", true)); + // Process 'tree' type sections const Configuration::Item *Top = Setup.Tree("tree"); for (Top = (Top == 0?0:Top->Child); Top != 0;) @@ -474,8 +479,9 @@ void LoadTree(vector &PkgList,Configuration &Setup) {"$(SECTION)",&Section}, {"$(ARCH)",&Arch}, {}}; + bool const LongDesc = Block.FindB("LongDescription", LongDescription); TranslationWriter *TransWriter; - if (DTrans.empty() == false) + if (DTrans.empty() == false && LongDesc == false) { string const TranslationFile = flCombine(Setup.FindDir("Dir::ArchiveDir"), SubstVar(Block.Find("Translation", DTrans.c_str()), Vars)); @@ -509,6 +515,7 @@ void LoadTree(vector &PkgList,Configuration &Setup) Itm.PkgFile = SubstVar(Block.Find("Packages",DPkg.c_str()),Vars); Itm.Tag = SubstVar("$(DIST)/$(SECTION)/$(ARCH)",Vars); Itm.Arch = Arch; + Itm.LongDesc = LongDesc; if (TransWriter != NULL) { TransWriter->IncreaseRefCounter(); -- cgit v1.2.3 From 34f1d96cf5657b5e34cd9880dccfa2028fa16b13 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Mar 2010 22:38:50 +0100 Subject: Switch the TranslationWriter to use MultiCompress to be able to generate the compressed files as we want them and to prevent the file to be replaced without a reason which could save us from steady redownloads of a file with the same content. --- doc/apt-ftparchive.1.xml | 20 +++++++++++++------- ftparchive/apt-ftparchive.cc | 13 ++++++++----- ftparchive/writer.cc | 12 ++++++++---- ftparchive/writer.h | 6 ++++-- 4 files changed, 33 insertions(+), 18 deletions(-) diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index e639924ce..5bf47f32a 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -224,7 +224,13 @@ This is similar to Packages::Compress except that it controls the compression for the Contents files. - + + Translation::Compress + + This is similar to Packages::Compress + except that it controls the compression for the Translation-en master file. + + DeLinkLimit Specifies the number of kilobytes to delink (and @@ -238,6 +244,12 @@ defaults to 0644. All index files are set to this mode with no regard to the umask. + + LongDescription + + Sets if long descriptions should be included in the Packages file or split + out into a master Translation-en file. + @@ -297,12 +309,6 @@ $(DIST)/$(SECTION)/i18n/Translation-en - LongDescription - - Sets if long descriptions should be included in the Packages file or split - out into a master Translation-en file. - - InternalPrefix Sets the path prefix that causes a symlink to be diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index f3e91d90d..46831b385 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -134,8 +134,6 @@ void PackageMap::GetGeneral(Configuration &Setup,Configuration &Block) PkgExt = Block.Find("Packages::Extensions", Setup.Find("Default::Packages::Extensions",".deb").c_str()); - Permissions = Setup.FindI("Default::FileMode",0644); - if (FLFile.empty() == false) FLFile = flCombine(Setup.Find("Dir::FileListDir"),FLFile); @@ -458,8 +456,11 @@ void LoadTree(vector &PkgList,Configuration &Setup) string DFLFile = Setup.Find("TreeDefault::FileList", ""); string DSFLFile = Setup.Find("TreeDefault::SourceFileList", ""); - bool const LongDescription = Setup.FindB("TreeDefault::LongDescription", + int const Permissions = Setup.FindI("Default::FileMode",0644); + + bool const LongDescription = Setup.FindB("Default::LongDescription", _config->FindB("APT::FTPArchive::LongDescription", true)); + string const TranslationCompress = Setup.Find("Default::Translation::Compress",". gzip").c_str(); // Process 'tree' type sections const Configuration::Item *Top = Setup.Tree("tree"); @@ -479,13 +480,15 @@ void LoadTree(vector &PkgList,Configuration &Setup) {"$(SECTION)",&Section}, {"$(ARCH)",&Arch}, {}}; + mode_t const Perms = Block.FindI("FileMode", Permissions); bool const LongDesc = Block.FindB("LongDescription", LongDescription); TranslationWriter *TransWriter; if (DTrans.empty() == false && LongDesc == false) { string const TranslationFile = flCombine(Setup.FindDir("Dir::ArchiveDir"), SubstVar(Block.Find("Translation", DTrans.c_str()), Vars)); - TransWriter = new TranslationWriter(TranslationFile); + string const TransCompress = Block.Find("Translation::Compress", TranslationCompress); + TransWriter = new TranslationWriter(TranslationFile, TransCompress, Perms); } else TransWriter = NULL; @@ -495,7 +498,7 @@ void LoadTree(vector &PkgList,Configuration &Setup) while (ParseQuoteWord(Archs,Arch) == true) { PackageMap Itm; - + Itm.Permissions = Perms; Itm.BinOverride = SubstVar(Block.Find("BinOverride"),Vars); Itm.InternalPrefix = SubstVar(Block.Find("InternalPrefix",DIPrfx.c_str()),Vars); diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index b395903b7..45a8d212b 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -499,13 +499,15 @@ bool PackagesWriter::DoPackage(string FileName) // TranslationWriter::TranslationWriter - Constructor /*{{{*/ // --------------------------------------------------------------------- /* Create a Translation-Master file for this Packages file */ -TranslationWriter::TranslationWriter(string const &File) : Output(NULL), +TranslationWriter::TranslationWriter(string const &File, string const &TransCompress, + mode_t const &Permissions) : Output(NULL), RefCounter(0) { if (File.empty() == true) return; - Output = fopen(File.c_str(), "w"); + Comp = new MultiCompress(File, TransCompress, Permissions); + Output = Comp->Input; } /*}}}*/ // TranslationWriter::DoPackage - Process a single package /*{{{*/ @@ -536,8 +538,10 @@ bool TranslationWriter::DoPackage(string const &Pkg, string const &Desc, /* */ TranslationWriter::~TranslationWriter() { - if (Output != NULL) - fclose(Output); + if (Comp == NULL) + return; + + delete Comp; } /*}}}*/ diff --git a/ftparchive/writer.h b/ftparchive/writer.h index 2afd1af1f..3123a7f46 100644 --- a/ftparchive/writer.h +++ b/ftparchive/writer.h @@ -22,6 +22,7 @@ #include #include "cachedb.h" +#include "multicompress.h" #include "override.h" #include "apt-ftparchive.h" @@ -75,6 +76,7 @@ class FTWScanner class TranslationWriter { + MultiCompress *Comp; FILE *Output; std::set Included; unsigned short RefCounter; @@ -85,8 +87,8 @@ class TranslationWriter unsigned short GetRefCounter() const { return RefCounter; }; bool DoPackage(string const &Pkg, string const &Desc, string const &MD5); - TranslationWriter(string const &File); - TranslationWriter() : Output(NULL), RefCounter(0) {}; + TranslationWriter(string const &File, string const &TransCompress, mode_t const &Permissions); + TranslationWriter() : Comp(NULL), Output(NULL), RefCounter(0) {}; ~TranslationWriter(); }; -- cgit v1.2.3 From 4a2bb9e60e942b6749c7dbb3763ddf0e3663d5f1 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Mar 2010 22:48:09 +0100 Subject: * doc/apt_preferences.5.xml: - fix a=sid vs. n=sid typo, thanks Ansgar Burchardt! --- debian/changelog | 1 + doc/apt_preferences.5.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d8b8244bf..787a97e3f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,7 @@ apt (0.7.26) UNRELEASED; urgency=low * doc/apt_preferences.5.xml: - fix two typos and be more verbose in the novice warning. Thanks to Osamu Aoki for pointing it out! (Closes: #567669) + - fix a=sid vs. n=sid typo, thanks Ansgar Burchardt! * apt-pkg/deb/dpkgpm.cc: - fix error message construction in OpenLog() - if available store the Commandline in the history diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index e773ad144..c4f18d90a 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -594,7 +594,7 @@ Pin-Priority: 900 Explanation: Debian unstable is always codenamed with sid Package: * -Pin: release a=sid +Pin: release n=sid Pin-Priority: 800 Package: * -- cgit v1.2.3 From 5b71abddc4c7dc5b8e2176319814da586eac839a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Mar 2010 23:24:13 +0100 Subject: * doc/po/de.po: - correct a few typos in the german manpage translation. Thanks to Chris Leick and Georg Koppen! (Closes: #574962) --- debian/changelog | 3 +++ doc/po/de.po | 68 ++++++++++++++++++-------------------------------------- 2 files changed, 25 insertions(+), 46 deletions(-) diff --git a/debian/changelog b/debian/changelog index 787a97e3f..f48cbf275 100644 --- a/debian/changelog +++ b/debian/changelog @@ -55,6 +55,9 @@ apt (0.7.26) UNRELEASED; urgency=low * ftparchive/writer.cc: - write LongDescriptions if they shouldn't be included in Packages file into i18n/Translation-en by default. + * doc/po/de.po: + - correct a few typos in the german manpage translation. + Thanks to Chris Leick and Georg Koppen! (Closes: #574962) [ Julian Andres Klode ] * cmdline/apt-mark: diff --git a/doc/po/de.po b/doc/po/de.po index c431178fb..9270ecef3 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: apt-doc 0.7.24\n" "Report-Msgid-Bugs-To: APT Development Team \n" "POT-Creation-Date: 2010-03-19 11:14+0100\n" -"PO-Revision-Date: 2009-12-31 17:41+GMT\n" +"PO-Revision-Date: 2010-03-22 07:41+0100\n" "Last-Translator: Chris Leick \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -8046,7 +8046,7 @@ msgid "" msgstr "" "Die APT-Einstellungsdatei /etc/apt/preferences und " "Teildateien im Verzeichnis /etc/apt/preferences.d/ " -"können benutzt werden, um zu steuern, welcher Versionen von Paketen zur " +"können benutzt werden, um zu steuern, welche Versionen von Paketen zur " "Installation ausgewählt werden." #. type: Content of: @@ -8064,8 +8064,8 @@ msgstr "" "Es könnten mehrere Versionen eines Pakets zur Installation verfügbar sein, " "wenn die Datei &sources-list; Bezüge zu mehr als einer Distribution enthält " "(zum Beispiel stable und testing). APT " -"weist jeder verfügbaren Version eine Priorität zu. Abhängig von " -"Abhängigkeitsbedingungen, wählt apt-get die Version mit " +"weist jeder verfügbaren Version eine Priorität zu. Je nach " +"Abhängigkeitsbedingungen wählt apt-get die Version mit " "der höchsten Priorität zur Installation aus. Die APT-Einstellungsdatei " "überschreibt die Prioritäten, die APT den Paketversionen standardmäßig " "zuweist, was dem Anwender die Kontrolle darüber gibt, welche zur " @@ -8111,6 +8111,12 @@ msgid "" "underscore (_) and period (.) characters - otherwise they will be silently " "ignored." msgstr "" +"Beachten Sie, dass die Dateien im Verzeichnis /etc/apt/preferences.d in " +"alphanumerisch aufsteigender Richtung ausgewertet werden und der folgenden " +"Namenskonvention unterliegen: Die Dateien haben keine oder »pref« als " +"Dateierweiterung und sie enthalten nur alphanumerische Zeichen, Bindestriche " +"(-), Unterstriche (_) oder Punkte (.). Wenn dies nicht der Fall ist, werden " +"sie stillschweigend ignoriert." #. type: Content of: #: apt_preferences.5.xml:74 @@ -8278,7 +8284,7 @@ msgid "" msgstr "" "In einer typischen Situation ist die Version eines Paketes (Priorität 100) " "nicht so aktuell, wie eine der verfügbaren Versionen, die in der Quellliste " -"der Datei &sources-list; steht (Priorität 500 oder 900). Dann wird ein " +"der Datei &sources-list; steht (Priorität 500 oder 990). Dann wird ein " "Upgrade des Pakets durchgeführt, wenn <command>apt-get install " "<replaceable>irgendein_Paket</replaceable></command> oder <command>apt-get " "upgrade</command> ausgeführt wird." @@ -8374,7 +8380,7 @@ msgid "" "fully qualified domain name." msgstr "" "Die allgemeine Form weist allen Paketversionen in einer gegebenen " -"Distribution (d.h. alle Versionen von Paketen, die in einer bestimmten " +"Distribution (d.h. allen Versionen von Paketen, die in einer bestimmten " "<filename>Release</filename>-Datei gelistet sind) oder allen Paketversionen, " "die von einer speziellen Internet-Site kommen, die durch ihren voll " "ausgebildeten Domänennamen identifiziert wird, eine Priorität zu." @@ -8653,7 +8659,7 @@ msgstr "" "Es wird die aktuellste verfügbare Version des Pakets <literal>perl</literal> " "installiert, so lange die Versionsnummer mit »<literal>5.8</literal>« " "anfängt. Wenn <emphasis>irgendeine</emphasis> 5.8*-Version von " -"<literal>perl</literal>verfügbar ist und die installierte Version 5.9* ist, " +"<literal>perl</literal> verfügbar ist und die installierte Version 5.9* ist, " "dann wird von <literal>perl</literal> ein Downgrade durchgeführt." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> @@ -8912,12 +8918,12 @@ msgstr "" "Die <filename>Release</filename>-Datei ist normalerweise im Verzeichnis " "<filename>.../dists/<replaceable>Distributionsname</replaceable></filename> " "zu finden, zum Beispiel <filename>.../dists/stable/Release</filename> oder " -"<filename>.../dists/woody/Release</filename>. Es besteht aus einem einzelnen " -"mehrzeiligen Datensatz, der auf <emphasis>alle</emphasis> Pakete im " -"Verzeichnisbaum unterhalb des übergeordneten Verzeichnisses zutrifft. Anders " -"als die <filename>Packages</filename>-Datei sind nahezu alle Zeilen in einer " -"<filename>Release</filename>-Datei für das Setzen von APT-Prioritäten " -"relevant: <placeholder type=\"variablelist\" id=\"0\"/>" +"<filename>.../dists/woody/Release</filename>. Sie besteht aus einem " +"einzelnen mehrzeiligen Datensatz, der auf <emphasis>alle</emphasis> Pakete " +"im Verzeichnisbaum unterhalb des übergeordneten Verzeichnisses zutrifft. " +"Anders als die <filename>Packages</filename>-Datei sind nahezu alle Zeilen " +"in einer <filename>Release</filename>-Datei für das Setzen von " +"APT-Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml:454 @@ -8957,7 +8963,7 @@ msgid "" "more lines beginning with the word <literal>Explanation:</literal>. This " "provides a place for comments." msgstr "" -"Optional kann jeder Datensatz im der APT-Einstellungsdatei mit einer oder " +"Optional kann jeder Datensatz in der APT-Einstellungsdatei mit einer oder " "mehreren Zeilen beginnen, die mit dem Wort <literal>Explanation:</literal> " "anfangen. Dieses stellt einen Platz für Kommentare bereit." @@ -8995,7 +9001,7 @@ msgid "" "Pin-Priority: -10\n" msgstr "" "Explanation: Deinstallieren oder nicht installieren von anderen von Debian\n" -"Explanation: stammenden Paketversionen, als denen der Stable-Distribution\n" +"Explanation: stammenden Paketversionen als denen der Stable-Distribution\n" "Package: *\n" "Pin: release a=stable\n" "Pin-Priority: 900\n" @@ -9179,7 +9185,7 @@ msgid "" "Pin-Priority: -10\n" msgstr "" "Explanation: Deinstallieren oder nicht installieren von anderen von Debian\n" -"Explanation: stammenden Paketversionen, als denen der Squeeze- oder Sid-Distribution\n" +"Explanation: stammenden Paketversionen als denen der Squeeze- oder Sid-Distribution\n" "Package: *\n" "Pin: release n=squeeze\n" "Pin-Priority: 900\n" @@ -11372,33 +11378,3 @@ msgstr " # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade" #: offline.sgml:234 msgid "Which will use the already fetched archives on the disc." msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen." - -#~ msgid "" -#~ "<filename>apt.conf</filename> is the main configuration file for the APT " -#~ "suite of tools, all tools make use of the configuration file and a common " -#~ "command line parser to provide a uniform environment. When an APT tool " -#~ "starts up it will read the configuration specified by the " -#~ "<envar>APT_CONFIG</envar> environment variable (if any) and then read the " -#~ "files in <literal>Dir::Etc::Parts</literal> then read the main " -#~ "configuration file specified by <literal>Dir::Etc::main</literal> then " -#~ "finally apply the command line options to override the configuration " -#~ "directives, possibly loading even more config files." -#~ msgstr "" -#~ "<filename>apt.conf</filename> ist die Hauptkonfigurationsdatei für die " -#~ "APT-Werkzeugsammlung. Alle Werkzeuge benutzen die Konfigurationsdatei und " -#~ "einen gemeinsamen Befehlszeilenauswerter, um eine einheitliche Umgebung " -#~ "bereitzustellen. Wenn ein APT-Werkzeug startet, liest es die in der " -#~ "Umgebungsvariablen <envar>APT_CONFIG</envar> (falls vorhanden) angegebene " -#~ "Konfiguration, dann die Dateien in <literal>Dir::Etc::Parts</literal>, " -#~ "dann die durch <literal>Dir::Etc::main</literal> angegebene " -#~ "Konfigurationsdatei und übernimmt am Ende die Befehlszeilenoptionen, um " -#~ "Konfigurationsdirektiven zu überschreiben und möglicherweise sogar " -#~ "weitere Konfigurationsdateien zu laden." - -#~ msgid "<filename>/etc/apt/trusted.gpg</filename>" -#~ msgstr "<filename>/etc/apt/trusted.gpg</filename>" - -#~ msgid "Keyring of local trusted keys, new keys will be added here." -#~ msgstr "" -#~ "Schlüsselring der lokalen vertrauenswürdigen Schlüssel, neue Schlüssel " -#~ "werden hier hinzugefügt." -- cgit v1.2.3 From 4fb6fdaf95de3db51ef386de7b494ed4c889bedc Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 26 Mar 2010 23:51:14 +0100 Subject: origin can be used to match a hostname (Closes: #352667) --- debian/changelog | 1 + doc/apt_preferences.5.xml | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f48cbf275..9bae5210e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,7 @@ apt (0.7.26) UNRELEASED; urgency=low - fix two typos and be more verbose in the novice warning. Thanks to Osamu Aoki for pointing it out! (Closes: #567669) - fix a=sid vs. n=sid typo, thanks Ansgar Burchardt! + - origin can be used to match a hostname (Closes: #352667) * apt-pkg/deb/dpkgpm.cc: - fix error message construction in OpenLog() - if available store the Commandline in the history diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index c4f18d90a..c927f327a 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -195,8 +195,15 @@ Pin: origin "" Pin-Priority: 999 </programlisting> -<simpara>A note of caution: the keyword used here is "<literal>origin</literal>". -This should not be confused with the Origin of a distribution as +<simpara>A note of caution: the keyword used here is "<literal>origin</literal>" +which can be used to match a hostname. The following record will assign a high priority +to all versions available from the server identified by the hostname "ftp.de.debian.org"</simpara> +<programlisting> +Package: * +Pin: origin "ftp.de.debian.org" +Pin-Priority: 999 +</programlisting> +<simpara>This should <emphasis>not</emphasis> be confused with the Origin of a distribution as specified in a <filename>Release</filename> file. What follows the "Origin:" tag in a <filename>Release</filename> file is not an Internet address but an author or vendor name, such as "Debian" or "Ximian".</simpara> -- cgit v1.2.3 From b569b4650c647c3aef5341c40d208a37211b57aa Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 27 Mar 2010 00:01:34 +0100 Subject: remove wrong pin-priority is optional remark (Closes: #574944) --- debian/changelog | 1 + doc/apt_preferences.5.xml | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9bae5210e..17affee4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,7 @@ apt (0.7.26) UNRELEASED; urgency=low Thanks to Osamu Aoki for pointing it out! (Closes: #567669) - fix a=sid vs. n=sid typo, thanks Ansgar Burchardt! - origin can be used to match a hostname (Closes: #352667) + - remove wrong pin-priority is optional remark (Closes: #574944) * apt-pkg/deb/dpkgpm.cc: - fix error message construction in OpenLog() - if available store the Commandline in the history diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index c927f327a..77b7776e8 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -476,10 +476,6 @@ distribution.</para> <para>Each record in the APT preferences file can optionally begin with one or more lines beginning with the word <literal>Explanation:</literal>. This provides a place for comments.</para> - -<para>The <literal>Pin-Priority:</literal> line in each APT preferences record is -optional. If omitted, APT assigns a priority of 1 less than the last value -specified on a line beginning with <literal>Pin-Priority: release ...</literal>.</para> </refsect2> </refsect1> -- cgit v1.2.3 From 6dc60370a750334cb701386cfa4ef9719db9078a Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 30 Mar 2010 12:38:38 +0200 Subject: replace every call to toupper with one to our own tolower_ascii This sounds like a premature optimization and since Mr. Knuth we all know that they are the root of all evil - but, and here it starts to be interesting: As the tolower_ascii method is by far the most called method we have (~60 Mio. times) and as we compare only strings containing ascii characters (package names, configuration options) using our own method reduces execution time of APT by 4% plus it avoids that the locale settings can influence us. --- apt-pkg/contrib/error.h | 8 ++++---- apt-pkg/contrib/macros.h | 10 ++++++---- apt-pkg/contrib/strutl.cc | 49 +++++++++++++++++++++++++---------------------- apt-pkg/contrib/strutl.h | 21 ++++++-------------- debian/changelog | 2 ++ 5 files changed, 44 insertions(+), 46 deletions(-) diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index 90747ff7e..8d5ec05ea 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -60,13 +60,13 @@ class GlobalError public: // Call to generate an error from a library call. - bool Errno(const char *Function,const char *Description,...) __like_printf_2 __cold; - bool WarningE(const char *Function,const char *Description,...) __like_printf_2 __cold; + bool Errno(const char *Function,const char *Description,...) __like_printf(3) __cold; + bool WarningE(const char *Function,const char *Description,...) __like_printf(3) __cold; /* A warning should be considered less severe than an error, and may be ignored by the client. */ - bool Error(const char *Description,...) __like_printf_1 __cold; - bool Warning(const char *Description,...) __like_printf_1 __cold; + bool Error(const char *Description,...) __like_printf(2) __cold; + bool Warning(const char *Description,...) __like_printf(2) __cold; // Simple accessors inline bool PendingError() {return PendingFlag;}; diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h index c39caf198..62e7b65db 100644 --- a/apt-pkg/contrib/macros.h +++ b/apt-pkg/contrib/macros.h @@ -58,6 +58,7 @@ #if __GNUC__ >= 3 #define __must_check __attribute__ ((warn_unused_result)) #define __deprecated __attribute__ ((deprecated)) + #define __attrib_const __attribute__ ((__const__)) /* likely() and unlikely() can be used to mark boolean expressions as (not) likely true which will help the compiler to optimise */ #define likely(x) __builtin_expect (!!(x), 1) @@ -65,6 +66,7 @@ #else #define __must_check /* no warn_unused_result */ #define __deprecated /* no deprecated */ + #define __attrib_const /* no const attribute */ #define likely(x) (x) #define unlikely(x) (x) #endif @@ -72,17 +74,17 @@ // cold functions are unlikely() to be called #if (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4 #define __cold __attribute__ ((__cold__)) + #define __hot __attribute__ ((__hot__)) #else #define __cold /* no cold marker */ + #define __hot /* no hot marker */ #endif #ifdef __GNUG__ // Methods have a hidden this parameter that is visible to this attribute - #define __like_printf_1 __attribute__ ((format (printf, 2, 3))) - #define __like_printf_2 __attribute__ ((format (printf, 3, 4))) + #define __like_printf(n) __attribute__((format(printf, n, n + 1))) #else - #define __like_printf_1 /* no like-printf */ - #define __like_printf_2 /* no like-printf */ + #define __like_printf(n) /* no like-printf */ #endif #endif diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 1b9922a31..ab47cdede 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -566,7 +566,7 @@ int stringcmp(string::const_iterator A,string::const_iterator AEnd, int stringcasecmp(const char *A,const char *AEnd,const char *B,const char *BEnd) { for (; A != AEnd && B != BEnd; A++, B++) - if (toupper(*A) != toupper(*B)) + if (tolower_ascii(*A) != tolower_ascii(*B)) break; if (A == AEnd && B == BEnd) @@ -575,7 +575,7 @@ int stringcasecmp(const char *A,const char *AEnd,const char *B,const char *BEnd) return 1; if (B == BEnd) return -1; - if (toupper(*A) < toupper(*B)) + if (tolower_ascii(*A) < tolower_ascii(*B)) return -1; return 1; } @@ -584,7 +584,7 @@ int stringcasecmp(string::const_iterator A,string::const_iterator AEnd, const char *B,const char *BEnd) { for (; A != AEnd && B != BEnd; A++, B++) - if (toupper(*A) != toupper(*B)) + if (tolower_ascii(*A) != tolower_ascii(*B)) break; if (A == AEnd && B == BEnd) @@ -593,7 +593,7 @@ int stringcasecmp(string::const_iterator A,string::const_iterator AEnd, return 1; if (B == BEnd) return -1; - if (toupper(*A) < toupper(*B)) + if (tolower_ascii(*A) < tolower_ascii(*B)) return -1; return 1; } @@ -601,7 +601,7 @@ int stringcasecmp(string::const_iterator A,string::const_iterator AEnd, string::const_iterator B,string::const_iterator BEnd) { for (; A != AEnd && B != BEnd; A++, B++) - if (toupper(*A) != toupper(*B)) + if (tolower_ascii(*A) != tolower_ascii(*B)) break; if (A == AEnd && B == BEnd) @@ -610,7 +610,7 @@ int stringcasecmp(string::const_iterator A,string::const_iterator AEnd, return 1; if (B == BEnd) return -1; - if (toupper(*A) < toupper(*B)) + if (tolower_ascii(*A) < tolower_ascii(*B)) return -1; return 1; } @@ -789,28 +789,28 @@ bool ReadMessages(int Fd, vector<string> &List) // MonthConv - Converts a month string into a number /*{{{*/ // --------------------------------------------------------------------- /* This was lifted from the boa webserver which lifted it from 'wn-v1.07' - Made it a bit more robust with a few touppers though. */ + Made it a bit more robust with a few tolower_ascii though. */ static int MonthConv(char *Month) { - switch (toupper(*Month)) + switch (tolower_ascii(*Month)) { - case 'A': - return toupper(Month[1]) == 'P'?3:7; - case 'D': + case 'a': + return tolower_ascii(Month[1]) == 'p'?3:7; + case 'd': return 11; - case 'F': + case 'f': return 1; - case 'J': - if (toupper(Month[1]) == 'A') + case 'j': + if (tolower_ascii(Month[1]) == 'a') return 0; - return toupper(Month[2]) == 'N'?5:6; - case 'M': - return toupper(Month[2]) == 'R'?2:4; - case 'N': + return tolower_ascii(Month[2]) == 'n'?5:6; + case 'm': + return tolower_ascii(Month[2]) == 'r'?2:4; + case 'n': return 10; - case 'O': + case 'o': return 9; - case 'S': + case 's': return 8; // Pretend it is January.. @@ -1133,10 +1133,13 @@ char *safe_snprintf(char *Buffer,char *End,const char *Format,...) // tolower_ascii - tolower() function that ignores the locale /*{{{*/ // --------------------------------------------------------------------- -/* */ -int tolower_ascii(int c) +/* This little function is the most called method we have and tries + therefore to do the absolut minimum - and is noteable faster than + standard tolower/toupper and as a bonus avoids problems with different + locales - we only operate on ascii chars anyway. */ +int tolower_ascii(int const c) { - if (c >= 'A' and c <= 'Z') + if (c >= 'A' && c <= 'Z') return c + 32; return c; } diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index e72288f4c..cdf78f317 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -25,19 +25,12 @@ #include <iostream> #include <time.h> +#include "macros.h" + using std::string; using std::vector; using std::ostream; -#ifdef __GNUG__ -// Methods have a hidden this parameter that is visible to this attribute -#define APT_FORMAT2 __attribute__ ((format (printf, 2, 3))) -#define APT_FORMAT3 __attribute__ ((format (printf, 3, 4))) -#else -#define APT_FORMAT2 -#define APT_FORMAT3 -#endif - bool UTF8ToCodeset(const char *codeset, const string &orig, string *dest); char *_strstrip(char *String); char *_strtabexpand(char *String,size_t Len); @@ -60,11 +53,11 @@ bool Hex2Num(const string &Str,unsigned char *Num,unsigned int Length); bool TokSplitString(char Tok,char *Input,char **List, unsigned long ListMax); vector<string> ExplodeString(string const &haystack, char const &split); -void ioprintf(ostream &out,const char *format,...) APT_FORMAT2; -void strprintf(string &out,const char *format,...) APT_FORMAT2; -char *safe_snprintf(char *Buffer,char *End,const char *Format,...) APT_FORMAT3; +void ioprintf(ostream &out,const char *format,...) __like_printf(2); +void strprintf(string &out,const char *format,...) __like_printf(2); +char *safe_snprintf(char *Buffer,char *End,const char *Format,...) __like_printf(3); bool CheckDomainList(const string &Host, const string &List); -int tolower_ascii(int c); +int tolower_ascii(int const c) __attrib_const __hot; #define APT_MKSTRCMP(name,func) \ inline int name(const char *A,const char *B) {return func(A,A+strlen(A),B,B+strlen(B));}; \ @@ -144,6 +137,4 @@ struct RxChoiceList unsigned long RegexChoice(RxChoiceList *Rxs,const char **ListBegin, const char **ListEnd); -#undef APT_FORMAT2 - #endif diff --git a/debian/changelog b/debian/changelog index 17affee4f..bd1fda316 100644 --- a/debian/changelog +++ b/debian/changelog @@ -60,6 +60,8 @@ apt (0.7.26) UNRELEASED; urgency=low * doc/po/de.po: - correct a few typos in the german manpage translation. Thanks to Chris Leick and Georg Koppen! (Closes: #574962) + * apt-pkg/contrib/strutl.cc: + - convert all toupper calls to tolower_ascii for a little speedup [ Julian Andres Klode ] * cmdline/apt-mark: -- cgit v1.2.3 From c408e01e546e641a0906f188ca6bb924a2f17b40 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 30 Mar 2010 12:39:33 +0200 Subject: Group packages in the same group together in the package list so it is easier to find them later on as we have no "noice" anymore between them. --- apt-pkg/pkgcache.cc | 17 +++++------------ apt-pkg/pkgcachegen.cc | 26 +++++++++++++++++--------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index fe8757ded..1bbd74bd9 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -343,24 +343,17 @@ pkgCache::PkgIterator pkgCache::GrpIterator::FindPkg(string Arch) { // GrpIterator::NextPkg - Locate the next package in the group /*{{{*/ // --------------------------------------------------------------------- /* Returns an End-Pointer on error, pointer to the package otherwise. - We can't simply ++ to the next as the list of packages includes - "package noise" (= packages with the same hash value but different name) */ + We can't simply ++ to the next as the next package of the last will + be from a different group (with the same hash value) */ pkgCache::PkgIterator pkgCache::GrpIterator::NextPkg(pkgCache::PkgIterator const &LastPkg) { if (unlikely(IsGood() == false || S->FirstPackage == 0 || LastPkg.end() == true)) return PkgIterator(*Owner, 0); - // Iterate over the list to find the next package - pkgCache::Package *Pkg = Owner->PkgP + LastPkg.Index(); - Pkg = Owner->PkgP + Pkg->NextPackage; - for (; Pkg != Owner->PkgP; Pkg = Owner->PkgP + Pkg->NextPackage) { - if (S->Name == Pkg->Name) - return PkgIterator(*Owner, Pkg); - if ((Owner->PkgP + S->LastPackage) == Pkg) - break; - } + if (S->LastPackage == LastPkg.Index()) + return PkgIterator(*Owner, 0); - return PkgIterator(*Owner, 0); + return PkgIterator(*Owner, Owner->PkgP + LastPkg->NextPackage); } /*}}}*/ // GrpIterator::operator ++ - Postfix incr /*{{{*/ diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 8187b3950..577e2f1d4 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -379,15 +379,23 @@ bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name return false; Pkg = pkgCache::PkgIterator(Cache,Cache.PkgP + Package); - // Insert it into the hash table - unsigned long const Hash = Cache.Hash(Name); - Pkg->NextPackage = Cache.HeaderP->PkgHashTable[Hash]; - Cache.HeaderP->PkgHashTable[Hash] = Package; - - // remember the packages in the group - Grp->FirstPackage = Package; - if (Grp->LastPackage == 0) - Grp->LastPackage = Package; + // Insert the package into our package list + if (Grp->FirstPackage == 0) // the group is new + { + // Insert it into the hash table + unsigned long const Hash = Cache.Hash(Name); + Pkg->NextPackage = Cache.HeaderP->PkgHashTable[Hash]; + Cache.HeaderP->PkgHashTable[Hash] = Package; + Grp->FirstPackage = Package; + } + else // Group the Packages together + { + // this package is the new last package + pkgCache::PkgIterator LastPkg(Cache, Cache.PkgP + Grp->LastPackage); + Pkg->NextPackage = LastPkg->NextPackage; + LastPkg->NextPackage = Package; + } + Grp->LastPackage = Package; // Set the name, arch and the ID Pkg->Name = Grp->Name; -- cgit v1.2.3 From 3f42500d6b9eb318c46cacafdcfd6beb707ef9e9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 30 Mar 2010 14:25:57 +0200 Subject: rename ExplodeString to VectorizeString --- apt-pkg/aptconfiguration.cc | 2 +- apt-pkg/contrib/strutl.cc | 6 +++--- apt-pkg/contrib/strutl.h | 2 +- apt-pkg/deb/debmetaindex.cc | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index a1379ce7d..2acf8dd9f 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -221,7 +221,7 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All, const char *language_env = getenv("LANGUAGE") == 0 ? "" : getenv("LANGUAGE"); string envLang = Locale == 0 ? language_env : *(Locale+1); if (envLang.empty() == false) { - std::vector<string> env = ExplodeString(envLang,':'); + std::vector<string> env = VectorizeString(envLang,':'); short addedLangs = 0; // add a maximum of 3 fallbacks from the environment for (std::vector<string>::const_iterator e = env.begin(); e != env.end() && addedLangs < 3; ++e) { diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index ab47cdede..7eb986ac0 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -1000,12 +1000,12 @@ bool TokSplitString(char Tok,char *Input,char **List, return true; } /*}}}*/ -// ExplodeString - Split a string up into a vector /*{{{*/ +// VectorizeString - Split a string up into a vector of strings /*{{{*/ // --------------------------------------------------------------------- /* This can be used to split a given string up into a vector, so the propose is the same as in the method above and this one is a bit slower - also, but the advantage is that we an iteratable vector */ -vector<string> ExplodeString(string const &haystack, char const &split) + also, but the advantage is that we have an iteratable vector */ +vector<string> VectorizeString(string const &haystack, char const &split) { string::const_iterator start = haystack.begin(); string::const_iterator end = start; diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index cdf78f317..d8070d3f5 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -52,7 +52,7 @@ bool StrToNum(const char *Str,unsigned long &Res,unsigned Len,unsigned Base = 0) bool Hex2Num(const string &Str,unsigned char *Num,unsigned int Length); bool TokSplitString(char Tok,char *Input,char **List, unsigned long ListMax); -vector<string> ExplodeString(string const &haystack, char const &split); +vector<string> VectorizeString(string const &haystack, char const &split) __attrib_const; void ioprintf(ostream &out,const char *format,...) __like_printf(2); void strprintf(string &out,const char *format,...) __like_printf(2); char *safe_snprintf(char *Buffer,char *End,const char *Format,...) __like_printf(3); diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index 947a7f04b..8df3ed18d 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -313,7 +313,7 @@ class debSLTypeDebian : public pkgSourceList::Type { map<string, string>::const_iterator const arch = Options.find("arch"); vector<string> const Archs = - (arch != Options.end()) ? ExplodeString(arch->second, ',') : + (arch != Options.end()) ? VectorizeString(arch->second, ',') : APT::Configuration::getArchitectures(); for (vector<metaIndex *>::const_iterator I = List.begin(); -- cgit v1.2.3 From 33dd02e3a95141d4e16677048614c3171c4c4ffc Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 30 Mar 2010 14:45:38 +0200 Subject: convert some tabs to spaces to respect the style guide --- apt-pkg/deb/deblistparser.cc | 39 +++++----- apt-pkg/pkgcachegen.cc | 169 +++++++++++++++++++++++-------------------- 2 files changed, 109 insertions(+), 99 deletions(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 947e060e3..0551a5f7c 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -36,8 +36,8 @@ static debListParser::WordList PrioList[] = {{"important",pkgCache::State::Impor we would accept in general with checkArchitecture() */ debListParser::debListParser(FileFd *File, string const &Arch) : Tags(File), Arch(Arch) { - if (Arch == "native") - this->Arch = _config->Find("APT::Architecture"); + if (Arch == "native") + this->Arch = _config->Find("APT::Architecture"); } /*}}}*/ // ListParser::UniqFindTagWrite - Find the tag and write a unq string /*{{{*/ @@ -56,10 +56,10 @@ unsigned long debListParser::UniqFindTagWrite(const char *Tag) // --------------------------------------------------------------------- /* This is to return the name of the package this section describes */ string debListParser::Package() { - string const Result = Section.FindS("Package"); - if(unlikely(Result.empty() == true)) - _error->Error("Encountered a section with no Package: header"); - return Result; + string const Result = Section.FindS("Package"); + if(unlikely(Result.empty() == true)) + _error->Error("Encountered a section with no Package: header"); + return Result; } /*}}}*/ // ListParser::Architecture - Return the package arch /*{{{*/ @@ -68,25 +68,26 @@ string debListParser::Package() { Note that architecture "all" packages will get the architecture of the Packages file parsed here. */ string debListParser::Architecture() { - string const Result = Section.FindS("Architecture"); - if (Result.empty() == true || Result == "all") { - if (Arch.empty() == true) - /* FIXME: this is a problem for installed arch all - packages as we don't know from which arch this - package was installed - and therefore which - dependency this package resolves. */ - return _config->Find("APT::Architecture"); - else - return Arch; - } - return Result; + string const Result = Section.FindS("Architecture"); + if (Result.empty() == true || Result == "all") + { + if (Arch.empty() == true) + /* FIXME: this is a problem for installed arch all + packages as we don't know from which arch this + package was installed - and therefore which + dependency this package resolves. */ + return _config->Find("APT::Architecture"); + else + return Arch; + } + return Result; } /*}}}*/ // ListParser::ArchitectureAll /*{{{*/ // --------------------------------------------------------------------- /* */ bool debListParser::ArchitectureAll() { - return Section.FindS("Architecture") == "all"; + return Section.FindS("Architecture") == "all"; } /*}}}*/ // ListParser::Version - Return the version string /*{{{*/ diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 577e2f1d4..21240b951 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -335,29 +335,30 @@ bool pkgCacheGenerator::MergeFileProvides(ListParser &List) // CacheGenerator::NewGroup - Add a new group /*{{{*/ // --------------------------------------------------------------------- /* This creates a new group structure and adds it to the hash table */ -bool pkgCacheGenerator::NewGroup(pkgCache::GrpIterator &Grp, const string &Name) { - Grp = Cache.FindGrp(Name); - if (Grp.end() == false) - return true; +bool pkgCacheGenerator::NewGroup(pkgCache::GrpIterator &Grp, const string &Name) +{ + Grp = Cache.FindGrp(Name); + if (Grp.end() == false) + return true; - // Get a structure - unsigned long const Group = Map.Allocate(sizeof(pkgCache::Group)); - if (unlikely(Group == 0)) - return false; + // Get a structure + unsigned long const Group = Map.Allocate(sizeof(pkgCache::Group)); + if (unlikely(Group == 0)) + return false; - Grp = pkgCache::GrpIterator(Cache, Cache.GrpP + Group); - Grp->Name = Map.WriteString(Name); - if (unlikely(Grp->Name == 0)) - return false; + Grp = pkgCache::GrpIterator(Cache, Cache.GrpP + Group); + Grp->Name = Map.WriteString(Name); + if (unlikely(Grp->Name == 0)) + return false; - // Insert it into the hash table - unsigned long const Hash = Cache.Hash(Name); - Grp->Next = Cache.HeaderP->GrpHashTable[Hash]; - Cache.HeaderP->GrpHashTable[Hash] = Group; + // Insert it into the hash table + unsigned long const Hash = Cache.Hash(Name); + Grp->Next = Cache.HeaderP->GrpHashTable[Hash]; + Cache.HeaderP->GrpHashTable[Hash] = Group; - Cache.HeaderP->GroupCount++; + Cache.HeaderP->GroupCount++; - return true; + return true; } /*}}}*/ // CacheGenerator::NewPackage - Add a new package /*{{{*/ @@ -526,68 +527,76 @@ map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc, // CacheGenerator::FinishCache - do various finish operations /*{{{*/ // --------------------------------------------------------------------- /* This prepares the Cache for delivery */ -bool pkgCacheGenerator::FinishCache(OpProgress &Progress) { - // FIXME: add progress reporting for this operation - // Do we have different architectures in your groups ? - vector<string> archs = APT::Configuration::getArchitectures(); - if (archs.size() > 1) { - // Create Conflicts in between the group - for (pkgCache::GrpIterator G = GetCache().GrpBegin(); G.end() != true; G++) { - string const PkgName = G.Name(); - for (pkgCache::PkgIterator P = G.PackageList(); P.end() != true; P = G.NextPkg(P)) { - if (strcmp(P.Arch(),"all") == 0) - continue; - pkgCache::PkgIterator allPkg; - for (pkgCache::VerIterator V = P.VersionList(); V.end() != true; V++) { - string const Arch = V.Arch(true); - map_ptrloc *OldDepLast = NULL; - /* MultiArch handling introduces a lot of implicit Dependencies: - - MultiArch: same → Co-Installable if they have the same version - - Architecture: all → Need to be Co-Installable for internal reasons - - All others conflict with all other group members */ - bool const coInstall = (V->MultiArch == pkgCache::Version::All || - V->MultiArch == pkgCache::Version::Same); - if (V->MultiArch == pkgCache::Version::All && allPkg.end() == true) - allPkg = G.FindPkg("all"); - for (vector<string>::const_iterator A = archs.begin(); A != archs.end(); ++A) { - if (*A == Arch) - continue; - /* We allow only one installed arch at the time - per group, therefore each group member conflicts - with all other group members */ - pkgCache::PkgIterator D = G.FindPkg(*A); - if (D.end() == true) - continue; - if (coInstall == true) { - // Replaces: ${self}:other ( << ${binary:Version}) - NewDepends(D, V, V.VerStr(), - pkgCache::Dep::Less, pkgCache::Dep::Replaces, - OldDepLast); - // Breaks: ${self}:other (!= ${binary:Version}) - NewDepends(D, V, V.VerStr(), - pkgCache::Dep::Less, pkgCache::Dep::DpkgBreaks, - OldDepLast); - NewDepends(D, V, V.VerStr(), - pkgCache::Dep::Greater, pkgCache::Dep::DpkgBreaks, - OldDepLast); - if (V->MultiArch == pkgCache::Version::All) { - // Depend on ${self}:all which does depend on nothing - NewDepends(allPkg, V, V.VerStr(), - pkgCache::Dep::Equals, pkgCache::Dep::Depends, - OldDepLast); - } - } else { - // Conflicts: ${self}:other - NewDepends(D, V, "", - pkgCache::Dep::NoOp, pkgCache::Dep::Conflicts, - OldDepLast); - } - } - } - } - } - } - return true; +bool pkgCacheGenerator::FinishCache(OpProgress &Progress) +{ + // FIXME: add progress reporting for this operation + // Do we have different architectures in your groups ? + vector<string> archs = APT::Configuration::getArchitectures(); + if (archs.size() > 1) + { + // Create Conflicts in between the group + for (pkgCache::GrpIterator G = GetCache().GrpBegin(); G.end() != true; G++) + { + string const PkgName = G.Name(); + for (pkgCache::PkgIterator P = G.PackageList(); P.end() != true; P = G.NextPkg(P)) + { + if (strcmp(P.Arch(),"all") == 0) + continue; + pkgCache::PkgIterator allPkg; + for (pkgCache::VerIterator V = P.VersionList(); V.end() != true; V++) + { + string const Arch = V.Arch(true); + map_ptrloc *OldDepLast = NULL; + /* MultiArch handling introduces a lot of implicit Dependencies: + - MultiArch: same → Co-Installable if they have the same version + - Architecture: all → Need to be Co-Installable for internal reasons + - All others conflict with all other group members */ + bool const coInstall = (V->MultiArch == pkgCache::Version::All || + V->MultiArch == pkgCache::Version::Same); + if (V->MultiArch == pkgCache::Version::All && allPkg.end() == true) + allPkg = G.FindPkg("all"); + for (vector<string>::const_iterator A = archs.begin(); A != archs.end(); ++A) + { + if (*A == Arch) + continue; + /* We allow only one installed arch at the time + per group, therefore each group member conflicts + with all other group members */ + pkgCache::PkgIterator D = G.FindPkg(*A); + if (D.end() == true) + continue; + if (coInstall == true) + { + // Replaces: ${self}:other ( << ${binary:Version}) + NewDepends(D, V, V.VerStr(), + pkgCache::Dep::Less, pkgCache::Dep::Replaces, + OldDepLast); + // Breaks: ${self}:other (!= ${binary:Version}) + NewDepends(D, V, V.VerStr(), + pkgCache::Dep::Less, pkgCache::Dep::DpkgBreaks, + OldDepLast); + NewDepends(D, V, V.VerStr(), + pkgCache::Dep::Greater, pkgCache::Dep::DpkgBreaks, + OldDepLast); + if (V->MultiArch == pkgCache::Version::All) + { + // Depend on ${self}:all which does depend on nothing + NewDepends(allPkg, V, V.VerStr(), + pkgCache::Dep::Equals, pkgCache::Dep::Depends, + OldDepLast); + } + } else { + // Conflicts: ${self}:other + NewDepends(D, V, "", + pkgCache::Dep::NoOp, pkgCache::Dep::Conflicts, + OldDepLast); + } + } + } + } + } + } + return true; } /*}}}*/ // CacheGenerator::NewDepends - Create a dependency element /*{{{*/ -- cgit v1.2.3 From e84adb76c87f419ed5bad8f7d08a4132de2bc406 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 30 Mar 2010 17:47:19 +0200 Subject: try version match in FindSrc first exact than fuzzy (LP: #551178) --- cmdline/apt-get.cc | 32 +++++++++++++++++++++----------- debian/changelog | 1 + 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 7875ae20f..5af2dca04 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1291,12 +1291,26 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, { if(VerTag.empty() == false || DefRel.empty() == false) { + bool fuzzy = false; // we have a default release, try to locate the pkg. we do it like // this because GetCandidateVer() will not "downgrade", that means // "apt-get source -t stable apt" won't work on a unstable system - for (pkgCache::VerIterator Ver = Pkg.VersionList(); - Ver.end() == false; Ver++) + for (pkgCache::VerIterator Ver = Pkg.VersionList();; Ver++) { + // try first only exact matches, later fuzzy matches + if (Ver.end() == true) + { + if (fuzzy == true) + break; + fuzzy = true; + Ver = Pkg.VersionList(); + } + // We match against a concrete version (or a part of this version) + if (VerTag.empty() == false && + (fuzzy == true || Cache.VS().CmpVersion(VerTag, Ver.VerStr()) != 0) && // exact match + (fuzzy == false || strncmp(VerTag.c_str(), Ver.VerStr(), VerTag.size()) != 0)) // fuzzy match + continue; + for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false; VF++) { @@ -1309,10 +1323,6 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, pkgCache::Flag::NotSource && Pkg.CurrentVer() != Ver) continue; - // We match against a concrete version (or a part of this version) - if (VerTag.empty() == false && strncmp(VerTag.c_str(), Ver.VerStr(), VerTag.size()) != 0) - continue; - // or we match against a release if(VerTag.empty() == false || (VF.File().Archive() != 0 && VF.File().Archive() == DefRel) || @@ -1323,10 +1333,9 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, // no SourcePkg name, so it is the "binary" name if (Src.empty() == true) Src = TmpSrc; - // no Version, so we try the Version of the SourcePkg - - // and after that the version of the binary package - if (VerTag.empty() == true) - VerTag = Parse.SourceVer(); + // the Version we have is possibly fuzzy or includes binUploads, + // so we use the Version of the SourcePkg (empty if same as package) + VerTag = Parse.SourceVer(); if (VerTag.empty() == true) VerTag = Ver.VerStr(); break; @@ -1390,7 +1399,8 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, const string Ver = Parse->Version(); // Ignore all versions which doesn't fit - if (VerTag.empty() == false && strncmp(VerTag.c_str(), Ver.c_str(), VerTag.size()) != 0) + if (VerTag.empty() == false && + Cache.VS().CmpVersion(VerTag, Ver) != 0) // exact match continue; // Newer version or an exact match? Save the hit diff --git a/debian/changelog b/debian/changelog index bd1fda316..61a4dc618 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,7 @@ apt (0.7.26) UNRELEASED; urgency=low * cmdline/apt-get.cc: - add a --only-upgrade flag to install command (Closes: #572259) - fix memory leaks in error conditions in DoSource() + - try version match in FindSrc first exact than fuzzy (LP: #551178) * apt-pkg/contrib/cmndline.cc: - save Commandline in Commandline::AsString for logging * apt-pkg/deb/debversion.cc: -- cgit v1.2.3 From 436d7eab92bb8f9cc6498acfbf2055e717be6fd0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 31 Mar 2010 17:19:10 +0200 Subject: Userinfo is urlencoded in URIs (RFC 3986) Thanks to Jean-Baptiste Lallement for spotting and fixing it! * apt-pkg/contrib/strutl.cc: - always escape '%' (LP: #130289) (Closes: #500560) - unescape '%' sequence only if followed by 2 hex digit - username/password are urlencoded in proxy string (RFC 3986) --- apt-pkg/contrib/strutl.cc | 21 +++++++++++++++------ apt-pkg/contrib/strutl.h | 1 + debian/changelog | 6 ++++++ 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 7eb986ac0..c7d63ce8a 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -198,7 +198,8 @@ bool ParseQuoteWord(const char *&String,string &Res) char *I; for (I = Buffer; I < Buffer + sizeof(Buffer) && Start != C; I++) { - if (*Start == '%' && Start + 2 < C) + if (*Start == '%' && Start + 2 < C && + isxdigit(Start[1]) && isxdigit(Start[2])) { Tmp[0] = Start[1]; Tmp[1] = Start[2]; @@ -273,7 +274,8 @@ string QuoteString(const string &Str, const char *Bad) for (string::const_iterator I = Str.begin(); I != Str.end(); I++) { if (strchr(Bad,*I) != 0 || isprint(*I) == 0 || - *I <= 0x20 || *I >= 0x7F) + *I == 0x25 || // percent '%' char + *I <= 0x20 || *I >= 0x7F) // control chars { char Buf[10]; sprintf(Buf,"%%%02x",(int)*I); @@ -289,11 +291,17 @@ string QuoteString(const string &Str, const char *Bad) // --------------------------------------------------------------------- /* This undoes QuoteString */ string DeQuoteString(const string &Str) +{ + return DeQuoteString(Str.begin(),Str.end()); +} +string DeQuoteString(string::const_iterator const &begin, + string::const_iterator const &end) { string Res; - for (string::const_iterator I = Str.begin(); I != Str.end(); I++) + for (string::const_iterator I = begin; I != end; I++) { - if (*I == '%' && I + 2 < Str.end()) + if (*I == '%' && I + 2 < end && + isxdigit(I[1]) && isxdigit(I[2])) { char Tmp[3]; Tmp[0] = I[1]; @@ -1238,9 +1246,10 @@ void URI::CopyFrom(const string &U) else { Host.assign(At+1,SingleSlash); - User.assign(FirstColon,SecondColon); + // username and password must be encoded (RFC 3986) + User.assign(DeQuoteString(FirstColon,SecondColon)); if (SecondColon < At) - Password.assign(SecondColon+1,At); + Password.assign(DeQuoteString(SecondColon+1,At)); } // Now we parse the RFC 2732 [] hostnames. diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index d8070d3f5..e509145f9 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -38,6 +38,7 @@ bool ParseQuoteWord(const char *&String,string &Res); bool ParseCWord(const char *&String,string &Res); string QuoteString(const string &Str,const char *Bad); string DeQuoteString(const string &Str); +string DeQuoteString(string::const_iterator const &begin, string::const_iterator const &end); string SizeToStr(double Bytes); string TimeToStr(unsigned long Sec); string Base64Encode(const string &Str); diff --git a/debian/changelog b/debian/changelog index 61a4dc618..205db85e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -64,6 +64,12 @@ apt (0.7.26) UNRELEASED; urgency=low * apt-pkg/contrib/strutl.cc: - convert all toupper calls to tolower_ascii for a little speedup + [ Jean-Baptiste Lallement ] + * apt-pkg/contrib/strutl.cc: + - always escape '%' (LP: #130289) (Closes: #500560) + - unescape '%' sequence only if followed by 2 hex digit + - username/password are urlencoded in proxy string (RFC 3986) + [ Julian Andres Klode ] * cmdline/apt-mark: - Use the new python-apt API (and conflict with python-apt << 0.7.93.2). -- cgit v1.2.3 From a4787a959bbed2e16f6017c8e3238ae9cf98bc69 Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Wed, 31 Mar 2010 22:00:36 +0200 Subject: cherry pick -r 1983..1984 lp:~donkult/apt/sid --- cmdline/apt-get.cc | 32 +++++++++++++++++++++----------- debian/changelog | 8 ++++++++ 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 0bc8fc571..5de3fb036 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1270,12 +1270,26 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, { if(VerTag.empty() == false || DefRel.empty() == false) { + bool fuzzy = false; // we have a default release, try to locate the pkg. we do it like // this because GetCandidateVer() will not "downgrade", that means // "apt-get source -t stable apt" won't work on a unstable system - for (pkgCache::VerIterator Ver = Pkg.VersionList(); - Ver.end() == false; Ver++) + for (pkgCache::VerIterator Ver = Pkg.VersionList();; Ver++) { + // try first only exact matches, later fuzzy matches + if (Ver.end() == true) + { + if (fuzzy == true) + break; + fuzzy = true; + Ver = Pkg.VersionList(); + } + // We match against a concrete version (or a part of this version) + if (VerTag.empty() == false && + (fuzzy == true || Cache.VS().CmpVersion(VerTag, Ver.VerStr()) != 0) && // exact match + (fuzzy == false || strncmp(VerTag.c_str(), Ver.VerStr(), VerTag.size()) != 0)) // fuzzy match + continue; + for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false; VF++) { @@ -1288,10 +1302,6 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, pkgCache::Flag::NotSource && Pkg.CurrentVer() != Ver) continue; - // We match against a concrete version (or a part of this version) - if (VerTag.empty() == false && strncmp(VerTag.c_str(), Ver.VerStr(), VerTag.size()) != 0) - continue; - // or we match against a release if(VerTag.empty() == false || (VF.File().Archive() != 0 && VF.File().Archive() == DefRel) || @@ -1302,10 +1312,9 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, // no SourcePkg name, so it is the "binary" name if (Src.empty() == true) Src = TmpSrc; - // no Version, so we try the Version of the SourcePkg - - // and after that the version of the binary package - if (VerTag.empty() == true) - VerTag = Parse.SourceVer(); + // the Version we have is possibly fuzzy or includes binUploads, + // so we use the Version of the SourcePkg (empty if same as package) + VerTag = Parse.SourceVer(); if (VerTag.empty() == true) VerTag = Ver.VerStr(); break; @@ -1371,7 +1380,8 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, const string Ver = Parse->Version(); // Ignore all versions which doesn't fit - if (VerTag.empty() == false && strncmp(VerTag.c_str(), Ver.c_str(), VerTag.size()) != 0) + if (VerTag.empty() == false && + Cache.VS().CmpVersion(VerTag, Ver) != 0) // exact match continue; // Newer version or an exact match? Save the hit diff --git a/debian/changelog b/debian/changelog index 1b7a9adc6..375ef6151 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.25.3ubuntu5) UNRELEASED; urgency=low + + [ David Kalnischkies ] + * cmdline/apt-get.cc: + - try version match in FindSrc first exact than fuzzy (LP: #551178) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 31 Mar 2010 21:59:42 +0200 + apt (0.7.25.3ubuntu4) lucid; urgency=low [ David Kalnischkies ] -- cgit v1.2.3 From 6360cbb001dc73a11c39e752aaf1fcd5fbf6504f Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Wed, 31 Mar 2010 22:03:34 +0200 Subject: cherry pick -r 1984..1985 lp:~donkult/apt/sid --- apt-pkg/contrib/strutl.cc | 21 +++++++++++++++------ apt-pkg/contrib/strutl.h | 1 + debian/changelog | 6 ++++++ 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 8e8820949..b54758632 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -198,7 +198,8 @@ bool ParseQuoteWord(const char *&String,string &Res) char *I; for (I = Buffer; I < Buffer + sizeof(Buffer) && Start != C; I++) { - if (*Start == '%' && Start + 2 < C) + if (*Start == '%' && Start + 2 < C && + isxdigit(Start[1]) && isxdigit(Start[2])) { Tmp[0] = Start[1]; Tmp[1] = Start[2]; @@ -273,7 +274,8 @@ string QuoteString(const string &Str, const char *Bad) for (string::const_iterator I = Str.begin(); I != Str.end(); I++) { if (strchr(Bad,*I) != 0 || isprint(*I) == 0 || - *I <= 0x20 || *I >= 0x7F) + *I == 0x25 || // percent '%' char + *I <= 0x20 || *I >= 0x7F) // control chars { char Buf[10]; sprintf(Buf,"%%%02x",(int)*I); @@ -289,11 +291,17 @@ string QuoteString(const string &Str, const char *Bad) // --------------------------------------------------------------------- /* This undoes QuoteString */ string DeQuoteString(const string &Str) +{ + return DeQuoteString(Str.begin(),Str.end()); +} +string DeQuoteString(string::const_iterator const &begin, + string::const_iterator const &end) { string Res; - for (string::const_iterator I = Str.begin(); I != Str.end(); I++) + for (string::const_iterator I = begin; I != end; I++) { - if (*I == '%' && I + 2 < Str.end()) + if (*I == '%' && I + 2 < end && + isxdigit(I[1]) && isxdigit(I[2])) { char Tmp[3]; Tmp[0] = I[1]; @@ -1217,9 +1225,10 @@ void URI::CopyFrom(const string &U) else { Host.assign(At+1,SingleSlash); - User.assign(FirstColon,SecondColon); + // username and password must be encoded (RFC 3986) + User.assign(DeQuoteString(FirstColon,SecondColon)); if (SecondColon < At) - Password.assign(SecondColon+1,At); + Password.assign(DeQuoteString(SecondColon+1,At)); } // Now we parse the RFC 2732 [] hostnames. diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index a1e7f3934..a92c0a78f 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -45,6 +45,7 @@ bool ParseQuoteWord(const char *&String,string &Res); bool ParseCWord(const char *&String,string &Res); string QuoteString(const string &Str,const char *Bad); string DeQuoteString(const string &Str); +string DeQuoteString(string::const_iterator const &begin, string::const_iterator const &end); string SizeToStr(double Bytes); string TimeToStr(unsigned long Sec); string Base64Encode(const string &Str); diff --git a/debian/changelog b/debian/changelog index 375ef6151..5eaafffb4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,12 @@ apt (0.7.25.3ubuntu5) UNRELEASED; urgency=low * cmdline/apt-get.cc: - try version match in FindSrc first exact than fuzzy (LP: #551178) + [ Jean-Baptiste Lallement ] + * apt-pkg/contrib/strutl.cc: + - always escape '%' (LP: #130289) (Closes: #500560) + - unescape '%' sequence only if followed by 2 hex digit + - username/password are urlencoded in proxy string (RFC 3986) + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 31 Mar 2010 21:59:42 +0200 apt (0.7.25.3ubuntu4) lucid; urgency=low -- cgit v1.2.3 From 7697aea080f7fe079b304a98d2975a84a40ffb7a Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Wed, 31 Mar 2010 22:52:36 +0200 Subject: releasing version 0.7.25.3ubuntu5 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5eaafffb4..c740067e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.7.25.3ubuntu5) UNRELEASED; urgency=low +apt (0.7.25.3ubuntu5) lucid; urgency=low [ David Kalnischkies ] * cmdline/apt-get.cc: -- cgit v1.2.3 From 482def9c186ccba47be481bd39430f4251ce218d Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Thu, 1 Apr 2010 17:26:32 +0200 Subject: prepare for upload --- debian/changelog | 2 +- debian/control | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 49987385a..247f45d01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.7.26~exp3) UNRELEASED; urgency=low +apt (0.7.26~exp3) experimental; urgency=low [ Christian Perrier ] * German translation update. Closes: #571037 diff --git a/debian/control b/debian/control index 5843820d7..f0178d571 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,6 @@ Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>, Standards-Version: 3.8.4 Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev, autoconf, automake Build-Conflicts: autoconf2.13, automake1.4 -Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Package: apt Architecture: any -- cgit v1.2.3 From 1ee0448569975a9e7676b4e426385469017a754f Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Thu, 1 Apr 2010 18:17:23 +0200 Subject: releasing version 0.7.26~exp3 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 247f45d01..5658c7040 100644 --- a/debian/changelog +++ b/debian/changelog @@ -102,7 +102,7 @@ apt (0.7.26~exp3) experimental; urgency=low * doc/examples/configure-index: - add missing Debug::pkgPackageManager option - -- Christian Perrier <bubulle@debian.org> Wed, 24 Feb 2010 22:13:50 +0100 + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 01 Apr 2010 17:30:43 +0200 apt (0.7.26~exp2) experimental; urgency=low -- cgit v1.2.3 From 22326578d84ee9df4b192dd5ba5120098afe97ea Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Thu, 1 Apr 2010 22:50:10 +0200 Subject: make changelog match upload --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5658c7040..edc82e1d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -102,7 +102,7 @@ apt (0.7.26~exp3) experimental; urgency=low * doc/examples/configure-index: - add missing Debug::pkgPackageManager option - -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 01 Apr 2010 17:30:43 +0200 + -- Michael Vogt <mvo@debian.org> Thu, 01 Apr 2010 17:30:43 +0200 apt (0.7.26~exp2) experimental; urgency=low -- cgit v1.2.3 From c753eec1d192a56e7f4ba1b07ae766b740185a3f Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 3 Apr 2010 17:07:30 +0200 Subject: * apt-pkg/depcache.cc: - "reinstall" the correct version for a killed pseudo package --- apt-pkg/depcache.cc | 7 +++++-- debian/changelog | 7 +++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 75f69ee11..0f07de2fe 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -855,13 +855,16 @@ void pkgDepCache::Update(OpProgress *Prog) if (P.end() == true) continue; for (VerIterator V = P.VersionList(); V.end() != true; ++V) { - // FIXME: String comparison isn't a save indicator! - if (strcmp(allV.VerStr(),V.VerStr()) != 0) + if (allV->Hash != V->Hash || + strcmp(allV.VerStr(),V.VerStr()) != 0) continue; unsigned char const CurDepState = VersionState(V.DependsList(),DepInstall,DepInstMin,DepInstPolicy); if ((CurDepState & DepInstMin) != DepInstMin) break; // we found the correct version, but it is broken. Better try another arch or later again + RemoveSizes(P); + RemoveStates(P); P->CurrentVer = V.Index(); + PkgState[P->ID].InstallVer = V; AddStates(P); Update(P); AddSizes(P); diff --git a/debian/changelog b/debian/changelog index edc82e1d7..16800a9d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.26~exp4) experimental; urgency=low + + * apt-pkg/depcache.cc: + - "reinstall" the correct version for a killed pseudo package + + -- David Kalnischkies <kalnischkies@gmail.com> Sat, 03 Apr 2010 14:58:39 +0200 + apt (0.7.26~exp3) experimental; urgency=low [ Christian Perrier ] -- cgit v1.2.3 From 5e8b2b74ab565ffb72e035ce89a7a991d4de3dcf Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 3 Apr 2010 17:57:41 +0200 Subject: Initialize history_out always with NULL so apt will not segfault later in the event of a failure in OpenLog() (which will happen if called with Debug::NoLocking as user) --- apt-pkg/deb/dpkgpm.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index c0efa7b59..14a4968f7 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -105,7 +105,7 @@ ionice(int PID) /* */ pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) : pkgPackageManager(Cache), dpkgbuf_pos(0), - term_out(NULL), PackagesDone(0), PackagesTotal(0) + term_out(NULL), history_out(NULL), PackagesDone(0), PackagesTotal(0) { } /*}}}*/ @@ -651,6 +651,7 @@ bool pkgDPkgPM::CloseLog() fprintf(history_out, "End-Date: %s\n", timestr); fclose(history_out); } + history_out = NULL; return true; } -- cgit v1.2.3 From 87af68aa09fd1b0ab4f87fd064654a032c4daf30 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 3 Apr 2010 18:50:07 +0200 Subject: * apt-pkg/packagemanager.cc: - don't try to "unpack" pseudo packages twice --- apt-pkg/packagemanager.cc | 14 +++++++++++--- debian/changelog | 2 ++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 034cc8339..eef79cccd 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -596,9 +596,17 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg) { if(Install(Pkg,FileNames[Pkg->ID]) == false) return false; - } else if (SmartUnPack(Pkg.Group().FindPkg("all")) == false) - return false; - + } else { + // Pseudo packages will not be unpacked - instead we will do this + // for the "real" package, but only once and if it is already + // configured we don't need to unpack it again… + PkgIterator const P = Pkg.Group().FindPkg("all"); + if (List->IsFlag(P,pkgOrderList::UnPacked) != true && + List->IsFlag(P,pkgOrderList::Configured) != true) { + if (SmartUnPack(P) == false) + return false; + } + } List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States); // Perform immedate configuration of the package. diff --git a/debian/changelog b/debian/changelog index 16800a9d1..71aeb1504 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ apt (0.7.26~exp4) experimental; urgency=low * apt-pkg/depcache.cc: - "reinstall" the correct version for a killed pseudo package + * apt-pkg/packagemanager.cc: + - don't try to "unpack" pseudo packages twice -- David Kalnischkies <kalnischkies@gmail.com> Sat, 03 Apr 2010 14:58:39 +0200 -- cgit v1.2.3 From b3793d41d420a895ef5be4521a56535cc79f0d4a Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sun, 4 Apr 2010 10:34:45 +0200 Subject: remove the ABI compatible stub for GetListOfFilesInDir --- apt-pkg/contrib/fileutl.cc | 5 ----- apt-pkg/contrib/fileutl.h | 5 +---- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index da32983f1..75adce305 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -201,11 +201,6 @@ bool FileExists(string File) // --------------------------------------------------------------------- /* If an extension is given only files with this extension are included in the returned vector, otherwise every "normal" file is included. */ -std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext, - bool const &SortList) -{ - return GetListOfFilesInDir(Dir, Ext, SortList, false); -} std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext, bool const &SortList, bool const &AllowNoExt) { diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 85a94898c..351d53c5e 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -82,11 +82,8 @@ bool RunScripts(const char *Cnf); bool CopyFile(FileFd &From,FileFd &To); int GetLock(string File,bool Errors = true); bool FileExists(string File); -// FIXME: next ABI-Break: merge the two method-headers std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext, - bool const &SortList); -std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext, - bool const &SortList, bool const &AllowNoExt); + bool const &SortList, bool const &AllowNoExt=false); std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> const &Ext, bool const &SortList); string SafeGetCWD(); -- cgit v1.2.3 From 1cd1c398d18b78f4aa9d882a5de5385f4538e0be Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 7 Apr 2010 16:38:18 +0200 Subject: * apt-pkg/contrib/fileutl.cc: - add a parent-guarded "mkdir -p" as CreateDirectory() * apt-pkg/acquire.{cc,h}: - add a delayed constructor with Setup() for success reporting - check for and create directories in Setup if needed instead of error out unfriendly in the Constructor (Closes: #523920, #525783) - optional handle a lock file in Setup() * cmdline/apt-get.cc: - remove the lock file handling and let Acquire take care of it instead --- apt-pkg/acquire.cc | 89 ++++++++++++++++++++++++++++++++++------------ apt-pkg/acquire.h | 31 +++++++++++++--- apt-pkg/algorithms.cc | 4 ++- apt-pkg/contrib/fileutl.cc | 52 +++++++++++++++++++++++++++ apt-pkg/contrib/fileutl.h | 3 ++ apt-pkg/pkgcachegen.cc | 15 +++++++- cmdline/apt-get.cc | 38 ++++++++------------ debian/changelog | 9 +++++ 8 files changed, 187 insertions(+), 54 deletions(-) diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 74510ae21..d83d80fac 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -19,6 +19,7 @@ #include <apt-pkg/configuration.h> #include <apt-pkg/error.h> #include <apt-pkg/strutl.h> +#include <apt-pkg/fileutl.h> #include <apti18n.h> @@ -29,7 +30,6 @@ #include <dirent.h> #include <sys/time.h> #include <errno.h> -#include <sys/stat.h> /*}}}*/ using namespace std; @@ -37,32 +37,72 @@ using namespace std; // Acquire::pkgAcquire - Constructor /*{{{*/ // --------------------------------------------------------------------- /* We grab some runtime state from the configuration space */ -pkgAcquire::pkgAcquire(pkgAcquireStatus *Log) : Log(Log) +pkgAcquire::pkgAcquire() : Queues(0), Workers(0), Configs(0), Log(NULL), ToFetch(0), + Debug(_config->FindB("Debug::pkgAcquire",false)), + Running(false), LockFD(-1) { - Queues = 0; - Configs = 0; - Workers = 0; - ToFetch = 0; - Running = false; - - string Mode = _config->Find("Acquire::Queue-Mode","host"); + string const Mode = _config->Find("Acquire::Queue-Mode","host"); + if (strcasecmp(Mode.c_str(),"host") == 0) + QueueMode = QueueHost; + if (strcasecmp(Mode.c_str(),"access") == 0) + QueueMode = QueueAccess; +} +pkgAcquire::pkgAcquire(pkgAcquireStatus *Progress) : Queues(0), Workers(0), + Configs(0), Log(Progress), ToFetch(0), + Debug(_config->FindB("Debug::pkgAcquire",false)), + Running(false), LockFD(-1) +{ + string const Mode = _config->Find("Acquire::Queue-Mode","host"); if (strcasecmp(Mode.c_str(),"host") == 0) QueueMode = QueueHost; if (strcasecmp(Mode.c_str(),"access") == 0) - QueueMode = QueueAccess; + QueueMode = QueueAccess; + Setup(Progress, ""); +} + /*}}}*/ +// Acquire::Setup - Delayed Constructor /*{{{*/ +// --------------------------------------------------------------------- +/* Do everything needed to be a complete Acquire object and report the + success (or failure) back so the user knows that something is wrong… */ +bool pkgAcquire::Setup(pkgAcquireStatus *Progress, string const &Lock) +{ + Log = Progress; - Debug = _config->FindB("Debug::pkgAcquire",false); - - // This is really a stupid place for this - struct stat St; - if (stat((_config->FindDir("Dir::State::lists") + "partial/").c_str(),&St) != 0 || - S_ISDIR(St.st_mode) == 0) - _error->Error(_("Lists directory %spartial is missing."), - _config->FindDir("Dir::State::lists").c_str()); - if (stat((_config->FindDir("Dir::Cache::Archives") + "partial/").c_str(),&St) != 0 || - S_ISDIR(St.st_mode) == 0) - _error->Error(_("Archive directory %spartial is missing."), - _config->FindDir("Dir::Cache::Archives").c_str()); + // check for existence and possibly create auxiliary directories + if (CheckDirectory(_config->FindDir("Dir::State"), _config->FindDir("Dir::State::lists") + "partial/") == false || + CheckDirectory(_config->FindDir("Dir::Cache"), _config->FindDir("Dir::Cache::Archives") + "partial/") == false) + return false; + + if (Lock.empty() == true || _config->FindB("Debug::NoLocking", false) == true) + return true; + + // Lock the directory this acquire object will work in + LockFD = GetLock(flCombine(Lock, "lock")); + if (LockFD == -1) + return _error->Error(_("Unable to lock directory %s"), Lock.c_str()); + + return true; +} + /*}}}*/ +// Acquire::CheckDirectory - ensure that the given directory exists /*{{{*/ +// --------------------------------------------------------------------- +/* a small wrapper around CreateDirectory to check if it exists and to + remove the trailing "/apt/" from the parent directory if needed */ +bool pkgAcquire::CheckDirectory(string const &Parent, string const &Path) const +{ + if (DirectoryExists(Path) == true) + return true; + + size_t const len = Parent.size(); + if (len > 5 && Parent.find("/apt/", len - 6, 5) != len - 5) + { + if (CreateDirectory(Parent.substr(0,len-5), Path) == true) + return true; + } + else if (CreateDirectory(Parent, Path) == true) + return true; + + return _error->Errno("Acquire", _("Directory %s can't be created."), Path.c_str()); } /*}}}*/ // Acquire::~pkgAcquire - Destructor /*{{{*/ @@ -71,7 +111,10 @@ pkgAcquire::pkgAcquire(pkgAcquireStatus *Log) : Log(Log) pkgAcquire::~pkgAcquire() { Shutdown(); - + + if (LockFD != -1) + close(LockFD); + while (Configs != 0) { MethodConfig *Jnk = Configs; diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h index 6c130c1b3..9e91a9f67 100644 --- a/apt-pkg/acquire.h +++ b/apt-pkg/acquire.h @@ -66,6 +66,8 @@ #ifndef PKGLIB_ACQUIRE_H #define PKGLIB_ACQUIRE_H +#include <apt-pkg/macros.h> + #include <vector> #include <string> @@ -161,7 +163,7 @@ class pkgAcquire QueueAccess} QueueMode; /** \brief If \b true, debugging information will be dumped to std::clog. */ - bool Debug; + bool const Debug; /** \brief If \b true, a download is currently in progress. */ bool Running; @@ -332,15 +334,22 @@ class pkgAcquire */ double PartialPresent(); - /** \brief Construct a new pkgAcquire. + /** \brief Delayed constructor * - * \param Log The progress indicator associated with this - * download, or \b NULL for none. This object is not owned by the + * \param Progress indicator associated with this download or + * \b NULL for none. This object is not owned by the * download process and will not be deleted when the pkgAcquire * object is destroyed. Naturally, it should live for at least as * long as the pkgAcquire object does. + * \param Lock defines a lock file that should be acquired to ensure + * only one Acquire class is in action at the time or an empty string + * if no lock file should be used. */ - pkgAcquire(pkgAcquireStatus *Log = 0); + bool Setup(pkgAcquireStatus *Progress = NULL, string const &Lock = ""); + + /** \brief Construct a new pkgAcquire. */ + pkgAcquire(pkgAcquireStatus *Log) __deprecated; + pkgAcquire(); /** \brief Destroy this pkgAcquire object. * @@ -348,6 +357,18 @@ class pkgAcquire * this download. */ virtual ~pkgAcquire(); + + private: + /** \brief FD of the Lock file we acquire in Setup (if any) */ + int LockFD; + + /** \brief Ensure the existence of the given Path + * + * \param Parent directory of the Path directory - a trailing + * /apt/ will be removed before CreateDirectory call. + * \param Path which should exist after (successful) call + */ + bool CheckDirectory(string const &Parent, string const &Path) const; }; /** \brief Represents a single download source from which an item diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index f8a9e210c..f1e51131a 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1398,7 +1398,9 @@ bool ListUpdate(pkgAcquireStatus &Stat, int PulseInterval) { pkgAcquire::RunResult res; - pkgAcquire Fetcher(&Stat); + pkgAcquire Fetcher; + if (Fetcher.Setup(&Stat, _config->FindDir("Dir::State::Lists")) == false) + return false; // Populate it with the source selection if (List.GetIndexes(&Fetcher) == false) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 75adce305..16f7ce929 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -18,6 +18,7 @@ /*}}}*/ // Include Files /*{{{*/ #include <apt-pkg/fileutl.h> +#include <apt-pkg/strutl.h> #include <apt-pkg/error.h> #include <apt-pkg/sptr.h> #include <apt-pkg/configuration.h> @@ -197,6 +198,57 @@ bool FileExists(string File) return true; } /*}}}*/ +// DirectoryExists - Check if a directory exists and is really one /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool DirectoryExists(string const &Path) +{ + struct stat Buf; + if (stat(Path.c_str(),&Buf) != 0) + return false; + return ((Buf.st_mode & S_IFDIR) != 0); +} + /*}}}*/ +// CreateDirectory - poor man's mkdir -p guarded by a parent directory /*{{{*/ +// --------------------------------------------------------------------- +/* This method will create all directories needed for path in good old + mkdir -p style but refuses to do this if Parent is not a prefix of + this Path. Example: /var/cache/ and /var/cache/apt/archives are given, + so it will create apt/archives if /var/cache exists - on the other + hand if the parent is /var/lib the creation will fail as this path + is not a parent of the path to be generated. */ +bool CreateDirectory(string const &Parent, string const &Path) +{ + if (Parent.empty() == true || Path.empty() == true) + return false; + + if (DirectoryExists(Path) == true) + return true; + + if (DirectoryExists(Parent) == false) + return false; + + // we are not going to create directories "into the blue" + if (Path.find(Parent, 0) != 0) + return false; + + vector<string> const dirs = VectorizeString(Path.substr(Parent.size()), '/'); + string progress = Parent; + for (vector<string>::const_iterator d = dirs.begin(); d != dirs.end(); ++d) + { + if (d->empty() == true) + continue; + + progress.append("/").append(*d); + if (DirectoryExists(progress) == true) + continue; + + if (mkdir(progress.c_str(), 0755) != 0) + return false; + } + return true; +} + /*}}}*/ // GetListOfFilesInDir - returns a vector of files in the given dir /*{{{*/ // --------------------------------------------------------------------- /* If an extension is given only files with this extension are included diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 351d53c5e..003bd9b83 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -21,6 +21,7 @@ #ifndef PKGLIB_FILEUTL_H #define PKGLIB_FILEUTL_H +#include <apt-pkg/macros.h> #include <string> #include <vector> @@ -82,6 +83,8 @@ bool RunScripts(const char *Cnf); bool CopyFile(FileFd &From,FileFd &To); int GetLock(string File,bool Errors = true); bool FileExists(string File); +bool DirectoryExists(string const &Path) __attrib_const; +bool CreateDirectory(string const &Parent, string const &Path); std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext, bool const &SortList, bool const &AllowNoExt=false); std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> const &Ext, diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 21240b951..114c9d5ed 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -1003,7 +1003,20 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, // Decide if we can write to the files.. string const CacheFile = _config->FindFile("Dir::Cache::pkgcache"); string const SrcCacheFile = _config->FindFile("Dir::Cache::srcpkgcache"); - + + // ensure the cache directory exists + if (CacheFile.empty() == false || SrcCacheFile.empty() == false) + { + string dir = _config->FindDir("Dir::Cache"); + size_t const len = dir.size(); + if (len > 5 && dir.find("/apt/", len - 6, 5) == len - 5) + dir = dir.substr(0, len - 5); + if (CacheFile.empty() == false) + CreateDirectory(dir, flNotFile(CacheFile)); + if (SrcCacheFile.empty() == false) + CreateDirectory(dir, flNotFile(SrcCacheFile)); + } + // Decide if we can write to the cache bool Writeable = false; if (CacheFile.empty() == false) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 62f712c39..416d316da 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -811,20 +811,13 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, pkgRecords Recs(Cache); if (_error->PendingError() == true) return false; - - // Lock the archive directory - FileFd Lock; - if (_config->FindB("Debug::NoLocking",false) == false && - _config->FindB("APT::Get::Print-URIs") == false) - { - Lock.Fd(GetLock(_config->FindDir("Dir::Cache::Archives") + "lock")); - if (_error->PendingError() == true) - return _error->Error(_("Unable to lock the download directory")); - } - + // Create the download object + pkgAcquire Fetcher; AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0)); - pkgAcquire Fetcher(&Stat); + if (Fetcher.Setup(&Stat, _config->FindB("APT::Get::Print-URIs", false) + ? "" : _config->FindDir("Dir::Cache::Archives")) == false) + return false; // Read the source list pkgSourceList List; @@ -1442,15 +1435,6 @@ bool DoUpdate(CommandLine &CmdL) if (List.ReadMainList() == false) return false; - // Lock the list directory - FileFd Lock; - if (_config->FindB("Debug::NoLocking",false) == false) - { - Lock.Fd(GetLock(_config->FindDir("Dir::State::Lists") + "lock")); - if (_error->PendingError() == true) - return _error->Error(_("Unable to lock the list directory")); - } - // Create the progress AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0)); @@ -1458,7 +1442,9 @@ bool DoUpdate(CommandLine &CmdL) if (_config->FindB("APT::Get::Print-URIs") == true) { // get a fetcher - pkgAcquire Fetcher(&Stat); + pkgAcquire Fetcher; + if (Fetcher.Setup(&Stat) == false) + return false; // Populate it with the source selection and get all Indexes // (GetAll=true) @@ -2207,7 +2193,9 @@ bool DoSource(CommandLine &CmdL) // Create the download object AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0)); - pkgAcquire Fetcher(&Stat); + pkgAcquire Fetcher; + if (Fetcher.Setup(&Stat) == false) + return false; DscFile *Dsc = new DscFile[CmdL.FileSize()]; @@ -2464,7 +2452,9 @@ bool DoBuildDep(CommandLine &CmdL) // Create the download object AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0)); - pkgAcquire Fetcher(&Stat); + pkgAcquire Fetcher; + if (Fetcher.Setup(&Stat) == false) + return false; unsigned J = 0; for (const char **I = CmdL.FileList + 1; *I != 0; I++, J++) diff --git a/debian/changelog b/debian/changelog index 71aeb1504..ffab08eb1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,15 @@ apt (0.7.26~exp4) experimental; urgency=low - "reinstall" the correct version for a killed pseudo package * apt-pkg/packagemanager.cc: - don't try to "unpack" pseudo packages twice + * apt-pkg/contrib/fileutl.cc: + - add a parent-guarded "mkdir -p" as CreateDirectory() + * apt-pkg/acquire.{cc,h}: + - add a delayed constructor with Setup() for success reporting + - check for and create directories in Setup if needed instead of + error out unfriendly in the Constructor (Closes: #523920, #525783) + - optional handle a lock file in Setup() + * cmdline/apt-get.cc: + - remove the lock file handling and let Acquire take care of it instead -- David Kalnischkies <kalnischkies@gmail.com> Sat, 03 Apr 2010 14:58:39 +0200 -- cgit v1.2.3 From 259f688a29728604d7930662e9743619982706ab Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Thu, 8 Apr 2010 20:57:01 +0200 Subject: * cmdline/apt-get.cc: - fix crash when pkg.VersionList() is empty --- cmdline/apt-get.cc | 4 ++++ debian/changelog | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 62f712c39..cd450b27a 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1304,6 +1304,10 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, break; fuzzy = true; Ver = Pkg.VersionList(); + // exit right away from the Pkg.VersionList() loop if we + // don't have any versions + if (Ver.end() == true) + break; } // We match against a concrete version (or a part of this version) if (VerTag.empty() == false && diff --git a/debian/changelog b/debian/changelog index edc82e1d7..9e3223abf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.26~exp4) UNRELEASEDexperimental; urgency=low + + * cmdline/apt-get.cc: + - fix crash when pkg.VersionList() is empty + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 08 Apr 2010 20:56:30 +0200 + apt (0.7.26~exp3) experimental; urgency=low [ Christian Perrier ] -- cgit v1.2.3 From b1fd12d41f9be5d5f33e4768761ed28f87953082 Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Thu, 8 Apr 2010 21:14:03 +0200 Subject: * cmdline/apt-get.cc: - fix crash when pkg.VersionList() is empty (LP: #556056) --- cmdline/apt-get.cc | 4 ++++ debian/changelog | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 5de3fb036..b379dc82f 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1283,6 +1283,10 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, break; fuzzy = true; Ver = Pkg.VersionList(); + // exit right away from the Pkg.VersionList() loop if we + // don't have any versions + if (Ver.end() == true) + break; } // We match against a concrete version (or a part of this version) if (VerTag.empty() == false && diff --git a/debian/changelog b/debian/changelog index c740067e4..13d46cec9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.25.3ubuntu6) lucid; urgency=low + + * cmdline/apt-get.cc: + - fix crash when pkg.VersionList() is empty (LP: #556056) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 08 Apr 2010 21:13:25 +0200 + apt (0.7.25.3ubuntu5) lucid; urgency=low [ David Kalnischkies ] -- cgit v1.2.3 From a722b2c5c935768efbdd5b23eed7ce32ccd60908 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 9 Apr 2010 15:38:48 +0200 Subject: * apt-pkg/acquire-item.cc: - Acquire::ForceHash to force method for expected hash - display MD5Sum in --print-uris if not forced to use another method instead of displaying the strongest available (Closes: #576420) --- apt-pkg/acquire-item.cc | 28 +++++++++++++++++++++------- cmdline/apt-get.cc | 13 +++++++++++-- debian/changelog | 4 ++++ doc/examples/configure-index | 1 + test/makefile | 8 ++++---- 5 files changed, 41 insertions(+), 13 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 4f0abbb91..916fca71e 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1327,7 +1327,8 @@ pkgAcqArchive::pkgAcqArchive(pkgAcquire *Owner,pkgSourceList *Sources, the archive is already available in the cache and stashs the MD5 for checking later. */ bool pkgAcqArchive::QueueNext() -{ +{ + string const ForceHash = _config->Find("Acquire::ForceHash"); for (; Vf.end() == false; Vf++) { // Ignore not source sources @@ -1350,12 +1351,25 @@ bool pkgAcqArchive::QueueNext() return false; string PkgFile = Parse.FileName(); - if(Parse.SHA256Hash() != "") - ExpectedHash = HashString("SHA256", Parse.SHA256Hash()); - else if (Parse.SHA1Hash() != "") - ExpectedHash = HashString("SHA1", Parse.SHA1Hash()); - else - ExpectedHash = HashString("MD5Sum", Parse.MD5Hash()); + if (ForceHash.empty() == false) + { + if(stringcasecmp(ForceHash, "sha256") == 0) + ExpectedHash = HashString("SHA256", Parse.SHA256Hash()); + else if (stringcasecmp(ForceHash, "sha1") == 0) + ExpectedHash = HashString("SHA1", Parse.SHA1Hash()); + else + ExpectedHash = HashString("MD5Sum", Parse.MD5Hash()); + } + else + { + string Hash; + if ((Hash = Parse.SHA256Hash()).empty() == false) + ExpectedHash = HashString("SHA256", Hash); + else if ((Hash = Parse.SHA1Hash()).empty() == false) + ExpectedHash = HashString("SHA1", Hash); + else + ExpectedHash = HashString("MD5Sum", Parse.MD5Hash()); + } if (PkgFile.empty() == true) return _error->Error(_("The package index files are corrupted. No Filename: " "field for package %s."), diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 416d316da..7c42e672d 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -815,8 +815,14 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, // Create the download object pkgAcquire Fetcher; AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0)); - if (Fetcher.Setup(&Stat, _config->FindB("APT::Get::Print-URIs", false) - ? "" : _config->FindDir("Dir::Cache::Archives")) == false) + if (_config->FindB("APT::Get::Print-URIs", false) == true) + { + // force a hashsum for compatibility reasons + _config->CndSet("Acquire::ForceHash", "md5sum"); + if (Fetcher.Setup(&Stat, "") == false) + return false; + } + else if (Fetcher.Setup(&Stat, _config->FindDir("Dir::Cache::Archives")) == false) return false; // Read the source list @@ -1441,6 +1447,9 @@ bool DoUpdate(CommandLine &CmdL) // Just print out the uris an exit if the --print-uris flag was used if (_config->FindB("APT::Get::Print-URIs") == true) { + // force a hashsum for compatibility reasons + _config->CndSet("Acquire::ForceHash", "md5sum"); + // get a fetcher pkgAcquire Fetcher; if (Fetcher.Setup(&Stat) == false) diff --git a/debian/changelog b/debian/changelog index ffab08eb1..4cdbd4d93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,8 +11,12 @@ apt (0.7.26~exp4) experimental; urgency=low - check for and create directories in Setup if needed instead of error out unfriendly in the Constructor (Closes: #523920, #525783) - optional handle a lock file in Setup() + * apt-pkg/acquire-item.cc: + - Acquire::ForceHash to force method for expected hash * cmdline/apt-get.cc: - remove the lock file handling and let Acquire take care of it instead + - display MD5Sum in --print-uris if not forced to use another method + instead of displaying the strongest available (Closes: #576420) -- David Kalnischkies <kalnischkies@gmail.com> Sat, 03 Apr 2010 14:58:39 +0200 diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 3167e46da..d168417d8 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -169,6 +169,7 @@ Acquire Queue-Mode "host"; // host|access Retries "0"; Source-Symlinks "true"; + ForceHash "sha256"; // hashmethod used for expected hash: sha256, sha1 or md5sum PDiffs "true"; // try to get the IndexFile diffs PDiffs::FileLimit "4"; // don't use diffs if we would need more than 4 diffs diff --git a/test/makefile b/test/makefile index b8c104eae..52adb96a2 100644 --- a/test/makefile +++ b/test/makefile @@ -68,7 +68,7 @@ SOURCE = test_udevcdrom.cc include $(PROGRAM_H) # Program for checking rpm versions -PROGRAM=rpmver -SLIBS = -lapt-pkg -lrpm -SOURCE = rpmver.cc -include $(PROGRAM_H) +#PROGRAM=rpmver +#SLIBS = -lapt-pkg -lrpm +#SOURCE = rpmver.cc +#include $(PROGRAM_H) -- cgit v1.2.3 From 3d5a34b22a83eb4bf9b1407e13240b8e2a333d5f Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 13 Apr 2010 09:28:57 +0200 Subject: regex for package names executed on Grp- not PkgIterator --- apt-pkg/depcache.h | 1 + cmdline/apt-get.cc | 9 ++++++--- debian/changelog | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 6765d3e7c..72b9b5d4d 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -331,6 +331,7 @@ class pkgDepCache : protected pkgCache::Namespace // Legacy.. We look like a pkgCache inline operator pkgCache &() {return *Cache;}; inline Header &Head() {return *Cache->HeaderP;}; + inline GrpIterator GrpBegin() {return Cache->GrpBegin();}; inline PkgIterator PkgBegin() {return Cache->PkgBegin();}; inline GrpIterator FindGrp(string const &Name) {return Cache->FindGrp(Name);}; inline PkgIterator FindPkg(string const &Name) {return Cache->FindPkg(Name);}; diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 7c42e672d..52cbce945 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1772,11 +1772,14 @@ bool DoInstall(CommandLine &CmdL) // Run over the matches bool Hit = false; - for (Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) + for (pkgCache::GrpIterator Grp = Cache->GrpBegin(); Grp.end() == false; ++Grp) { - if (regexec(&Pattern,Pkg.Name(),0,0,0) != 0) + if (regexec(&Pattern,Grp.Name(),0,0,0) != 0) continue; - + Pkg = Grp.FindPkg("native"); + if (unlikely(Pkg.end() == true)) + continue; + ioprintf(c1out,_("Note, selecting %s for regex '%s'\n"), Pkg.Name(),S); diff --git a/debian/changelog b/debian/changelog index 4cdbd4d93..6cf067952 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ apt (0.7.26~exp4) experimental; urgency=low - remove the lock file handling and let Acquire take care of it instead - display MD5Sum in --print-uris if not forced to use another method instead of displaying the strongest available (Closes: #576420) + - regex for package names executed on Grp- not PkgIterator -- David Kalnischkies <kalnischkies@gmail.com> Sat, 03 Apr 2010 14:58:39 +0200 -- cgit v1.2.3 From 9c2c9c24f7027a0299e545e55c38ac4c557359a5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 13 Apr 2010 10:18:19 +0200 Subject: create the partial dirs also automatic if only Dir::Cache::archives or Dir::Cache::lists was set --- apt-pkg/acquire.cc | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index d83d80fac..832eaa02c 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -69,9 +69,18 @@ bool pkgAcquire::Setup(pkgAcquireStatus *Progress, string const &Lock) Log = Progress; // check for existence and possibly create auxiliary directories - if (CheckDirectory(_config->FindDir("Dir::State"), _config->FindDir("Dir::State::lists") + "partial/") == false || - CheckDirectory(_config->FindDir("Dir::Cache"), _config->FindDir("Dir::Cache::Archives") + "partial/") == false) - return false; + string const listDir = _config->FindDir("Dir::State::lists"); + string const partialListDir = listDir + "partial/"; + string const archivesDir = _config->FindDir("Dir::Cache::Archives"); + string const partialArchivesDir = archivesDir + "partial/"; + + if (CheckDirectory(_config->FindDir("Dir::State"), partialListDir) == false && + CheckDirectory(listDir, partialListDir) == false) + return _error->Errno("Acquire", _("List directory %spartial is missing."), listDir.c_str()); + + if (CheckDirectory(_config->FindDir("Dir::Cache"), partialArchivesDir) == false && + CheckDirectory(archivesDir, partialArchivesDir) == false) + return _error->Errno("Acquire", _("Archives directory %spartial is missing."), archivesDir.c_str()); if (Lock.empty() == true || _config->FindB("Debug::NoLocking", false) == true) return true; @@ -94,7 +103,7 @@ bool pkgAcquire::CheckDirectory(string const &Parent, string const &Path) const return true; size_t const len = Parent.size(); - if (len > 5 && Parent.find("/apt/", len - 6, 5) != len - 5) + if (len > 5 && Parent.find("/apt/", len - 6, 5) == len - 5) { if (CreateDirectory(Parent.substr(0,len-5), Path) == true) return true; @@ -102,7 +111,7 @@ bool pkgAcquire::CheckDirectory(string const &Parent, string const &Path) const else if (CreateDirectory(Parent, Path) == true) return true; - return _error->Errno("Acquire", _("Directory %s can't be created."), Path.c_str()); + return false; } /*}}}*/ // Acquire::~pkgAcquire - Destructor /*{{{*/ -- cgit v1.2.3 From 05bae55fb7fe23b2061182a60db2f2f914a2d3ec Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 14 Apr 2010 18:01:11 +0200 Subject: * apt-pkg/deb/dpkgpm.cc: - remove Chroot-Directory from files passed to install commands. Thanks to Kel Modderman for report & patch! (Closes: #577226) --- apt-pkg/deb/dpkgpm.cc | 14 +++++++++++++- debian/changelog | 3 +++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 14a4968f7..ca8faa8a5 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -124,7 +124,19 @@ bool pkgDPkgPM::Install(PkgIterator Pkg,string File) if (File.empty() == true || Pkg.end() == true) return _error->Error("Internal Error, No file name for %s",Pkg.Name()); - List.push_back(Item(Item::Install,Pkg,File)); + // If the filename string begins with DPkg::Chroot-Directory, return the + // substr that is within the chroot so dpkg can access it. + string const chrootdir = _config->FindDir("DPkg::Chroot-Directory","/"); + if (chrootdir != "/" && File.find(chrootdir) == 0) + { + size_t len = chrootdir.length(); + if (chrootdir.at(len - 1) == '/') + len--; + List.push_back(Item(Item::Install,Pkg,File.substr(len))); + } + else + List.push_back(Item(Item::Install,Pkg,File)); + return true; } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 6cf067952..7d2417cf4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,9 @@ apt (0.7.26~exp4) experimental; urgency=low - display MD5Sum in --print-uris if not forced to use another method instead of displaying the strongest available (Closes: #576420) - regex for package names executed on Grp- not PkgIterator + * apt-pkg/deb/dpkgpm.cc: + - remove Chroot-Directory from files passed to install commands. + Thanks to Kel Modderman for report & patch! (Closes: #577226) -- David Kalnischkies <kalnischkies@gmail.com> Sat, 03 Apr 2010 14:58:39 +0200 -- cgit v1.2.3 From b564740226100331f1aba8a1e35a57e5483361f7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 21 Apr 2010 13:14:40 +0200 Subject: replace backticks with single quote in broken packages message. Thanks to Jari Aalto for spotting & patching! (Closes: #577168) --- cmdline/apt-get.cc | 4 ++-- debian/changelog | 2 ++ po/apt-all.pot | 4 ++-- po/ar.po | 8 ++++---- po/ast.po | 8 ++++---- po/bg.po | 4 ++-- po/bs.po | 4 ++-- po/ca.po | 12 ++++++------ po/cs.po | 4 ++-- po/cy.po | 8 ++++---- po/da.po | 6 +++--- po/de.po | 4 ++-- po/dz.po | 8 ++++---- po/el.po | 4 ++-- po/en_GB.po | 4 ++-- po/es.po | 12 ++++++------ po/eu.po | 8 ++++---- po/fi.po | 4 ++-- po/fr.po | 4 ++-- po/gl.po | 4 ++-- po/he.po | 4 ++-- po/hu.po | 4 ++-- po/it.po | 4 ++-- po/ja.po | 4 ++-- po/km.po | 8 ++++---- po/ko.po | 8 ++++---- po/ku.po | 4 ++-- po/lt.po | 4 ++-- po/mr.po | 8 ++++---- po/nb.po | 4 ++-- po/ne.po | 8 ++++---- po/nl.po | 4 ++-- po/nn.po | 4 ++-- po/pl.po | 4 ++-- po/pt.po | 14 +++++++------- po/pt_BR.po | 8 ++++---- po/ro.po | 4 ++-- po/ru.po | 4 ++-- po/sk.po | 4 ++-- po/sl.po | 4 ++-- po/sv.po | 4 ++-- po/th.po | 8 ++++---- po/tl.po | 8 ++++---- po/uk.po | 4 ++-- po/vi.po | 4 ++-- po/zh_CN.po | 4 ++-- po/zh_TW.po | 8 ++++---- 47 files changed, 134 insertions(+), 132 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 52cbce945..9d67a82f8 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -692,7 +692,7 @@ bool CacheFile::CheckDeps(bool AllowBroken) } else { - c1out << _("You might want to run `apt-get -f install' to correct these.") << endl; + c1out << _("You might want to run 'apt-get -f install' to correct these.") << endl; ShowBroken(c1out,*this,true); return _error->Error(_("Unmet dependencies. Try using -f.")); @@ -1826,7 +1826,7 @@ bool DoInstall(CommandLine &CmdL) packages */ if (BrokenFix == true && Cache->BrokenCount() != 0) { - c1out << _("You might want to run `apt-get -f install' to correct these:") << endl; + c1out << _("You might want to run 'apt-get -f install' to correct these:") << endl; ShowBroken(c1out,Cache,false); return _error->Error(_("Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution).")); diff --git a/debian/changelog b/debian/changelog index 7d2417cf4..d1068b64d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ apt (0.7.26~exp4) experimental; urgency=low - display MD5Sum in --print-uris if not forced to use another method instead of displaying the strongest available (Closes: #576420) - regex for package names executed on Grp- not PkgIterator + - replace backticks with single quote in broken packages message. + Thanks to Jari Aalto for spotting & patching! (Closes: #577168) * apt-pkg/deb/dpkgpm.cc: - remove Chroot-Directory from files passed to install commands. Thanks to Kel Modderman for report & patch! (Closes: #577226) diff --git a/po/apt-all.pot b/po/apt-all.pot index ae0a7c375..41b46aeff 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -670,7 +670,7 @@ msgid " Done" msgstr "" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" #: cmdline/apt-get.cc:687 @@ -981,7 +981,7 @@ msgid "%s set to manually installed.\n" msgstr "" #: cmdline/apt-get.cc:1808 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" #: cmdline/apt-get.cc:1811 diff --git a/po/ar.po b/po/ar.po index 15d5f7205..c0864ec00 100644 --- a/po/ar.po +++ b/po/ar.po @@ -672,8 +672,8 @@ msgid " Done" msgstr " تم" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." -msgstr "قد ترغب بتنفيذ الأمر `apt-get -f install' لتصحيح هذه." +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "قد ترغب بتنفيذ الأمر 'apt-get -f install' لتصحيح هذه." #: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." @@ -979,8 +979,8 @@ msgid "%s set to manually installed.\n" msgstr "إلا أنه سيتم تثبيت %s" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "قد ترغب بتشغيل `apt-get -f install' لتصحيح هذه:" +msgid "You might want to run 'apt-get -f install' to correct these:" +msgstr "قد ترغب بتشغيل 'apt-get -f install' لتصحيح هذه:" #: cmdline/apt-get.cc:1797 msgid "" diff --git a/po/ast.po b/po/ast.po index 7df0e8f06..d3005dc3c 100644 --- a/po/ast.po +++ b/po/ast.po @@ -766,8 +766,8 @@ msgid " Done" msgstr " Fecho" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." -msgstr "Habres d'executar `apt-get -f install' para igualo." +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "Habres d'executar 'apt-get -f install' para igualo." #: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." @@ -1080,8 +1080,8 @@ msgid "%s set to manually installed.\n" msgstr "%s axustu como instalu manualmente.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "Habres d'executar `apt-get -f install' para iguar estos:" +msgid "You might want to run 'apt-get -f install' to correct these:" +msgstr "Habres d'executar 'apt-get -f install' para iguar estos:" #: cmdline/apt-get.cc:1797 msgid "" diff --git a/po/bg.po b/po/bg.po index 5c366b765..9d9b1c2d1 100644 --- a/po/bg.po +++ b/po/bg.po @@ -779,7 +779,7 @@ msgid " Done" msgstr " Готово" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" "Възможно е да изпълните „apt-get -f install“, за да коригирате тези " "неизправности." @@ -1098,7 +1098,7 @@ msgid "%s set to manually installed.\n" msgstr "%s е отбелязан като ръчно инсталиран.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:" #: cmdline/apt-get.cc:1797 diff --git a/po/bs.po b/po/bs.po index 7b2316bdb..aca1298aa 100644 --- a/po/bs.po +++ b/po/bs.po @@ -679,7 +679,7 @@ msgid " Done" msgstr " Urađeno" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" #: cmdline/apt-get.cc:687 @@ -982,7 +982,7 @@ msgid "%s set to manually installed.\n" msgstr "ali se %s treba instalirati" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" #: cmdline/apt-get.cc:1797 diff --git a/po/ca.po b/po/ca.po index fa4c4a414..4cedaf9fc 100644 --- a/po/ca.po +++ b/po/ca.po @@ -769,8 +769,8 @@ msgid " Done" msgstr " Fet" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." -msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho." +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "Potser voldreu executar 'apt-get -f install' per a corregir-ho." #: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." @@ -1089,8 +1089,8 @@ msgid "%s set to manually installed.\n" msgstr "S'ha marcat %s com instal·lat manualment.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho:" +msgid "You might want to run 'apt-get -f install' to correct these:" +msgstr "Potser voldreu executar 'apt-get -f install' per a corregir-ho:" #: cmdline/apt-get.cc:1797 msgid "" @@ -3153,8 +3153,8 @@ msgstr "La connexió s'ha tancat prematurament" #~ msgid "" #~ "Some broken packages were found while trying to process build-" #~ "dependencies for %s.\n" -#~ "You might want to run `apt-get -f install' to correct these." +#~ "You might want to run 'apt-get -f install' to correct these." #~ msgstr "" #~ "S'han trobat alguns paquets trencats mentre es processaven les\n" #~ "dependències de construcció per a %s.\n" -#~ "Potser voldreu executar `apt-get -f install' per a corregir-ho." +#~ "Potser voldreu executar 'apt-get -f install' per a corregir-ho." diff --git a/po/cs.po b/po/cs.po index 9b1eccdb8..63094e903 100644 --- a/po/cs.po +++ b/po/cs.po @@ -764,7 +764,7 @@ msgid " Done" msgstr " Hotovo" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Pro opravení můžete spustit „apt-get -f install“." #: cmdline/apt-get.cc:687 @@ -1077,7 +1077,7 @@ msgid "%s set to manually installed.\n" msgstr "%s nastaven jako instalovaný ručně.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Pro opravení následujících můžete spustit „apt-get -f install“:" #: cmdline/apt-get.cc:1797 diff --git a/po/cy.po b/po/cy.po index 09f9a8869..05f8762cb 100644 --- a/po/cy.po +++ b/po/cy.po @@ -797,8 +797,8 @@ msgid " Done" msgstr " Wedi Gorffen" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." -msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain." +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain." #: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." @@ -1116,8 +1116,8 @@ msgid "%s set to manually installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain:" +msgid "You might want to run 'apt-get -f install' to correct these:" +msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain:" # FIXME #: cmdline/apt-get.cc:1797 diff --git a/po/da.po b/po/da.po index ffac0e91f..0db88f72a 100644 --- a/po/da.po +++ b/po/da.po @@ -773,7 +773,7 @@ msgid " Done" msgstr " Frdig" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Du kan muligvis rette dette ved at kre 'apt-get -f install'." #: cmdline/apt-get.cc:687 @@ -1087,7 +1087,7 @@ msgid "%s set to manually installed.\n" msgstr "%s sat til manuelt installeret.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Du kan muligvis rette det ved at kre 'apt-get -f install':" #: cmdline/apt-get.cc:1797 @@ -3142,7 +3142,7 @@ msgstr "Forbindelsen lukkedes for hurtigt" #~ msgid "" #~ "Some broken packages were found while trying to process build-" #~ "dependencies.\n" -#~ "You might want to run `apt-get -f install' to correct these." +#~ "You might want to run 'apt-get -f install' to correct these." #~ msgstr "" #~ "Det blev fundet delagte pakker under behandlingen af " #~ "opbygningsafhngighederne.\n" diff --git a/po/de.po b/po/de.po index 17d4c9b24..2f354b323 100644 --- a/po/de.po +++ b/po/de.po @@ -785,7 +785,7 @@ msgid " Done" msgstr " Fertig" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren." #: cmdline/apt-get.cc:687 @@ -1107,7 +1107,7 @@ msgid "%s set to manually installed.\n" msgstr "%s wurde als manuell installiert festgelegt.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren:" #: cmdline/apt-get.cc:1797 diff --git a/po/dz.po b/po/dz.po index 3d0644477..526ba2fcf 100644 --- a/po/dz.po +++ b/po/dz.po @@ -778,8 +778,8 @@ msgid " Done" msgstr "འབད་ཚར་ཡི།" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." -msgstr "འ་ནི་འདི་ཚུ་ནོར་བཅོས་འབད་ནི་ལུ་ཁྱོད་ཀྱི་`apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་།" +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "འ་ནི་འདི་ཚུ་ནོར་བཅོས་འབད་ནི་ལུ་ཁྱོད་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་།" #: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." @@ -1094,8 +1094,8 @@ msgid "%s set to manually installed.\n" msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "འདི་ཚུ་ནོར་བཅོས་འབད་ནིའི་དོན་ལུ་ཁྱོད་ཀྱི་`apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་:" +msgid "You might want to run 'apt-get -f install' to correct these:" +msgstr "འདི་ཚུ་ནོར་བཅོས་འབད་ནིའི་དོན་ལུ་ཁྱོད་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་:" #: cmdline/apt-get.cc:1797 msgid "" diff --git a/po/el.po b/po/el.po index 5c4ead054..6cbadb132 100644 --- a/po/el.po +++ b/po/el.po @@ -786,7 +786,7 @@ msgid " Done" msgstr " Ετοιμο" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" "Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα " "προβλήματα." @@ -1108,7 +1108,7 @@ msgid "%s set to manually installed.\n" msgstr "το %s έχει εγκατασταθεί με το χέρι\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Aν τρέξετε 'apt-get -f install' ίσως να διορθώσετε αυτά τα προβλήματα:" #: cmdline/apt-get.cc:1797 diff --git a/po/en_GB.po b/po/en_GB.po index 39163a47e..fa67efa0b 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -765,7 +765,7 @@ msgid " Done" msgstr "Done" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "You might want to run ‘apt-get -f install’ to correct these." #: cmdline/apt-get.cc:687 @@ -1079,7 +1079,7 @@ msgid "%s set to manually installed.\n" msgstr "%s set to manually installed.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "You might want to run 'apt-get -f install' to correct these:" #: cmdline/apt-get.cc:1797 diff --git a/po/es.po b/po/es.po index f8d09b3f5..70cad63dc 100644 --- a/po/es.po +++ b/po/es.po @@ -780,8 +780,8 @@ msgid " Done" msgstr " Listo" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." -msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo." +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "Tal vez quiera ejecutar 'apt-get -f install' para corregirlo." #: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." @@ -1098,8 +1098,8 @@ msgid "%s set to manually installed.\n" msgstr "fijado %s como instalado manualmente.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo:" +msgid "You might want to run 'apt-get -f install' to correct these:" +msgstr "Tal vez quiera ejecutar 'apt-get -f install' para corregirlo:" #: cmdline/apt-get.cc:1797 msgid "" @@ -3180,11 +3180,11 @@ msgstr "La conexi #~ msgid "" #~ "Some broken packages were found while trying to process build-" #~ "dependencies.\n" -#~ "You might want to run `apt-get -f install' to correct these." +#~ "You might want to run 'apt-get -f install' to correct these." #~ msgstr "" #~ "Se encontraron algunos paquetes rotos mientras se intentaba procesar\n" #~ "las dependencies de construccin. Tal vez quiera ejecutar \n" -#~ "`apt-get -f install' para corregirlos." +#~ "'apt-get -f install' para corregirlos." #~ msgid "" #~ "Usage: apt-cache [options] command\n" diff --git a/po/eu.po b/po/eu.po index 40ee7ce9a..dcb126a2d 100644 --- a/po/eu.po +++ b/po/eu.po @@ -768,8 +768,8 @@ msgid " Done" msgstr " Eginda" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." -msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu zuzentzeko." +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "Beharbada 'apt-get -f install' exekutatu nahiko duzu zuzentzeko." #: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." @@ -1084,8 +1084,8 @@ msgid "%s set to manually installed.\n" msgstr "%s eskuz instalatua bezala ezarri.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:" +msgid "You might want to run 'apt-get -f install' to correct these:" +msgstr "Beharbada 'apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:" #: cmdline/apt-get.cc:1797 msgid "" diff --git a/po/fi.po b/po/fi.po index c345a749e..0337b2f99 100644 --- a/po/fi.po +++ b/po/fi.po @@ -769,7 +769,7 @@ msgid " Done" msgstr " Valmis" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Halunnet suorittaa \"apt-get -f install\" korjaamaan nämä." #: cmdline/apt-get.cc:687 @@ -1086,7 +1086,7 @@ msgid "%s set to manually installed.\n" msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:" #: cmdline/apt-get.cc:1797 diff --git a/po/fr.po b/po/fr.po index 26c52fe3c..47652cb29 100644 --- a/po/fr.po +++ b/po/fr.po @@ -778,7 +778,7 @@ msgid " Done" msgstr " Fait" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes." #: cmdline/apt-get.cc:687 @@ -1107,7 +1107,7 @@ msgid "%s set to manually installed.\n" msgstr "%s passé en « installé manuellement ».\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :" #: cmdline/apt-get.cc:1797 diff --git a/po/gl.po b/po/gl.po index a8be68b13..341750e94 100644 --- a/po/gl.po +++ b/po/gl.po @@ -780,7 +780,7 @@ msgid " Done" msgstr " Rematado" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Pode querer executar \"apt-get -f install\" para corrixilos." #: cmdline/apt-get.cc:687 @@ -1097,7 +1097,7 @@ msgid "%s set to manually installed.\n" msgstr "%s cambiouse a instalado manualmente.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Pode querer executar \"apt-get -f install\" corrixir isto:" #: cmdline/apt-get.cc:1797 diff --git a/po/he.po b/po/he.po index a5cfcf6a8..a715fd46d 100644 --- a/po/he.po +++ b/po/he.po @@ -667,7 +667,7 @@ msgid " Done" msgstr "סיום" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "אולי תרצה להריץ 'apt-get -f install' כדי לתקן את אלו." #: cmdline/apt-get.cc:687 @@ -971,7 +971,7 @@ msgid "%s set to manually installed.\n" msgstr "אבל %s הולכת להיות מותקנת" #: cmdline/apt-get.cc:1784 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" #: cmdline/apt-get.cc:1787 diff --git a/po/hu.po b/po/hu.po index 95a845819..1db0d379f 100644 --- a/po/hu.po +++ b/po/hu.po @@ -773,7 +773,7 @@ msgid " Done" msgstr " Kész" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Ezek kijavításához próbáld futtatni az 'apt-get -f install'-t ." #: cmdline/apt-get.cc:687 @@ -1082,7 +1082,7 @@ msgid "%s set to manually installed.\n" msgstr "%s kézi telepítésre állított.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Próbáld futtatni az 'apt-get -f install'-t az alábbiak javításához:" #: cmdline/apt-get.cc:1797 diff --git a/po/it.po b/po/it.po index 9208fcc7f..012fe655b 100644 --- a/po/it.po +++ b/po/it.po @@ -773,7 +773,7 @@ msgid " Done" msgstr " Fatto" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" "È utile eseguire \"apt-get -f install\" per correggere questi problemi." @@ -1098,7 +1098,7 @@ msgid "%s set to manually installed.\n" msgstr "È stato impostato %s per l'installazione manuale.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "È utile eseguire \"apt-get -f install\" per correggere questi problemi:" diff --git a/po/ja.po b/po/ja.po index e60501fc3..020e01e1e 100644 --- a/po/ja.po +++ b/po/ja.po @@ -769,7 +769,7 @@ msgid " Done" msgstr " 完了" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" "これらを直すためには 'apt-get -f install' を実行する必要があるかもしれませ" "ん。" @@ -1087,7 +1087,7 @@ msgid "%s set to manually installed.\n" msgstr "%s は手動でインストールしたと設定されました。\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ" "ません:" diff --git a/po/km.po b/po/km.po index 0b197126b..7ce844830 100644 --- a/po/km.po +++ b/po/km.po @@ -773,8 +773,8 @@ msgid " Done" msgstr " ធ្វើ​រួច" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." -msgstr "អ្នក​ប្រហែល​ជា​ចង់រត់ `apt-get -f install' ដើម្បី​កែ​វា​​ទាំងនេះ​ហើយ ។" +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "អ្នក​ប្រហែល​ជា​ចង់រត់ 'apt-get -f install' ដើម្បី​កែ​វា​​ទាំងនេះ​ហើយ ។" #: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." @@ -1083,8 +1083,8 @@ msgid "%s set to manually installed.\n" msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "អ្នក​ប្រហែល​ជា​ចង់​រត់ `apt-get -f install' ដើម្បី​កែ​ពួក​វា​ទាំង​នេះ ៖" +msgid "You might want to run 'apt-get -f install' to correct these:" +msgstr "អ្នក​ប្រហែល​ជា​ចង់​រត់ 'apt-get -f install' ដើម្បី​កែ​ពួក​វា​ទាំង​នេះ ៖" #: cmdline/apt-get.cc:1797 msgid "" diff --git a/po/ko.po b/po/ko.po index ec4b95ac9..4557eb96d 100644 --- a/po/ko.po +++ b/po/ko.po @@ -766,9 +766,9 @@ msgid " Done" msgstr " 완료" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" -"이 상황을 바로잡으려면 `apt-get -f install'을 실행해야 할 수도 있습니다." +"이 상황을 바로잡으려면 'apt-get -f install'을 실행해야 할 수도 있습니다." #: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." @@ -1083,8 +1083,8 @@ msgid "%s set to manually installed.\n" msgstr "%s 패키지 수동설치로 지정합니다.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "다음을 바로잡으려면 `apt-get -f install'을 실행해 보십시오:" +msgid "You might want to run 'apt-get -f install' to correct these:" +msgstr "다음을 바로잡으려면 'apt-get -f install'을 실행해 보십시오:" # FIXME: specify a solution? 무슨 솔루션? #: cmdline/apt-get.cc:1797 diff --git a/po/ku.po b/po/ku.po index c22027eb1..54c8e976a 100644 --- a/po/ku.po +++ b/po/ku.po @@ -682,7 +682,7 @@ msgid " Done" msgstr " Temam" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" #: cmdline/apt-get.cc:687 @@ -983,7 +983,7 @@ msgid "%s set to manually installed.\n" msgstr "lê %s dê were sazkirin" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" #: cmdline/apt-get.cc:1797 diff --git a/po/lt.po b/po/lt.po index 4d081b0c1..5cbecdf8d 100644 --- a/po/lt.po +++ b/po/lt.po @@ -741,7 +741,7 @@ msgid " Done" msgstr " Įvykdyta" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Įvykdykite „apt-get -f install“, jei norite ištaisyti šias klaidas." #: cmdline/apt-get.cc:687 @@ -1050,7 +1050,7 @@ msgid "%s set to manually installed.\n" msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Jūs galite norėti paleisti 'apt-get -f install\" klaidų taisymui:" #: cmdline/apt-get.cc:1797 diff --git a/po/mr.po b/po/mr.po index 646661c56..89fa7370e 100644 --- a/po/mr.po +++ b/po/mr.po @@ -766,7 +766,7 @@ msgid " Done" msgstr "झाले" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "हे बरोबर करण्यासाठी तुम्हाला `apt-get -f संस्थापना' प्रोग्राम चालू करावा लागेल." #: cmdline/apt-get.cc:687 @@ -1077,9 +1077,9 @@ msgid "%s set to manually installed.\n" msgstr "%s स्वहस्ते संस्थापित करायचे आहे.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" -"तुम्हाला कदाचित `apt-get -f install'(एपीटी-गेट -एफ संस्थापन') प्रोग्राम चालू करावा " +"तुम्हाला कदाचित 'apt-get -f install'(एपीटी-गेट -एफ संस्थापन') प्रोग्राम चालू करावा " "लागेल'यात बदल करण्यासाठी:" #: cmdline/apt-get.cc:1797 @@ -1087,7 +1087,7 @@ msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -"अनमेट डिपेंडन्सीज.एपीटी-गेट -एफ संस्थापन (`apt-get -f install') पॅकेजशिवाय प्रयत्न करा " +"अनमेट डिपेंडन्सीज.एपीटी-गेट -एफ संस्थापन ('apt-get -f install') पॅकेजशिवाय प्रयत्न करा " "(किंवा पर्याय सांगा)." #: cmdline/apt-get.cc:1809 diff --git a/po/nb.po b/po/nb.po index 7f92788f1..6a661c7d8 100644 --- a/po/nb.po +++ b/po/nb.po @@ -776,7 +776,7 @@ msgid " Done" msgstr " Utfrt" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Du vil kanskje kjre apt-get -f install for rette p dette." #: cmdline/apt-get.cc:687 @@ -1090,7 +1090,7 @@ msgid "%s set to manually installed.\n" msgstr "%s satt til manuell installasjon.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Du vil kanskje utfre apt-get -f install for rette p disse:" #: cmdline/apt-get.cc:1797 diff --git a/po/ne.po b/po/ne.po index 08d1225f3..495f19372 100644 --- a/po/ne.po +++ b/po/ne.po @@ -770,8 +770,8 @@ msgid " Done" msgstr "काम भयो" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." -msgstr "यी सुधार गर्न तपाईँले `apt-get -f install' चलाउन पर्छ ।" +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "यी सुधार गर्न तपाईँले 'apt-get -f install' चलाउन पर्छ ।" #: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." @@ -1080,8 +1080,8 @@ msgid "%s set to manually installed.\n" msgstr "तर %s स्थापना हुनुपर्यो" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "तपाईँ यसलाई सुधार गर्न `apt-get -f install' चलाउन चाहनुहुन्छ:" +msgid "You might want to run 'apt-get -f install' to correct these:" +msgstr "तपाईँ यसलाई सुधार गर्न 'apt-get -f install' चलाउन चाहनुहुन्छ:" #: cmdline/apt-get.cc:1797 msgid "" diff --git a/po/nl.po b/po/nl.po index 98cb798b7..d49ec66d8 100644 --- a/po/nl.po +++ b/po/nl.po @@ -775,7 +775,7 @@ msgid " Done" msgstr " Klaar" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "U kunt 'apt-get -f install' uitvoeren om dit op te lossen." #: cmdline/apt-get.cc:687 @@ -1094,7 +1094,7 @@ msgid "%s set to manually installed.\n" msgstr "%s is ingesteld voor handmatige installatie.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "U wilt waarschijnlijk 'apt-get -f install' uitvoeren om volgende op te " "lossen:" diff --git a/po/nn.po b/po/nn.po index 428d07152..1e45cd8fa 100644 --- a/po/nn.po +++ b/po/nn.po @@ -772,7 +772,7 @@ msgid " Done" msgstr " Ferdig" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Du vil kanskje prva retta p desse ved kyra apt-get -f install." #: cmdline/apt-get.cc:687 @@ -1086,7 +1086,7 @@ msgid "%s set to manually installed.\n" msgstr "men %s skal installerast" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Du vil kanskje prva retta p desse ved kyra apt-get -f install." #: cmdline/apt-get.cc:1797 diff --git a/po/pl.po b/po/pl.po index f21b2cf21..c8649e0ec 100644 --- a/po/pl.po +++ b/po/pl.po @@ -775,7 +775,7 @@ msgid " Done" msgstr " Gotowe" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić." #: cmdline/apt-get.cc:687 @@ -1093,7 +1093,7 @@ msgid "%s set to manually installed.\n" msgstr "%s zaznaczony jako zainstalowany ręcznie.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić:" #: cmdline/apt-get.cc:1797 diff --git a/po/pt.po b/po/pt.po index 4026e76ff..f970f242d 100644 --- a/po/pt.po +++ b/po/pt.po @@ -771,8 +771,8 @@ msgid " Done" msgstr " Feito" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." -msgstr "Você pode querer executar `apt-get -f install' para corrigir isso." +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "Você pode querer executar 'apt-get -f install' para corrigir isso." #: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." @@ -1089,15 +1089,15 @@ msgid "%s set to manually installed.\n" msgstr "%s está definido para ser instalado manualmente.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "Você deve querer executar `apt-get -f install' para corrigir estes:" +msgid "You might want to run 'apt-get -f install' to correct these:" +msgstr "Você deve querer executar 'apt-get -f install' para corrigir estes:" #: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -"Dependências não satisfeitas. Tente `apt-get -f install' sem nenhum pacote " +"Dependências não satisfeitas. Tente 'apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." #: cmdline/apt-get.cc:1809 @@ -3202,12 +3202,12 @@ msgstr "Ligação encerrada prematuramente" #~ msgid "" #~ "Some broken packages were found while trying to process build-" #~ "dependencies.\n" -#~ "You might want to run `apt-get -f install' to correct these." +#~ "You might want to run 'apt-get -f install' to correct these." #~ msgstr "" #~ "Alguns pacotes quebrados foram encontrados enquanto se tentava " #~ "processar \n" #~ "as dependências de construção.\n" -#~ "Você pode querer rodar `apt-get -f install' para corrigí-los." +#~ "Você pode querer rodar 'apt-get -f install' para corrigí-los." #~ msgid "Sorry, you don't have enough free space in %s to hold all the .debs." #~ msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index b02214a9b..967707e99 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -777,7 +777,7 @@ msgid " Done" msgstr " Pronto" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Você pode querer executar 'apt-get -f install' para corrigí-los." #: cmdline/apt-get.cc:687 @@ -1094,7 +1094,7 @@ msgid "%s set to manually installed.\n" msgstr "%s configurado para instalar manualmente.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Você deve querer executar 'apt-get -f install' para corrigí-los:" #: cmdline/apt-get.cc:1797 @@ -3172,12 +3172,12 @@ msgstr "Conexão encerrada prematuramente" #~ msgid "" #~ "Some broken packages were found while trying to process build-" #~ "dependencies.\n" -#~ "You might want to run `apt-get -f install' to correct these." +#~ "You might want to run 'apt-get -f install' to correct these." #~ msgstr "" #~ "Alguns pacotes quebrados foram encontrados enquanto se tentava " #~ "processar \n" #~ "as dependências de construção.\n" -#~ "Você pode querer rodar `apt-get -f install' para corrigí-los." +#~ "Você pode querer rodar 'apt-get -f install' para corrigí-los." #~ msgid "Sorry, you don't have enough free space in %s to hold all the .debs." #~ msgstr "" diff --git a/po/ro.po b/po/ro.po index f99371e7f..311071a30 100644 --- a/po/ro.po +++ b/po/ro.po @@ -778,7 +778,7 @@ msgid " Done" msgstr " Terminat" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Ați putea să porniți 'apt-get -f install' pentru a corecta acestea." #: cmdline/apt-get.cc:687 @@ -1092,7 +1092,7 @@ msgid "%s set to manually installed.\n" msgstr "%s este marcat ca fiind instalat manual.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Ați putea porni 'apt-get -f install' pentru a corecta acestea:" #: cmdline/apt-get.cc:1797 diff --git a/po/ru.po b/po/ru.po index 60f73f7de..98e9e15ae 100644 --- a/po/ru.po +++ b/po/ru.po @@ -781,7 +781,7 @@ msgid " Done" msgstr " Готово" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -" "f install'." @@ -1101,7 +1101,7 @@ msgid "%s set to manually installed.\n" msgstr "%s установлен вручную.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -" "f install':" diff --git a/po/sk.po b/po/sk.po index d5fe16c1a..c4db257df 100644 --- a/po/sk.po +++ b/po/sk.po @@ -768,7 +768,7 @@ msgid " Done" msgstr " Hotovo" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Opravu môžete spustiť pomocu „apt-get -f install“." #: cmdline/apt-get.cc:687 @@ -1081,7 +1081,7 @@ msgid "%s set to manually installed.\n" msgstr "%s je nastavený na manuálnu inštaláciu.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Na opravu nasledovných môžete spustiť „apt-get -f install“:" #: cmdline/apt-get.cc:1797 diff --git a/po/sl.po b/po/sl.po index 59351e42f..c279507ac 100644 --- a/po/sl.po +++ b/po/sl.po @@ -767,7 +767,7 @@ msgid " Done" msgstr " Opravljeno" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "e elite popraviti napake, poskusite pognati 'apt-get -f install'." #: cmdline/apt-get.cc:687 @@ -1078,7 +1078,7 @@ msgid "%s set to manually installed.\n" msgstr "vendar bo paket %s nameen" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Poskusite zagnati 'apt-get -f install', e elite popraviti:" #: cmdline/apt-get.cc:1797 diff --git a/po/sv.po b/po/sv.po index e14b57df5..6836371ea 100644 --- a/po/sv.po +++ b/po/sv.po @@ -772,7 +772,7 @@ msgid " Done" msgstr " Färdig" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" "Du kan möjligen rätta till dessa genom att köra \"apt-get -f install\"." @@ -1091,7 +1091,7 @@ msgid "%s set to manually installed.\n" msgstr "%s är satt till manuellt installerad.\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "Du kan möjligen rätta till detta genom att köra \"apt-get -f install\":" diff --git a/po/th.po b/po/th.po index 5cd9e120b..19b629499 100644 --- a/po/th.po +++ b/po/th.po @@ -762,8 +762,8 @@ msgid " Done" msgstr " เสร็จแล้ว" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." -msgstr "คุณอาจต้องเรียก `apt-get -f install' เพื่อแก้ปัญหาเหล่านี้" +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "คุณอาจต้องเรียก 'apt-get -f install' เพื่อแก้ปัญหาเหล่านี้" #: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." @@ -1071,8 +1071,8 @@ msgid "%s set to manually installed.\n" msgstr "กำหนด %s ให้เป็นการติดตั้งแบบเลือกเองแล้ว\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "คุณอาจเรียก `apt-get -f install' เพื่อแก้ปัญหานี้ได้:" +msgid "You might want to run 'apt-get -f install' to correct these:" +msgstr "คุณอาจเรียก 'apt-get -f install' เพื่อแก้ปัญหานี้ได้:" #: cmdline/apt-get.cc:1797 msgid "" diff --git a/po/tl.po b/po/tl.po index a44d44b07..e91e0b717 100644 --- a/po/tl.po +++ b/po/tl.po @@ -780,8 +780,8 @@ msgid " Done" msgstr " Tapos" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." -msgstr "Maaari ninyong patakbuhin ang `apt-get -f install' upang ayusin ito." +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "Maaari ninyong patakbuhin ang 'apt-get -f install' upang ayusin ito." #: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." @@ -1099,9 +1099,9 @@ msgid "%s set to manually installed.\n" msgstr "ngunit ang %s ay iluluklok" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" -"Maaaring patakbuhin niyo ang `apt-get -f install' upang ayusin ang mga ito:" +"Maaaring patakbuhin niyo ang 'apt-get -f install' upang ayusin ang mga ito:" #: cmdline/apt-get.cc:1797 msgid "" diff --git a/po/uk.po b/po/uk.po index 84ee8e0ce..ccccd7ad1 100644 --- a/po/uk.po +++ b/po/uk.po @@ -778,7 +778,7 @@ msgid " Done" msgstr " Виконано" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" "Можливо, для виправлення цих помилок ви захочете скористатися 'apt-get -f " "install'." @@ -1100,7 +1100,7 @@ msgid "%s set to manually installed.\n" msgstr "але %s буде встановлений" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "Можливо, для виправлення цих помилок Ви захочете скористатися 'apt-get -f " "install':" diff --git a/po/vi.po b/po/vi.po index eb509c29b..323175952 100644 --- a/po/vi.po +++ b/po/vi.po @@ -796,7 +796,7 @@ msgid " Done" msgstr " Đã xong" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Có lẽ bạn hãy chay lệnh « apt-get -f install » để sửa hết." #: cmdline/apt-get.cc:687 @@ -1114,7 +1114,7 @@ msgid "%s set to manually installed.\n" msgstr "%s được đặt thành « được cài đặt bằng tay ».\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Có lẽ bạn hãy chạy lênh « apt-get -f install » để sửa hết:" #: cmdline/apt-get.cc:1797 diff --git a/po/zh_CN.po b/po/zh_CN.po index 56c64e451..87dfe051f 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -765,7 +765,7 @@ msgid " Done" msgstr " 完成" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." +msgid "You might want to run 'apt-get -f install' to correct these." msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。" #: cmdline/apt-get.cc:687 @@ -1073,7 +1073,7 @@ msgid "%s set to manually installed.\n" msgstr "%s 被设置为手动安装。\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" +msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "您可能需要运行“apt-get -f install”来纠正下列错误：" #: cmdline/apt-get.cc:1797 diff --git a/po/zh_TW.po b/po/zh_TW.po index 7033d8d7b..4ebdf64fc 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -764,8 +764,8 @@ msgid " Done" msgstr " 完成" #: cmdline/apt-get.cc:684 -msgid "You might want to run `apt-get -f install' to correct these." -msgstr "您也許得執行 `apt-get -f install' 以修正這些問題。" +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "您也許得執行 'apt-get -f install' 以修正這些問題。" #: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." @@ -1073,8 +1073,8 @@ msgid "%s set to manually installed.\n" msgstr "%s 被設定為手動安裝。\n" #: cmdline/apt-get.cc:1794 -msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "您也許得執行 `apt-get -f install' 以修正這些問題：" +msgid "You might want to run 'apt-get -f install' to correct these:" +msgstr "您也許得執行 'apt-get -f install' 以修正這些問題：" #: cmdline/apt-get.cc:1797 msgid "" -- cgit v1.2.3 From d9319cee6ff10b42e64145c82dfb246a1b3e551c Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 21 Apr 2010 15:16:13 +0200 Subject: * dselect/install: - modernize if-statements not to use 'x' (Closes: #577117) Thanks to Jari Aalto for spotting & patching! --- debian/changelog | 10 ++++++++-- dselect/install | 6 +++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index d1068b64d..712437a6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ apt (0.7.26~exp4) experimental; urgency=low + [ David Kalnischkies ] * apt-pkg/depcache.cc: - "reinstall" the correct version for a killed pseudo package * apt-pkg/packagemanager.cc: @@ -18,12 +19,17 @@ apt (0.7.26~exp4) experimental; urgency=low - display MD5Sum in --print-uris if not forced to use another method instead of displaying the strongest available (Closes: #576420) - regex for package names executed on Grp- not PkgIterator - - replace backticks with single quote in broken packages message. - Thanks to Jari Aalto for spotting & patching! (Closes: #577168) * apt-pkg/deb/dpkgpm.cc: - remove Chroot-Directory from files passed to install commands. Thanks to Kel Modderman for report & patch! (Closes: #577226) + [ Jari Aalto ] + * cmdline/apt-get.cc: + - replace backticks with single quotes around fix-broken command + in the broken packages message. (Closes: #577168) + * dselect/install: + - modernize if-statements not to use 'x' (Closes: #577117) + -- David Kalnischkies <kalnischkies@gmail.com> Sat, 03 Apr 2010 14:58:39 +0200 apt (0.7.26~exp3) experimental; urgency=low diff --git a/dselect/install b/dselect/install index 6779698e0..109307f4d 100755 --- a/dselect/install +++ b/dselect/install @@ -46,7 +46,7 @@ yesno() { echo $ans | tr YN yn } -if [ x$WAIT = "xtrue" ]; then +if [ "$WAIT" = "true" ]; then $APTGET $OPTS "$APT_OPT0" "$APT_OPT1" -d dselect-upgrade echo $"Press enter to continue." && read RES $APTGET $OPTS "$APT_OPT0" "$APT_OPT1" dselect-upgrade @@ -70,8 +70,8 @@ if [ $RES -eq 0 ]; then fi NEWLS=`ls -ld $ARCHIVES` - if [ x$CHECKDIR = "xtrue" ]; then - if [ "x$OLDLS" = "x$NEWLS" ]; then + if [ "$CHECKDIR" = "true" ]; then + if [ "$OLDLS" = "$NEWLS" ]; then exit 0 fi fi -- cgit v1.2.3 From cb658c4eea4bf18295c4acacd637cd94e2473bbc Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 21 Apr 2010 15:25:12 +0200 Subject: replace backticks with POSIX $() (Closes: #577116) And again thanks to Jari Aalto for spotting & patching! --- debian/changelog | 1 + dselect/install | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 712437a6d..44ddf1f82 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,7 @@ apt (0.7.26~exp4) experimental; urgency=low in the broken packages message. (Closes: #577168) * dselect/install: - modernize if-statements not to use 'x' (Closes: #577117) + - replace backticks with POSIX $() (Closes: #577116) -- David Kalnischkies <kalnischkies@gmail.com> Sat, 03 Apr 2010 14:58:39 +0200 diff --git a/dselect/install b/dselect/install index 109307f4d..3ef213550 100755 --- a/dselect/install +++ b/dselect/install @@ -12,11 +12,11 @@ DPKG_OPTS="--admindir=$1" APT_OPT0="-oDir::State::status=$1/status" APT_OPT1="-oDPkg::Options::=$DPKG_OPTS" set -e -RES=`apt-config shell CLEAN DSelect::Clean OPTS DSelect::Options \ +RES=$(apt-config shell CLEAN DSelect::Clean OPTS DSelect::Options \ DPKG Dir::Bin::dpkg/f APTGET Dir::Bin::apt-get/f \ ARCHIVES Dir::Cache::Archives/d \ WAIT DSelect::WaitAfterDownload/b \ - CHECKDIR DSelect::CheckDir/b` + CHECKDIR DSelect::CheckDir/b) eval $RES set +e @@ -64,12 +64,12 @@ fi # Finished OK if [ $RES -eq 0 ]; then - if [ `ls $ARCHIVES $ARCHIVES/partial | egrep -v "^lock$|^partial$" | wc -l` \ + if [ $(ls $ARCHIVES $ARCHIVES/partial | egrep -v "^lock$|^partial$" | wc -l) \ -eq 0 ]; then exit 0 fi - NEWLS=`ls -ld $ARCHIVES` + NEWLS=$(ls -ld $ARCHIVES) if [ "$CHECKDIR" = "true" ]; then if [ "$OLDLS" = "$NEWLS" ]; then exit 0 @@ -77,7 +77,7 @@ if [ $RES -eq 0 ]; then fi # Check the cleaning mode - case `echo $CLEAN | tr '[:upper:]' '[:lower:]'` in + case $(echo $CLEAN | tr '[:upper:]' '[:lower:]') in auto) $APTGET "$APT_OPT0" "$APT_OPT1" autoclean && echo $"Press enter to continue." && read RES && exit 0; @@ -89,7 +89,7 @@ if [ $RES -eq 0 ]; then prompt) exec 3>&1 echo -n $"Do you want to erase any previously downloaded .deb files?" - if [ `yesno "" y` = y ]; then + if [ $(yesno "" y) = y ]; then $APTGET "$APT_OPT0" "$APT_OPT1" clean && echo $"Press enter to continue." && read RES && exit 0; fi -- cgit v1.2.3 From b15209f0b49f2f51d124af26a48f41a028f27954 Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Thu, 22 Apr 2010 10:51:49 +0200 Subject: releasing version 0.7.25.3ubuntu7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0ce160295..dfa6fead7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.7.25.3ubuntu7) UNRELEASEDlucid; urgency=low +apt (0.7.25.3ubuntu7) lucid; urgency=low Cherry pick fixes from the lp:~mvo/apt/mvo branch: @@ -9,7 +9,7 @@ apt (0.7.25.3ubuntu7) UNRELEASEDlucid; urgency=low [ Michael Vogt ] * improve debug output for Debug::pkgPackageManager - -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 14 Apr 2010 19:29:03 +0200 + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 14 Apr 2010 20:30:03 +0200 apt (0.7.25.3ubuntu6) lucid; urgency=low -- cgit v1.2.3 From 0358cbbb51174f3fb685ef297e400839ebffafa2 Mon Sep 17 00:00:00 2001 From: "lool@dooz.org" <> Date: Thu, 22 Apr 2010 10:57:37 +0200 Subject: Use https:// in Vcs-Bzr URL. --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index dfa6fead7..8e8ecca09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apt (0.7.25.3ubuntu8) UNRELEASED; urgency=low + + * Use https:// in Vcs-Bzr URL. + + -- Loïc Minier <loic.minier@ubuntu.com> Thu, 22 Apr 2010 10:57:24 +0200 + apt (0.7.25.3ubuntu7) lucid; urgency=low Cherry pick fixes from the lp:~mvo/apt/mvo branch: diff --git a/debian/control b/debian/control index 0ba851dc2..477ab5b90 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>, Luca Bruno <lethalman88@gmail.com>, Julian Andres Klode <jak@debian.org> Standards-Version: 3.8.3 Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev, intltool -Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/apt/ubuntu +Vcs-Bzr: https://code.launchpad.net/~ubuntu-core-dev/apt/ubuntu Package: apt Architecture: any -- cgit v1.2.3 From bf99a6d3307af667a23fe09bfc437a553bbbd182 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 23 Apr 2010 17:13:02 +0200 Subject: * ftparchive/writer.cc: - remove 999 chars Files and Checksums rewrite limit (Closes: #577759) --- debian/changelog | 2 ++ ftparchive/writer.cc | 40 +++++++++++++++++++--------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/debian/changelog b/debian/changelog index 44ddf1f82..8c0ac3314 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ apt (0.7.26~exp4) experimental; urgency=low * apt-pkg/deb/dpkgpm.cc: - remove Chroot-Directory from files passed to install commands. Thanks to Kel Modderman for report & patch! (Closes: #577226) + * ftparchive/writer.cc: + - remove 999 chars Files and Checksums rewrite limit (Closes: #577759) [ Jari Aalto ] * cmdline/apt-get.cc: diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index 45a8d212b..6cda29b21 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -28,6 +28,7 @@ #include <ftw.h> #include <fnmatch.h> #include <iostream> +#include <sstream> #include <memory> #include "cachedb.h" @@ -706,23 +707,20 @@ bool SourcesWriter::DoPackage(string FileName) // Add the dsc to the files hash list string const strippedName = flNotDir(FileName); - char Files[1000]; - snprintf(Files,sizeof(Files),"\n %s %lu %s\n %s", - string(MD5.Result()).c_str(),St.st_size, - strippedName.c_str(), - Tags.FindS("Files").c_str()); - - char ChecksumsSha1[1000]; - snprintf(ChecksumsSha1,sizeof(ChecksumsSha1),"\n %s %lu %s\n %s", - string(SHA1.Result()).c_str(),St.st_size, - strippedName.c_str(), - Tags.FindS("Checksums-Sha1").c_str()); - - char ChecksumsSha256[1000]; - snprintf(ChecksumsSha256,sizeof(ChecksumsSha256),"\n %s %lu %s\n %s", - string(SHA256.Result()).c_str(),St.st_size, - strippedName.c_str(), - Tags.FindS("Checksums-Sha256").c_str()); + std::ostringstream ostreamFiles; + ostreamFiles << "\n " << string(MD5.Result()) << " " << St.st_size << " " + << strippedName << "\n " << Tags.FindS("Files"); + string const Files = ostreamFiles.str(); + + std::ostringstream ostreamSha1; + ostreamSha1 << "\n " << string(SHA1.Result()) << " " << St.st_size << " " + << strippedName << "\n " << Tags.FindS("Checksums-Sha1"); + string const ChecksumsSha1 = ostreamSha1.str(); + + std::ostringstream ostreamSha256; + ostreamSha256 << "\n " << string(SHA256.Result()) << " " << St.st_size << " " + << strippedName << "\n " << Tags.FindS("Checksums-Sha256"); + string const ChecksumsSha256 = ostreamSha256.str(); // Strip the DirStrip prefix from the FileName and add the PathPrefix string NewFileName; @@ -740,7 +738,7 @@ bool SourcesWriter::DoPackage(string FileName) // Perform the delinking operation over all of the files string ParseJnk; - const char *C = Files; + const char *C = Files.c_str(); char *RealPath = NULL; for (;isspace(*C); C++); while (*C != 0) @@ -773,9 +771,9 @@ bool SourcesWriter::DoPackage(string FileName) unsigned int End = 0; SetTFRewriteData(Changes[End++],"Source",Package.c_str(),"Package"); - SetTFRewriteData(Changes[End++],"Files",Files); - SetTFRewriteData(Changes[End++],"Checksums-Sha1",ChecksumsSha1); - SetTFRewriteData(Changes[End++],"Checksums-Sha256",ChecksumsSha256); + SetTFRewriteData(Changes[End++],"Files",Files.c_str()); + SetTFRewriteData(Changes[End++],"Checksums-Sha1",ChecksumsSha1.c_str()); + SetTFRewriteData(Changes[End++],"Checksums-Sha256",ChecksumsSha256.c_str()); if (Directory != "./") SetTFRewriteData(Changes[End++],"Directory",Directory.c_str()); SetTFRewriteData(Changes[End++],"Priority",BestPrio.c_str()); -- cgit v1.2.3 From ca964703dd3442724c0ccac0ade717042ca8fce5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 23 Apr 2010 17:19:57 +0200 Subject: * cmdline/apt-cache.cc: - align Installed and Candidate Version in policy so they can be compared easier, thanks Ralf Gesellensetter for the pointer! (Closes: #578657) --- cmdline/apt-cache.cc | 12 ++++++++++-- debian/changelog | 3 +++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 07b95e3ca..b0034bf6d 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1585,6 +1585,14 @@ bool Policy(CommandLine &CmdL) } string const myArch = _config->Find("APT::Architecture"); + char const * const msgInstalled = _(" Installed: "); + char const * const msgCandidate = _(" Candidate: "); + short const InstalledLessCandidate = + mbstowcs(NULL, msgInstalled, 0) - mbstowcs(NULL, msgCandidate, 0); + short const deepInstalled = + (InstalledLessCandidate < 0 ? (InstalledLessCandidate*-1) : 0) - 1; + short const deepCandidate = + (InstalledLessCandidate > 0 ? (InstalledLessCandidate) : 0) - 1; // Print out detailed information for each package for (const char **I = CmdL.FileList + 1; *I != 0; I++) @@ -1604,14 +1612,14 @@ bool Policy(CommandLine &CmdL) cout << Pkg.FullName(true) << ":" << endl; // Installed version - cout << _(" Installed: "); + cout << msgInstalled << OutputInDepth(deepInstalled, " "); if (Pkg->CurrentVer == 0) cout << _("(none)") << endl; else cout << Pkg.CurrentVer().VerStr() << endl; // Candidate Version - cout << _(" Candidate: "); + cout << msgCandidate << OutputInDepth(deepCandidate, " "); pkgCache::VerIterator V = Plcy.GetCandidateVer(Pkg); if (V.end() == true) cout << _("(none)") << endl; diff --git a/debian/changelog b/debian/changelog index 8c0ac3314..7ef1fb2a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,9 @@ apt (0.7.26~exp4) experimental; urgency=low Thanks to Kel Modderman for report & patch! (Closes: #577226) * ftparchive/writer.cc: - remove 999 chars Files and Checksums rewrite limit (Closes: #577759) + * cmdline/apt-cache.cc: + - align Installed and Candidate Version in policy so they can be compared + easier, thanks Ralf Gesellensetter for the pointer! (Closes: #578657) [ Jari Aalto ] * cmdline/apt-get.cc: -- cgit v1.2.3 From 75a53a7c29bf3b2dd8d898ed650b1fe937119080 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 24 Apr 2010 09:39:46 +0200 Subject: * doc/apt.ent: - Add a note about APT_CONFIG in the -c description (Closes: #578267) --- debian/changelog | 2 ++ doc/apt.ent | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7ef1fb2a7..2e786c68f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,8 @@ apt (0.7.26~exp4) experimental; urgency=low * cmdline/apt-cache.cc: - align Installed and Candidate Version in policy so they can be compared easier, thanks Ralf Gesellensetter for the pointer! (Closes: #578657) + * doc/apt.ent: + - Add a note about APT_CONFIG in the -c description (Closes: #578267) [ Jari Aalto ] * cmdline/apt-get.cc: diff --git a/doc/apt.ent b/doc/apt.ent index 19da4429e..c463f7811 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -261,7 +261,9 @@ <term><option>--config-file</option></term> <listitem><para>Configuration File; Specify a configuration file to use. The program will read the default configuration file and then this - configuration file. See &apt-conf; for syntax information. + configuration file. If configuration settings need to be set before the + default configuration files are parsed specify a file with the <envar>APT_CONFIG</envar> + environment variable. See &apt-conf; for syntax information. </para> </listitem> </varlistentry> -- cgit v1.2.3 From 3b796dfc90d6ca9d42077bddd38665b0b93a2266 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 24 Apr 2010 10:49:48 +0200 Subject: show non-candidates as fallback for virtual packages (Closes: #578385) --- cmdline/apt-get.cc | 19 +++++++++++++------ debian/changelog | 1 + 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 9d67a82f8..672f64c68 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1147,20 +1147,27 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, Pkg.FullName(true).c_str()); pkgCache::PrvIterator I = Pkg.ProvidesList(); + unsigned short provider = 0; for (; I.end() == false; I++) { pkgCache::PkgIterator Pkg = I.OwnerPkg(); if (Cache[Pkg].CandidateVerIter(Cache) == I.OwnerVer()) { + c1out << " " << Pkg.FullName(true) << " " << I.OwnerVer().VerStr(); if (Cache[Pkg].Install() == true && Cache[Pkg].NewInstall() == false) - c1out << " " << Pkg.FullName(true) << " " << I.OwnerVer().VerStr() << - _(" [Installed]") << endl; - else - c1out << " " << Pkg.FullName(true) << " " << I.OwnerVer().VerStr() << endl; - } + c1out << _(" [Installed]"); + c1out << endl; + ++provider; + } } - c1out << _("You should explicitly select one to install.") << endl; + // if we found no candidate which provide this package, show non-candidates + if (provider == 0) + for (I = Pkg.ProvidesList(); I.end() == false; I++) + c1out << " " << I.OwnerPkg().FullName(true) << " " << I.OwnerVer().VerStr() + << _(" [Not candidate version]") << endl; + else + c1out << _("You should explicitly select one to install.") << endl; } else { diff --git a/debian/changelog b/debian/changelog index 2e786c68f..8adfca8fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ apt (0.7.26~exp4) experimental; urgency=low - display MD5Sum in --print-uris if not forced to use another method instead of displaying the strongest available (Closes: #576420) - regex for package names executed on Grp- not PkgIterator + - show non-candidates as fallback for virtual packages (Closes: #578385) * apt-pkg/deb/dpkgpm.cc: - remove Chroot-Directory from files passed to install commands. Thanks to Kel Modderman for report & patch! (Closes: #577226) -- cgit v1.2.3 From 972556e368479736720cba242dfdf6baa961b0d9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 24 Apr 2010 11:02:30 +0200 Subject: * doc/po/de.po: - correct typos in german apt_preferences manpage, thanks Chris Leick! --- debian/changelog | 2 ++ doc/po/de.po | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8adfca8fb..94f0cf688 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,8 @@ apt (0.7.26~exp4) experimental; urgency=low easier, thanks Ralf Gesellensetter for the pointer! (Closes: #578657) * doc/apt.ent: - Add a note about APT_CONFIG in the -c description (Closes: #578267) + * doc/po/de.po: + - correct typos in german apt_preferences manpage, thanks Chris Leick! [ Jari Aalto ] * cmdline/apt-get.cc: diff --git a/doc/po/de.po b/doc/po/de.po index 9270ecef3..5664eb780 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: apt-doc 0.7.24\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" "POT-Creation-Date: 2010-03-19 11:14+0100\n" -"PO-Revision-Date: 2010-03-22 07:41+0100\n" +"PO-Revision-Date: 2010-04-21 14:04+0200\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -1120,7 +1120,7 @@ msgid "" msgstr "" "<!ENTITY translation-holder \"\n" " Die deutsche Übersetzung wurde 2009 von Chris Leick <email>c.leick@vollbio.de</email> angefertigt\n" -" in Zusammenarbeit mit dem Debian German-l10n-Team <email>debian-l10n-german@lists.debian.org</email>.\n" +" in Zusammenarbeit mit dem Deutschen l10n-Team von Debian <email>debian-l10n-german@lists.debian.org</email>.\n" "\">\n" #. type: Plain text @@ -8683,7 +8683,7 @@ msgid "" msgstr "" "Eine Version eines Pakets, dessen Ursprung nicht das lokale System ist, aber " "ein anderer in &sources-list; aufgelisteter Ort und der zu einer " -"<literal>unstable</literal>-Distribution gehört. wird nur installiert, falls " +"<literal>unstable</literal>-Distribution gehört, wird nur installiert, falls " "es zur Installation ausgewählt wurde und nicht bereits eine Version des " "Pakets installiert ist." @@ -9023,7 +9023,7 @@ msgstr "" "Paketversionen eine höhere Priorität als die Vorgabe (500) zu geben, die zu " "einer <literal>stable</literal>-Distribution gehören und eine ungeheuer " "niedrige Priorität Paketversionen, die zu anderen <literal>Debian</literal>-" -"Distribution gehören. <placeholder type=\"programlisting\" id=\"0\"/>" +"Distributionen gehören. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml:507 apt_preferences.5.xml:553 -- cgit v1.2.3 From 6838dd8781d2986e51b7c65b7b404a70cfcd2321 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 24 Apr 2010 12:15:59 +0200 Subject: * apt-pkg/sourcelist.cc: - be less strict and accept [option=value] as well --- apt-pkg/sourcelist.cc | 7 +++++++ debian/changelog | 2 ++ 2 files changed, 9 insertions(+) diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index a860c7eac..e13472fa6 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -94,6 +94,13 @@ bool pkgSourceList::Type::ParseLine(vector<metaIndex *> &List, if (option.length() < 3) return _error->Error(_("Malformed line %lu in source list %s ([option] too short)"),CurLine,File.c_str()); + // accept options even if the last has no space before the ]-end marker + if (option.at(option.length()-1) == ']') + { + for (; *Buffer != ']'; --Buffer); + option.resize(option.length()-1); + } + size_t const needle = option.find('='); if (needle == string::npos) return _error->Error(_("Malformed line %lu in source list %s ([%s] is not an assignment)"),CurLine,File.c_str(), option.c_str()); diff --git a/debian/changelog b/debian/changelog index 94f0cf688..f78f80936 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,8 @@ apt (0.7.26~exp4) experimental; urgency=low - Add a note about APT_CONFIG in the -c description (Closes: #578267) * doc/po/de.po: - correct typos in german apt_preferences manpage, thanks Chris Leick! + * apt-pkg/sourcelist.cc: + - be less strict and accept [option=value] as well [ Jari Aalto ] * cmdline/apt-get.cc: -- cgit v1.2.3 From c3a3a1b1b68706df40dc022bdcdf8ede684f5956 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 24 Apr 2010 12:44:11 +0200 Subject: * apt-pkg/contrib/configuration.cc: - error out if #clear directive has no argument --- apt-pkg/contrib/configuration.cc | 2 ++ debian/changelog | 2 ++ 2 files changed, 4 insertions(+) diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 7588b041c..9129d92f0 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -773,6 +773,8 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool const &AsSectio else return _error->Error(_("Syntax error %s:%u: Unsupported directive '%s'"),FName.c_str(),CurLine,Tag.c_str()); } + else if (Tag.empty() == true && NoWord == false && Word == "#clear") + return _error->Error(_("Syntax error %s:%u: clear directive requires an option tree as argument"),FName.c_str(),CurLine); else { // Set the item in the configuration class diff --git a/debian/changelog b/debian/changelog index f78f80936..ee2be291b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,8 @@ apt (0.7.26~exp4) experimental; urgency=low - correct typos in german apt_preferences manpage, thanks Chris Leick! * apt-pkg/sourcelist.cc: - be less strict and accept [option=value] as well + * apt-pkg/contrib/configuration.cc: + - error out if #clear directive has no argument [ Jari Aalto ] * cmdline/apt-get.cc: -- cgit v1.2.3 From 08bd372d9dd5e4a56176ec08bf6e7870ecd41b32 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 24 Apr 2010 13:15:33 +0200 Subject: set also "all" to this version for pseudo packages in TryToChangeVer --- cmdline/apt-get.cc | 5 +++++ debian/changelog | 1 + 2 files changed, 6 insertions(+) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 672f64c68..b43164c2f 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1264,6 +1264,11 @@ bool TryToChangeVer(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, } Cache.SetCandidateVersion(Ver); + + // Set the all package to the same candidate + if (Ver.Pseudo() == true) + Cache.SetCandidateVersion(Match.Find(Pkg.Group().FindPkg("all"))); + return true; } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index ee2be291b..a1a289ab3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ apt (0.7.26~exp4) experimental; urgency=low instead of displaying the strongest available (Closes: #576420) - regex for package names executed on Grp- not PkgIterator - show non-candidates as fallback for virtual packages (Closes: #578385) + - set also "all" to this version for pseudo packages in TryToChangeVer * apt-pkg/deb/dpkgpm.cc: - remove Chroot-Directory from files passed to install commands. Thanks to Kel Modderman for report & patch! (Closes: #577226) -- cgit v1.2.3 From edde664d0cc5fe46f572696c605832700c553b9e Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 28 Apr 2010 16:25:05 +0200 Subject: rewrite the pseudo package reinstaller to be more intelligent in his package choices The previous implementation tried to install the package for arch A and if this fails B, C and so on. This results in wrong architecture choices for packages which depend on other pseudo packages, so he will now try to install the dependencies first before trying the package itself and only if this fails he tries the next architecture. --- apt-pkg/depcache.cc | 120 +++++++++++++++++++++++++++++++++++----------------- apt-pkg/depcache.h | 2 + debian/changelog | 3 +- 3 files changed, 86 insertions(+), 39 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 0f07de2fe..a63deee3a 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -841,45 +841,15 @@ void pkgDepCache::Update(OpProgress *Prog) if (installed == false) recheck.insert(G.Index()); } - std::vector<std::string> Archs = APT::Configuration::getArchitectures(); - bool checkChanged = false; - do { - for(std::set<unsigned long>::const_iterator g = recheck.begin(); - g != recheck.end(); ++g) { - GrpIterator G = GrpIterator(*Cache, Cache->GrpP + *g); - VerIterator allV = G.FindPkg("all").CurrentVer(); - for (std::vector<std::string>::const_iterator a = Archs.begin(); - a != Archs.end(); ++a) - { - PkgIterator P = G.FindPkg(*a); - if (P.end() == true) continue; - for (VerIterator V = P.VersionList(); V.end() != true; ++V) - { - if (allV->Hash != V->Hash || - strcmp(allV.VerStr(),V.VerStr()) != 0) - continue; - unsigned char const CurDepState = VersionState(V.DependsList(),DepInstall,DepInstMin,DepInstPolicy); - if ((CurDepState & DepInstMin) != DepInstMin) - break; // we found the correct version, but it is broken. Better try another arch or later again - RemoveSizes(P); - RemoveStates(P); - P->CurrentVer = V.Index(); - PkgState[P->ID].InstallVer = V; - AddStates(P); - Update(P); - AddSizes(P); - checkChanged = true; - break; - } - } - recheck.erase(g); - } - } while (checkChanged == true && recheck.empty() == false); - if (_config->FindB("Debug::MultiArchKiller", false) == true) - for(std::set<unsigned long>::const_iterator g = recheck.begin(); - g != recheck.end(); ++g) - std::cout << "No pseudo package for »" << GrpIterator(*Cache, Cache->GrpP + *g).Name() << "« installed" << std::endl; + while (recheck.empty() != true) + { + std::set<unsigned long>::const_iterator g = recheck.begin(); + unsigned long const G = *g; + recheck.erase(g); + if (unlikely(ReInstallPseudoForGroup(G, recheck) == false)) + _error->Warning(_("Internal error, group »%s« has no installable pseudo package"), GrpIterator(*Cache, Cache->GrpP + *g).Name()); + } } if (Prog != 0) @@ -888,6 +858,80 @@ void pkgDepCache::Update(OpProgress *Prog) readStateFile(Prog); } /*}}}*/ +// DepCache::ReInstallPseudoForGroup - MultiArch helper for Update() /*{{{*/ +// --------------------------------------------------------------------- +/* RemovePseudoInstalledPkg() is very successful. It even kills packages + to an amount that no pseudo package is left, but we need a pseudo package + for upgrading senarios so we need to reinstall one pseudopackage which + doesn't break everything. Thankfully we can't have architecture depending + negative dependencies so this problem is already eliminated */ +bool pkgDepCache::ReInstallPseudoForGroup(pkgCache::PkgIterator const &P, std::set<unsigned long> &recheck) +{ + if (P->CurrentVer != 0) + return true; + // recursive call for packages which provide this package + for (pkgCache::PrvIterator Prv = P.ProvidesList(); Prv.end() != true; ++Prv) + ReInstallPseudoForGroup(Prv.OwnerPkg(), recheck); + // check if we actually need to look at this group + unsigned long const G = P->Group; + std::set<unsigned long>::const_iterator Pi = recheck.find(G); + if (Pi == recheck.end()) + return true; + recheck.erase(Pi); // remove here, so we can't fall into an endless loop + if (unlikely(ReInstallPseudoForGroup(G, recheck) == false)) + { + recheck.insert(G); + return false; + } + return true; +} +bool pkgDepCache::ReInstallPseudoForGroup(unsigned long const &G, std::set<unsigned long> &recheck) +{ + std::vector<std::string> static const Archs = APT::Configuration::getArchitectures(); + pkgCache::GrpIterator Grp(*Cache, Cache->GrpP + G); + if (unlikely(Grp.end() == true)) + return false; + for (std::vector<std::string>::const_iterator a = Archs.begin(); + a != Archs.end(); ++a) + { + pkgCache::PkgIterator P = Grp.FindPkg(*a); + if (P.end() == true) + continue; + pkgCache::VerIterator allV = Grp.FindPkg("all").CurrentVer(); + for (VerIterator V = P.VersionList(); V.end() != true; ++V) + { + // search for the same version as the all package + if (allV->Hash != V->Hash || strcmp(allV.VerStr(),V.VerStr()) != 0) + continue; + unsigned char const CurDepState = VersionState(V.DependsList(),DepInstall,DepInstMin,DepInstPolicy); + // If it is broken, try to install dependencies first before retry + if ((CurDepState & DepInstMin) != DepInstMin) + { + for (pkgCache::DepIterator D = V.DependsList(); D.end() != true; ++D) + { + if (D->Type != pkgCache::Dep::PreDepends && D->Type != pkgCache::Dep::Depends) + continue; + ReInstallPseudoForGroup(D.TargetPkg(), recheck); + } + unsigned char const CurDepState = VersionState(V.DependsList(),DepInstall,DepInstMin,DepInstPolicy); + // if package ist still broken… try another arch + if ((CurDepState & DepInstMin) != DepInstMin) + break; + } + // dependencies satisfied: reinstall the package + RemoveSizes(P); + RemoveStates(P); + P->CurrentVer = V.Index(); + PkgState[P->ID].InstallVer = V; + AddStates(P); + Update(P); + AddSizes(P); + return true; + } + } + return false; +} + /*}}}*/ // DepCache::Update - Update the deps list of a package /*{{{*/ // --------------------------------------------------------------------- /* This is a helper for update that only does the dep portion of the scan. diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 72b9b5d4d..3decc7a5f 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -470,6 +470,8 @@ class pkgDepCache : protected pkgCache::Namespace private: // Helper for Update(OpProgress) to remove pseudoinstalled arch all packages bool RemovePseudoInstalledPkg(PkgIterator &Pkg, std::set<unsigned long> &recheck); + bool ReInstallPseudoForGroup(unsigned long const &Grp, std::set<unsigned long> &recheck); + bool ReInstallPseudoForGroup(pkgCache::PkgIterator const &P, std::set<unsigned long> &recheck); }; #endif diff --git a/debian/changelog b/debian/changelog index a1a289ab3..dd003938a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,8 @@ apt (0.7.26~exp4) experimental; urgency=low [ David Kalnischkies ] * apt-pkg/depcache.cc: - - "reinstall" the correct version for a killed pseudo package + - rewrite the pseudo package reinstaller to be more intelligent + in his package choices * apt-pkg/packagemanager.cc: - don't try to "unpack" pseudo packages twice * apt-pkg/contrib/fileutl.cc: -- cgit v1.2.3 From 583f7c147dc479bbdb431aa94c4d589d785207c3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Mon, 3 May 2010 16:55:11 +0200 Subject: =?UTF-8?q?replace=20=C2=BB=C2=AB=20with=20''=20in=20the=20interna?= =?UTF-8?q?l=20error=20msg=20to=20have=20ascii=20chars=20for=20gettext?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apt-pkg/depcache.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index a63deee3a..659c4227e 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -848,7 +848,7 @@ void pkgDepCache::Update(OpProgress *Prog) unsigned long const G = *g; recheck.erase(g); if (unlikely(ReInstallPseudoForGroup(G, recheck) == false)) - _error->Warning(_("Internal error, group »%s« has no installable pseudo package"), GrpIterator(*Cache, Cache->GrpP + *g).Name()); + _error->Warning(_("Internal error, group '%s' has no installable pseudo package"), GrpIterator(*Cache, Cache->GrpP + *g).Name()); } } -- cgit v1.2.3 From 86435b7d7bbf5bc7fab48a35631b8d20e61587b5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Mon, 3 May 2010 17:19:09 +0200 Subject: * doc/files.sgml: - sync documentation with status quo, regarding files/directories in use, extended_states and uri schemes. --- debian/changelog | 3 + doc/files.sgml | 181 ++++++++++++++++++++++++------------------------------- 2 files changed, 81 insertions(+), 103 deletions(-) diff --git a/debian/changelog b/debian/changelog index dd003938a..2f262a3a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -114,6 +114,9 @@ apt (0.7.26~exp3) experimental; urgency=low Thanks to Chris Leick and Georg Koppen! (Closes: #574962) * apt-pkg/contrib/strutl.cc: - convert all toupper calls to tolower_ascii for a little speedup + * doc/files.sgml: + - sync documentation with status quo, regarding files/directories in + use, extended_states and uri schemes. [ Jean-Baptiste Lallement ] * apt-pkg/contrib/strutl.cc: diff --git a/doc/files.sgml b/doc/files.sgml index 2293e204a..108e73670 100644 --- a/doc/files.sgml +++ b/doc/files.sgml @@ -42,40 +42,68 @@ multiple package files. The var directory structure is as follows: <example> /var/lib/apt/ - lists/ + lists/ partial/ - xstatus - userstatus - cdroms.list + periodic/ + extended_states + cdroms.list /var/cache/apt/ - pkgcache.bin - srcpkgcache.bin archives/ partial/ + pkgcache.bin + srcpkgcache.bin /etc/apt/ - sources.list - apt.conf + sources.list.d/ + apt.conf.d/ + preferences.d/ + trusted.gpg.d/ + sources.list + apt.conf + apt_preferences + trusted.gpg /usr/lib/apt/ - methods/ - cdrom - ftp - http - file - gzip - copy + methods/ + bzip2 + cdrom + copy + file + ftp + gpgv + gzip + http + https + lzma + rred + rsh + ssh </example> <p> As is specified in the FHS 2.1 /var/lib/apt is used for application data that is not expected to be user modified. /var/cache/apt is used for regeneratable data and is where the package cache and downloaded .debs -go. +go. /etc/apt is the place where configuration should happen and +/usr/lib/apt is the place where the apt and other packages can place +binaries which can be used by the acquire system of APT. </sect> <!-- }}} --> <chapt>Files <!-- Distribution Source List {{{ --> <!-- ===================================================================== --> +<sect>Files and fragment directories in /etc/apt + +<p> +All files in /etc/apt are used to modify specific aspects of APT. To enable +other packages to ship needed configuration herself all these files have +a fragment directory packages can place their files in instead of mangling +with the main files. The main files are therefore considered to be only +used by the user and not by a package. The documentation omits this directories +most of the time to be easier readable, so every time the documentation includes +a reference to a main file it really means the file or the fragment directories. + +</sect> + <sect>Distribution Source list (sources.list) <p> @@ -121,7 +149,10 @@ which indicates a standard debian archive with a dists dir. <sect1>URI specification <p> -URIs in the source list support a large number of access schemes. +URIs in the source list support a large number of access schemes which +are listed in the sources.list manpage and can be further extended by +transport binaries placed in /usr/lib/apt/methods. The most important +builtin schemes are: <taglist> <tag>cdrom<item> @@ -161,13 +192,6 @@ URIs in the source list support a large number of access schemes. <example> file:/var/debian </example> - -<tag>smb<item> - A possible future expansion may be to have direct support for smb (Samba - servers). - <example> - smb://ftp.kernel.org/pub/mirrors/debian - </example> </taglist> </sect1> @@ -201,38 +225,31 @@ here as well. </sect> <!-- }}} --> -<!-- Extra Status {{{ --> +<!-- Extended Status {{{ --> <!-- ===================================================================== --> -<sect>Extra Status File (xstatus) +<sect>Extended States File (extended_states) <p> -The extra status file serves the same purpose as the normal dpkg status file +The extended_states file serves the same purpose as the normal dpkg status file (/var/lib/dpkg/status) except that it stores information unique to apt. -This includes the autoflag, target distribution and version and any other -unique features that come up over time. It duplicates nothing from the normal +This includes currently only the autoflag but is open to store more +unique data that come up over time. It duplicates nothing from the normal dpkg status file. Please see other APT documentation for a discussion -of the exact internal behaviour of these fields. The Package field is -placed directly before the new fields to indicate which package they -apply to. The new fields are as follows: +of the exact internal behaviour of these fields. The Package and the +Architecture field are placed directly before the new fields to indicate +which package they apply to. The new fields are as follows: <taglist> -<tag>X-Auto<item> - The Auto flag can be Yes or No and controls whether the package is in - auto mode. - -<tag>X-TargetDist<item> - The TargetDist item indicates which distribution versions are offered for - installation from. It should be stable, unstable or testing. - -<tag>X-TargetVersion<item> - The target version item is set if the user selects a specific version, it - overrides the TargetDist selection if both are present. +<tag>Auto-Installed<item> + The Auto flag can be 1 (Yes) or 0 (No) and controls whether the package + was automatical installed to satisfy a dependency or if the user requested + the installation </taglist> </sect> <!-- }}} --> <!-- Binary Package Cache {{{ --> <!-- ===================================================================== --> -<sect>Binary Package Cache (pkgcache.bin) +<sect>Binary Package Cache (srcpkgcache.bin and pkgcache.bin) <p> Please see cache.sgml for a complete description of what this file is. The @@ -278,69 +295,27 @@ The Methods directory is more fully described in the APT Methods interface document. </sect> <!-- }}} --> -<!-- The Mirror List {{{ --> +<!-- The Configuration File {{{ --> <!-- ===================================================================== --> -<sect> The Mirror List +<sect> The Configuration File (/etc/apt/apt.conf) <p> -The mirror list is stored on the primary debian web server (www.debian.org) -and contains a machine readable list of all known debian mirrors. It's -format and style mirror the Package file. - -<taglist> -<tag>Site<item> -This is the proper host name of the site. It should not be a host within -debian.org and generally cnames should be avoided here. - -<tag>Aliases<item> -These list any commonly used aliases for the site. This field is used to make -sure that a site is not added twice. - -<tag>Type<item> -This field can either be <em>Push-Primary</> or <em>leaf</>. -<em>Push-Primary</> are authorized top level mirrors of the archive, all -other mirrors are leaf. - -<tag>Archive-[access]<item> -The Archive field gives the path(s) to the debian archive. [access] -specifies the access method and may be one of ftp, http, rsync, nfs, or -smb. For many of the types it is possible to prefix the path with :### -indicating that an alternate port should be used. Generally paths -start with a / and end with a /, rsync is an exception in that the -first directory component is not a path but a label. - -<tag>WWW-[access]<item> -The WWW field gives the path(s) to the debian web site. - -<tag>CDImage-[access]<item> -The WWW field gives the path(s) to the debian CD-ROM images - -<tag>Incoming-[access]<item> -The Incoming field gives the path(s) to a mirror of the debian incoming -directory. - -<tag>nonUS-[access]<item> -The nonUS field gives the path(s) to a mirror of the non-US distribution. - -<tag>Maintainer<item> -This is the email address of the maintainer of the mirror. - -<tag>Location<item> -Location gives the general geographical region the mirror is in. - -<tag>Sponsor<item> -The Sponsor field indicates who owns the mirror and a URL to a web page -describing the organization. - -<tag>Comment<item> -General free-form text. - -</taglist> +The configuration file (and the associated fragments directory +/etc/apt/apt.conf.d/) is described in the apt.conf manpage. +</sect> + <!-- }}} --> +<!-- The trusted.gpg File {{{ --> +<!-- ===================================================================== --> +<sect> The trusted.gpg File (/etc/apt/trusted.gpg) <p> -Some form of network measurement will have to be used to gauge performance -of each of the mirrors. This will be discussed later, initial versions -will use the first found URI. +The trusted.gpg file (and the files in the associated fragments directory +/etc/apt/trusted.gpg.d/) is a binary file including the keyring used +by apt to validate that the information (e.g. the Release file) it +downloads are really from the distributor it clams to be and is +unmodified and is therefore the last step in the chain of trust between +the archive and the end user. This security system is described in the +apt-secure manpage. </sect> <!-- }}} --> <!-- The Release File {{{ --> @@ -348,7 +323,7 @@ will use the first found URI. <sect> The Release File <p> -This file plays and important role in how APT presents the archive to the +This file plays an important role in how APT presents the archive to the user. Its main purpose is to present a descriptive name for the source of each version of each package. It also is used to detect when new versions of debian are released. It augments the package file it is associated with -- cgit v1.2.3 From 94449d7cd3eed7637c1ed78863c01ff207faa31e Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 4 May 2010 12:30:13 +0200 Subject: * doc/cache.sgml: - drop the file in favor of inplace documentation with doxygen --- apt-pkg/pkgcache.h | 469 ++++++++++++++++++++++++------ debian/changelog | 8 +- doc/cache.sgml | 824 ----------------------------------------------------- 3 files changed, 390 insertions(+), 911 deletions(-) delete mode 100644 doc/cache.sgml diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 577eebad9..a2e63ff03 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -1,20 +1,75 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: pkgcache.h,v 1.25 2001/07/01 22:28:24 jgg Exp $ -/* ###################################################################### - - Cache - Structure definitions for the cache file - - Please see doc/apt-pkg/cache.sgml for a more detailed description of - this format. Also be sure to keep that file up-to-date!! - +/**\file pkgcache.h + \brief pkgCache - Structure definitions for the cache file + + The goal of the cache file is two fold: + Firstly to speed loading and processing of the package file array and + secondly to reduce memory consumption of the package file array. + + The implementation is aimed at an environment with many primary package + files, for instance someone that has a Package file for their CD-ROM, a + Package file for the latest version of the distribution on the CD-ROM and a + package file for the development version. Always present is the information + contained in the status file which might be considered a separate package + file. + + Please understand, this is designed as a <b>Cache file</b> it is not meant to be + used on any system other than the one it was created for. It is not meant to + be authoritative either, i.e. if a system crash or software failure occurs it + must be perfectly acceptable for the cache file to be in an inconsistent + state. Furthermore at any time the cache file may be erased without losing + any information. + + Also the structures and storage layout is optimized for use by the APT + and may not be suitable for all purposes. However it should be possible + to extend it with associate cache files that contain other information. + + To keep memory use down the cache file only contains often used fields and + fields that are inexpensive to store, the Package file has a full list of + fields. Also the client may assume that all items are perfectly valid and + need not perform checks against their correctness. Removal of information + from the cache is possible, but blanks will be left in the file, and + unused strings will also be present. The recommended implementation is to + simply rebuild the cache each time any of the data files change. It is + possible to add a new package file to the cache without any negative side + effects. + + <b>Note on Pointer access</b> Clients should always use the CacheIterators classes for access to the - cache. They provide a simple STL-like method for traversing the links - of the datastructure. - - See pkgcachegen.h for information about generating cache structures. - - ##################################################################### */ + cache and the data in it. They also provide a simple STL-like method for + traversing the links of the datastructure. + + Every item in every structure is stored as the index to that structure. + What this means is that once the files is mmaped every data access has to + go through a fix up stage to get a real memory pointer. This is done + by taking the index, multiplying it by the type size and then adding + it to the start address of the memory block. This sounds complex, but + in C it is a single array dereference. Because all items are aligned to + their size and indexes are stored as multiples of the size of the structure + the format is immediately portable to all possible architectures - BUT the + generated files are -NOT-. + + This scheme allows code like this to be written: + <example> + void *Map = mmap(...); + Package *PkgList = (Package *)Map; + Header *Head = (Header *)Map; + char *Strings = (char *)Map; + cout << (Strings + PkgList[Head->HashTable[0]]->Name) << endl; + </example> + Notice the lack of casting or multiplication. The net result is to return + the name of the first package in the first hash bucket, without error + checks. + + The generator uses allocation pools to group similarly sized structures in + large blocks to eliminate any alignment overhead. The generator also + assures that no structures overlap and all indexes are unique. Although + at first glance it may seem like there is the potential for two structures + to exist at the same point the generator never allows this to happen. + (See the discussion of free space pools) + + See \ref pkgcachegen.h for more information about generating cache structures. */ /*}}}*/ #ifndef PKGLIB_PKGCACHE_H #define PKGLIB_PKGCACHE_H @@ -66,12 +121,20 @@ class pkgCache /*{{{*/ { enum DepType {Depends=1,PreDepends=2,Suggests=3,Recommends=4, Conflicts=5,Replaces=6,Obsoletes=7,DpkgBreaks=8,Enhances=9}; + /** \brief available compare operators + + The lower 4 bits are used to indicate what operator is being specified and + the upper 4 bits are flags. OR indicates that the next package is + or'd with the current package. */ enum DepCompareOp {Or=0x10,NoOp=0,LessEq=0x1,GreaterEq=0x2,Less=0x3, Greater=0x4,Equals=0x5,NotEquals=0x6}; }; struct State { + /** \brief priority of a package version + + Zero is used for unparsable or absent Priority fields. */ enum VerPriority {Important=1,Required=2,Standard=3,Optional=4,Extra=5}; enum PkgSelectedState {Unknown=0,Install=1,Hold=2,DeInstall=3,Purge=4}; enum PkgInstState {Ok=0,ReInstReq=1,HoldInst=2,HoldReInstReq=3}; @@ -120,7 +183,7 @@ class pkgCache /*{{{*/ inline unsigned long Hash(const string &S) const {return sHash(S);}; inline unsigned long Hash(const char *S) const {return sHash(S);}; - // Usefull transformation things + // Useful transformation things const char *Priority(unsigned char Priority); // Accessors @@ -157,13 +220,29 @@ private: // Header structure /*{{{*/ struct pkgCache::Header { - // Signature information + /** \brief Signature information + + This must contain the hex value 0x98FE76DC which is designed to + verify that the system loading the image has the same byte order + and byte size as the system saving the image */ unsigned long Signature; + /** These contain the version of the cache file */ short MajorVersion; short MinorVersion; + /** \brief indicates if the cache should be erased + + Dirty is true if the cache file was opened for reading, the client + expects to have written things to it and have not fully synced it. + The file should be erased and rebuilt if it is true. */ bool Dirty; - - // Size of structure values + + /** \brief Size of structure values + + All *Sz variables contains the sizeof() that particular structure. + It is used as an extra consistency check on the structure of the file. + + If any of the size values do not exactly match what the client expects + then the client should refuse the load the file. */ unsigned short HeaderSz; unsigned short PackageSz; unsigned short PackageFileSz; @@ -173,8 +252,12 @@ struct pkgCache::Header unsigned short ProvidesSz; unsigned short VerFileSz; unsigned short DescFileSz; - - // Structure counts + + /** \brief Structure counts + + These indicate the number of each structure contained in the cache. + PackageCount is especially useful for generating user state structures. + See Package::Id for more info. */ unsigned long GroupCount; unsigned long PackageCount; unsigned long VersionCount; @@ -184,22 +267,48 @@ struct pkgCache::Header unsigned long VerFileCount; unsigned long DescFileCount; unsigned long ProvidesCount; - - // Offsets - map_ptrloc FileList; // struct PackageFile - map_ptrloc StringList; // struct StringItem - map_ptrloc VerSysName; // StringTable - map_ptrloc Architecture; // StringTable + + /** \brief index of the first PackageFile structure + + The PackageFile structures are singly linked lists that represent + all package files that have been merged into the cache. */ + map_ptrloc FileList; + /** \brief index of the first StringItem structure + + The cache contains a list of all the unique strings (StringItems). + The parser reads this list into memory so it can match strings + against it.*/ + map_ptrloc StringList; + /** \brief String representing the version system used */ + map_ptrloc VerSysName; + /** \brief Architecture(s) the cache was built against */ + map_ptrloc Architecture; + /** \brief The maximum size of a raw entry from the original Package file */ unsigned long MaxVerFileSize; + /** \brief The maximum size of a raw entry from the original Translation file */ unsigned long MaxDescFileSize; - /* Allocation pools, there should be one of these for each structure - excluding the header */ + /** \brief The Pool structures manage the allocation pools that the generator uses + + Start indicates the first byte of the pool, Count is the number of objects + remaining in the pool and ItemSize is the structure size (alignment factor) + of the pool. An ItemSize of 0 indicates the pool is empty. There should be + the same number of pools as there are structure types. The generator + stores this information so future additions can make use of any unused pool + blocks. */ DynamicMMap::Pool Pools[9]; - // Rapid package and group name lookup - // Notice: Increase only both table sizes as the - // hashmethod assume the size of the Pkg one + /** \brief hash tables providing rapid group/package name lookup + + Each group/package name is inserted into the hash table using pkgCache::Hash(const &string) + By iterating over each entry in the hash table it is possible to iterate over + the entire list of packages. Hash Collisions are handled with a singly linked + list of packages based at the hash item. The linked list contains only + packages that match the hashing function. + In the PkgHashTable is it possible that multiple packages have the same name - + these packages are stored as a sequence in the list. + + Beware: The Hashmethod assumes that the hash table sizes are equal */ map_ptrloc PkgHashTable[2*1048]; map_ptrloc GrpHashTable[2*1048]; @@ -207,140 +316,332 @@ struct pkgCache::Header Header(); }; /*}}}*/ -struct pkgCache::Group { /*{{{*/ - map_ptrloc Name; // Stringtable +// Group structure /*{{{*/ +/** \brief groups architecture depending packages together - // Linked List - map_ptrloc FirstPackage;// Package - map_ptrloc LastPackage; // Package - map_ptrloc Next; // Group + On or more packages with the same name form a group, so we have + a simple way to access a package built for different architectures + Group exists in a singly linked list of group records starting at + the hash index of the name in the pkgCache::Header::GrpHashTable */ +struct pkgCache::Group +{ + /** \brief Name of the group */ + map_ptrloc Name; // StringItem + + // Linked List + /** Link to the first package which belongs to the group */ + map_ptrloc FirstPackage; // Package + /** Link to the last package which belongs to the group */ + map_ptrloc LastPackage; // Package + /** Link to the next Group */ + map_ptrloc Next; // Group }; /*}}}*/ -struct pkgCache::Package /*{{{*/ +// Package structure /*{{{*/ +/** \brief contains information for a single unique package + + There can be any number of versions of a given package. + Package exists in a singly linked list of package records starting at + the hash index of the name in the pkgCache::Header::PkgHashTable + + A package can be created for every architecture so package names are + not unique, but it is garanteed that packages with the same name + are sequencel ordered in the list. Packages with the same name can be + accessed with the Group. +*/ +struct pkgCache::Package { - // Pointers - map_ptrloc Name; // Stringtable - map_ptrloc Arch; // StringTable (StringItem) + /** \brief Name of the package */ + map_ptrloc Name; // StringItem + /** \brief Architecture of the package */ + map_ptrloc Arch; // StringItem + /** \brief Base of a singly linked list of versions + + Each structure represents a unique version of the package. + The version structures contain links into PackageFile and the + original text file as well as detailed information about the size + and dependencies of the specific package. In this way multiple + versions of a package can be cleanly handled by the system. + Furthermore, this linked list is guaranteed to be sorted + from Highest version to lowest version with no duplicate entries. */ map_ptrloc VersionList; // Version + /** \brief index to the installed version */ map_ptrloc CurrentVer; // Version - map_ptrloc Section; // StringTable (StringItem) + /** \brief indicates the deduced section + + Should be the index to the string "Unknown" or to the section + of the last parsed item. */ + map_ptrloc Section; // StringItem + /** \brief index of the group this package belongs to */ map_ptrloc Group; // Group the Package belongs to - - // Linked list + + // Linked list + /** \brief Link to the next package in the same bucket */ map_ptrloc NextPackage; // Package + /** \brief List of all dependencies on this package */ map_ptrloc RevDepends; // Dependency + /** \brief List of all "packages" this package provide */ map_ptrloc ProvidesList; // Provides // Install/Remove/Purge etc + /** \brief state that the user wishes the package to be in */ unsigned char SelectedState; // What + /** \brief installation state of the package + + This should be "ok" but in case the installation failed + it will be different. + */ unsigned char InstState; // Flags + /** \brief indicates if the package is installed */ unsigned char CurrentState; // State - + + /** \brief unique sequel ID + + ID is a unique value from 0 to Header->PackageCount assigned by the generator. + This allows clients to create an array of size PackageCount and use it to store + state information for the package map. For instance the status file emitter uses + this to track which packages have been emitted already. */ unsigned int ID; + /** \brief some useful indicators of the package's state */ unsigned long Flags; }; /*}}}*/ -struct pkgCache::PackageFile /*{{{*/ +// Package File structure /*{{{*/ +/** \brief stores information about the files used to generate the cache + + Package files are referenced by Version structures to be able to know + after the generation still from which Packages file includes this Version + as we need this information later on e.g. for pinning. */ +struct pkgCache::PackageFile { - // Names - map_ptrloc FileName; // Stringtable - map_ptrloc Archive; // Stringtable - map_ptrloc Codename; // Stringtable - map_ptrloc Component; // Stringtable - map_ptrloc Version; // Stringtable - map_ptrloc Origin; // Stringtable - map_ptrloc Label; // Stringtable - map_ptrloc Architecture; // Stringtable - map_ptrloc Site; // Stringtable - map_ptrloc IndexType; // Stringtable - unsigned long Size; + /** \brief physical disk file that this PackageFile represents */ + map_ptrloc FileName; // StringItem + /** \brief the release information + + Please see the files document for a description of what the + release information means. */ + map_ptrloc Archive; // StringItem + map_ptrloc Codename; // StringItem + map_ptrloc Component; // StringItem + map_ptrloc Version; // StringItem + map_ptrloc Origin; // StringItem + map_ptrloc Label; // StringItem + map_ptrloc Architecture; // StringItem + /** \brief The site the index file was fetched from */ + map_ptrloc Site; // StringItem + /** \brief indicates what sort of index file this is + + @TODO enumerate at least the possible indexes */ + map_ptrloc IndexType; // StringItem + /** \brief Size of the file + + Used together with the modification time as a + simple check to ensure that the Packages + file has not been altered since Cache generation. */ + unsigned long Size; + /** \brief Modification time for the file */ + time_t mtime; + + /* @TODO document PackageFile::Flags */ unsigned long Flags; - + // Linked list + /** \brief Link to the next PackageFile in the Cache */ map_ptrloc NextFile; // PackageFile + /** \brief unique sequel ID */ unsigned int ID; - time_t mtime; // Modification time for the file }; /*}}}*/ -struct pkgCache::VerFile /*{{{*/ +// VerFile structure /*{{{*/ +/** \brief associates a version with a PackageFile + + This allows a full description of all Versions in all files + (and hence all sources) under consideration. */ +struct pkgCache::VerFile { + /** \brief index of the package file that this version was found in */ map_ptrloc File; // PackageFile + /** \brief next step in the linked list */ map_ptrloc NextFile; // PkgVerFile + /** \brief position in the package file */ map_ptrloc Offset; // File offset + /* @TODO document pkgCache::VerFile::Size */ unsigned long Size; }; /*}}}*/ -struct pkgCache::DescFile /*{{{*/ +// DescFile structure /*{{{*/ +/** \brief associates a description with a Translation file */ +struct pkgCache::DescFile { + /** \brief index of the file that this description was found in */ map_ptrloc File; // PackageFile + /** \brief next step in the linked list */ map_ptrloc NextFile; // PkgVerFile + /** \brief position in the file */ map_ptrloc Offset; // File offset + /* @TODO document pkgCache::DescFile::Size */ unsigned long Size; }; /*}}}*/ -struct pkgCache::Version /*{{{*/ +// Version structure /*{{{*/ +/** \brief information for a single version of a package + + The version list is always sorted from highest version to lowest + version by the generator. Equal version numbers are either merged + or handled as separate versions based on the Hash value. */ +struct pkgCache::Version { - map_ptrloc VerStr; // Stringtable - map_ptrloc Section; // StringTable (StringItem) + /** \brief complete version string */ + map_ptrloc VerStr; // StringItem + /** \brief section this version is filled in */ + map_ptrloc Section; // StringItem + /** \brief stores the MultiArch capabilities of this version + + None is the default and doesn't trigger special behaviour, + Foreign means that this version can fulfill dependencies even + if it is built for another architecture as the requester. + Same indicates that builds for different architectures can + be co-installed on the system and All is the marker for a + version with the Architecture: all. */ enum {None, All, Foreign, Same, Allowed} MultiArch; - // Lists + /** \brief references all the PackageFile's that this version came from + + FileList can be used to determine what distribution(s) the Version + applies to. If FileList is 0 then this is a blank version. + The structure should also have a 0 in all other fields excluding + pkgCache::Version::VerStr and Possibly pkgCache::Version::NextVer. */ map_ptrloc FileList; // VerFile + /** \brief next (lower or equal) version in the linked list */ map_ptrloc NextVer; // Version + /** \brief next description in the linked list */ map_ptrloc DescriptionList; // Description + /** \brief base of the dependency list */ map_ptrloc DependsList; // Dependency + /** \brief links to the owning package + + This allows reverse dependencies to determine the package */ map_ptrloc ParentPkg; // Package + /** \brief list of pkgCache::Provides */ map_ptrloc ProvidesList; // Provides - + + /** \brief archive size for this version + + For Debian this is the size of the .deb file. */ map_ptrloc Size; // These are the .deb size + /** \brief uncompressed size for this version */ map_ptrloc InstalledSize; + /** \brief characteristic value representing this version + + No two packages in existence should have the same VerStr + and Hash with different contents. */ unsigned short Hash; + /** \brief unique sequel ID */ unsigned int ID; + /** \brief parsed priority value */ unsigned char Priority; }; /*}}}*/ -struct pkgCache::Description /*{{{*/ +// Description structure /*{{{*/ +/** \brief datamember of a linked list of available description for a version */ +struct pkgCache::Description { - // Language Code store the description translation language code. If - // the value has a 0 lenght then this is readed using the Package - // file else the Translation-CODE are used. - map_ptrloc language_code; // StringTable - map_ptrloc md5sum; // StringTable + /** \brief Language code of this description (translation) + + If the value has a 0 length then this is read using the Package + file else the Translation-CODE file is used. */ + map_ptrloc language_code; // StringItem + /** \brief MD5sum of the original description + + Used to map Translations of a description to a version + and to check that the Translation is up-to-date. */ + map_ptrloc md5sum; // StringItem - // Linked list + /* @TODO document pkgCache::Description::FileList */ map_ptrloc FileList; // DescFile + /** \brief next translation for this description */ map_ptrloc NextDesc; // Description + /** \brief the text is a description of this package */ map_ptrloc ParentPkg; // Package + /** \brief unique sequel ID */ unsigned int ID; }; /*}}}*/ -struct pkgCache::Dependency /*{{{*/ +// Dependency structure /*{{{*/ +/** \brief information for a single dependency record + + The records are split up like this to ease processing by the client. + The base of the linked list is pkgCache::Version::DependsList. + All forms of dependencies are recorded here including Depends, + Recommends, Suggests, Enhances, Conflicts, Replaces and Breaks. */ +struct pkgCache::Dependency { - map_ptrloc Version; // Stringtable + /** \brief string of the version the dependency is applied against */ + map_ptrloc Version; // StringItem + /** \brief index of the package this depends applies to + + The generator will - if the package does not already exist - + create a blank (no version records) package. */ map_ptrloc Package; // Package + /** \brief next dependency of this version */ map_ptrloc NextDepends; // Dependency + /** \brief next reverse dependency of this package */ map_ptrloc NextRevDepends; // Dependency + /** \brief version of the package which has the reverse depends */ map_ptrloc ParentVer; // Version - - // Specific types of depends - map_ptrloc ID; + + /** \brief unique sequel ID */ + map_ptrloc ID; + /** \brief Dependency type - Depends, Recommends, Conflicts, etc */ unsigned char Type; + /** \brief comparison operator specified on the depends line + + If the high bit is set then it is a logical OR with the previous record. */ unsigned char CompareOp; }; /*}}}*/ -struct pkgCache::Provides /*{{{*/ +// Provides structure /*{{{*/ +/** \brief handles virtual packages + + When a Provides: line is encountered a new provides record is added + associating the package with a virtual package name. + The provides structures are linked off the package structures. + This simplifies the analysis of dependencies and other aspects A provides + refers to a specific version of a specific package, not all versions need to + provide that provides.*/ +struct pkgCache::Provides { - map_ptrloc ParentPkg; // Pacakge + /** \brief index of the package providing this */ + map_ptrloc ParentPkg; // Package + /** \brief index of the version this provide line applies to */ map_ptrloc Version; // Version - map_ptrloc ProvideVersion; // Stringtable + /** \brief version in the provides line (if any) + + This version allows dependencies to depend on specific versions of a + Provides, as well as allowing Provides to override existing packages. + This is experimental. Note that Debian doesn't allow versioned provides */ + map_ptrloc ProvideVersion; // StringItem + /** \brief next provides (based of package) */ map_ptrloc NextProvides; // Provides + /** \brief next provides (based of version) */ map_ptrloc NextPkgProv; // Provides }; /*}}}*/ -struct pkgCache::StringItem /*{{{*/ +// StringItem structure /*{{{*/ +/** \brief used for generating single instances of strings + + Some things like Section Name are are useful to have as unique tags. + It is part of a linked list based at pkgCache::Header::StringList + + All strings are simply inlined any place in the file that is natural + for the writer. The client should make no assumptions about the positioning + of strings. All StringItems should be null-terminated. */ +struct pkgCache::StringItem { - map_ptrloc String; // Stringtable + /** \brief string this refers to */ + map_ptrloc String; // StringItem + /** \brief Next link in the chain */ map_ptrloc NextItem; // StringItem }; /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 2f262a3a9..76fc2550b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,11 @@ apt (0.7.26~exp4) experimental; urgency=low - be less strict and accept [option=value] as well * apt-pkg/contrib/configuration.cc: - error out if #clear directive has no argument + * doc/files.sgml: + - sync documentation with status quo, regarding files/directories in + use, extended_states and uri schemes. + * doc/cache.sgml: + - drop the file in favor of inplace documentation with doxygen [ Jari Aalto ] * cmdline/apt-get.cc: @@ -114,9 +119,6 @@ apt (0.7.26~exp3) experimental; urgency=low Thanks to Chris Leick and Georg Koppen! (Closes: #574962) * apt-pkg/contrib/strutl.cc: - convert all toupper calls to tolower_ascii for a little speedup - * doc/files.sgml: - - sync documentation with status quo, regarding files/directories in - use, extended_states and uri schemes. [ Jean-Baptiste Lallement ] * apt-pkg/contrib/strutl.cc: diff --git a/doc/cache.sgml b/doc/cache.sgml deleted file mode 100644 index aea5a45c3..000000000 --- a/doc/cache.sgml +++ /dev/null @@ -1,824 +0,0 @@ -<!-- -*- mode: sgml; mode: fold -*- --> -<!doctype debiandoc PUBLIC "-//DebianDoc//DTD DebianDoc//EN"> -<book> -<title>APT Cache File Format - -Jason Gunthorpe jgg@debian.org -$Id: cache.sgml,v 1.11 2003/02/12 15:05:44 doogie Exp $ - - -This document describes the complete implementation and format of the APT -Cache file. The APT Cache file is a way for APT to parse and store a -large number of package files for display in the UI. It's primary design -goal is to make display of a single package in the tree very fast by -pre-linking important things like dependencies and provides. - -The specification doubles as documentation for one of the in-memory -structures used by the package library and the APT GUI. - - - - -Copyright © Jason Gunthorpe, 1997-1998. -

-APT and this document are free software; you can redistribute them and/or -modify them under the terms of the GNU General Public License as published -by the Free Software Foundation; either version 2 of the License, or (at your -option) any later version. - -

-For more details, on Debian GNU/Linux systems, see the file -/usr/share/common-licenses/GPL for the full license. - - - - -Introduction - - -Purpose - -

-This document describes the implementation of an architecture -dependent binary cache file. The goal of this cache file is two fold, -firstly to speed loading and processing of the package file array and -secondly to reduce memory consumption of the package file array. - -

-The implementation is aimed at an environment with many primary package -files, for instance someone that has a Package file for their CD-ROM, a -Package file for the latest version of the distribution on the CD-ROM and a -package file for the development version. Always present is the information -contained in the status file which might be considered a separate package -file. - -

-Please understand, this is designed as a -CACHE FILE- it is not meant to be -used on any system other than the one it was created for. It is not meant to -be authoritative either, i.e. if a system crash or software failure occurs it -must be perfectly acceptable for the cache file to be in an inconsistent -state. Furthermore at any time the cache file may be erased without losing -any information. - -

-Also the structures and storage layout is optimized for use by the APT -GUI and may not be suitable for all purposes. However it should be possible -to extend it with associate cache files that contain other information. - -

-To keep memory use down the cache file only contains often used fields and -fields that are inexpensive to store, the Package file has a full list of -fields. Also the client may assume that all items are perfectly valid and -need not perform checks against their correctness. Removal of information -from the cache is possible, but blanks will be left in the file, and -unused strings will also be present. The recommended implementation is to -simply rebuild the cache each time any of the data files change. It is -possible to add a new package file to the cache without any negative side -effects. - -Note on Pointer access -

-Every item in every structure is stored as the index to that structure. -What this means is that once the files is mmaped every data access has to -go through a fixup stage to get a real memory pointer. This is done -by taking the index, multiplying it by the type size and then adding -it to the start address of the memory block. This sounds complex, but -in C it is a single array dereference. Because all items are aligned to -their size and indexes are stored as multiples of the size of the structure -the format is immediately portable to all possible architectures - BUT the -generated files are -NOT-. - -

-This scheme allows code like this to be written: - - void *Map = mmap(...); - Package *PkgList = (Package *)Map; - Header *Head = (Header *)Map; - char *Strings = (char *)Map; - cout << (Strings + PkgList[Head->HashTable[0]]->Name) << endl; - -

-Notice the lack of casting or multiplication. The net result is to return -the name of the first package in the first hash bucket, without error -checks. - -

-The generator uses allocation pools to group similarly sized structures in -large blocks to eliminate any alignment overhead. The generator also -assures that no structures overlap and all indexes are unique. Although -at first glance it may seem like there is the potential for two structures -to exist at the same point the generator never allows this to happen. -(See the discussion of free space pools) - - -Structures - - -Header -

-This is the first item in the file. - - struct Header - { - // Signature information - unsigned long Signature; - short MajorVersion; - short MinorVersion; - bool Dirty; - - // Size of structure values - unsigned short HeaderSz; - unsigned short PackageSz; - unsigned short PackageFileSz; - unsigned short VersionSz; - unsigned short DependencySz; - unsigned short ProvidesSz; - unsigned short VerFileSz; - - // Structure counts - unsigned long PackageCount; - unsigned long VersionCount; - unsigned long DependsCount; - unsigned long PackageFileCount; - - // Offsets - unsigned long FileList; // PackageFile - unsigned long StringList; // StringItem - unsigned long VerSysName; // StringTable - unsigned long Architecture; // StringTable - unsigned long MaxVerFileSize; - - // Allocation pools - struct - { - unsigned long ItemSize; - unsigned long Start; - unsigned long Count; - } Pools[7]; - - // Package name lookup - unsigned long HashTable[2*1024]; // Package - }; - - -Signature -This must contain the hex value 0x98FE76DC which is designed to verify -that the system loading the image has the same byte order and byte size as -the system saving the image - -MajorVersion -MinorVersion -These contain the version of the cache file, currently 0.2. - -Dirty -Dirty is true if the cache file was opened for reading, the client expects -to have written things to it and have not fully synced it. The file should -be erased and rebuilt if it is true. - -HeaderSz -PackageSz -PackageFileSz -VersionSz -DependencySz -VerFileSz -ProvidesSz -*Sz contains the sizeof() that particular structure. It is used as an -extra consistency check on the structure of the file. - -If any of the size values do not exactly match what the client expects then -the client should refuse the load the file. - -PackageCount -VersionCount -DependsCount -PackageFileCount -These indicate the number of each structure contained in the cache. -PackageCount is especially useful for generating user state structures. -See Package::Id for more info. - -VerSysName -String representing the version system used for this cache - -Architecture -Architecture the cache was built against. - -MaxVerFileSize -The maximum size of a raw entry from the original Package file -(i.e. VerFile::Size) is stored here. - -FileList -This contains the index of the first PackageFile structure. The PackageFile -structures are singly linked lists that represent all package files that -have been merged into the cache. - -StringList -This contains a list of all the unique strings (string item type strings) in -the cache. The parser reads this list into memory so it can match strings -against it. - -Pools -The Pool structures manage the allocation pools that the generator uses. -Start indicates the first byte of the pool, Count is the number of objects -remaining in the pool and ItemSize is the structure size (alignment factor) -of the pool. An ItemSize of 0 indicates the pool is empty. There should be -the same number of pools as there are structure types. The generator -stores this information so future additions can make use of any unused pool -blocks. - -HashTable -HashTable is a hash table that provides indexing for all of the packages. -Each package name is inserted into the hash table using the following has -function: - - unsigned long Hash(string Str) - { - unsigned long Hash = 0; - for (const char *I = Str.begin(); I != Str.end(); I++) - Hash += *I * ((Str.end() - I + 1)); - return Hash % _count(Head.HashTable); - } - -

-By iterating over each entry in the hash table it is possible to iterate over -the entire list of packages. Hash Collisions are handled with a singly linked -list of packages based at the hash item. The linked list contains only -packages that match the hashing function. - - - - - -Package -

-This contains information for a single unique package. There can be any -number of versions of a given package. Package exists in a singly -linked list of package records starting at the hash index of the name in -the Header->HashTable. - - struct Pacakge - { - // Pointers - unsigned long Name; // Stringtable - unsigned long VersionList; // Version - unsigned long CurrentVer; // Version - unsigned long Section; // StringTable (StringItem) - - // Linked lists - unsigned long NextPackage; // Package - unsigned long RevDepends; // Dependency - unsigned long ProvidesList; // Provides - - // Install/Remove/Purge etc - unsigned char SelectedState; // What - unsigned char InstState; // Flags - unsigned char CurrentState; // State - - // Unique ID for this pkg - unsigned short ID; - unsigned long Flags; - }; - - - -Name -Name of the package. - -VersionList -Base of a singly linked list of version structures. Each structure -represents a unique version of the package. The version structures -contain links into PackageFile and the original text file as well as -detailed information about the size and dependencies of the specific -package. In this way multiple versions of a package can be cleanly handled -by the system. Furthermore, this linked list is guaranteed to be sorted -from Highest version to lowest version with no duplicate entries. - -CurrentVer -CurrentVer is an index to the installed version, either can be -0. - -Section -This indicates the deduced section. It should be "Unknown" or the section -of the last parsed item. - -NextPackage -Next link in this hash item. This linked list is based at Header.HashTable -and contains only packages with the same hash value. - -RevDepends -Reverse Depends is a linked list of all dependencies linked to this package. - -ProvidesList -This is a linked list of all provides for this package name. - -SelectedState -InstState -CurrentState -These correspond to the 3 items in the Status field found in the status -file. See the section on defines for the possible values. -

-SelectedState is the state that the user wishes the package to be -in. -

-InstState is the installation state of the package. This normally -should be OK, but if the installation had an accident it may be otherwise. -

-CurrentState indicates if the package is installed, partially installed or -not installed. - -ID -ID is a value from 0 to Header->PackageCount. It is a unique value assigned -by the generator. This allows clients to create an array of size PackageCount -and use it to store state information for the package map. For instance the -status file emitter uses this to track which packages have been emitted -already. - -Flags -Flags are some useful indicators of the package's state. - - - - - - -PackageFile -

-This contains information for a single package file. Package files are -referenced by Version structures. This is a singly linked list based from -Header.FileList - - struct PackageFile - { - // Names - unsigned long FileName; // Stringtable - unsigned long Archive; // Stringtable - unsigned long Component; // Stringtable - unsigned long Version; // Stringtable - unsigned long Origin; // Stringtable - unsigned long Label; // Stringtable - unsigned long Architecture; // Stringtable - unsigned long Site; // Stringtable - unsigned long IndexType; // Stringtable - unsigned long Size; - - // Linked list - unsigned long NextFile; // PackageFile - unsigned short ID; - unsigned long Flags; - time_t mtime; // Modification time - }; - - - -FileName -Refers the the physical disk file that this PacakgeFile represents. - -Archive -Component -Version -Origin -Label -Architecture -NotAutomatic -This is the release information. Please see the files document for a -description of what the release information means. - -Site -The site the index file was fetched from. - -IndexType -A string indicating what sort of index file this is. - -Size -Size is provided as a simple check to ensure that the package file has not -been altered. - -ID -See Package::ID. - -Flags -Provides some flags for the PackageFile, see the section on defines. - -mtime -Modification time for the file at time of cache generation. - - - - - - -Version -

-This contains the information for a single version of a package. This is a -single linked list based from Package.Versionlist. - -

-The version list is always sorted from highest version to lowest version by -the generator. Also there may not be any duplicate entries in the list (same -VerStr). - - - struct Version - { - unsigned long VerStr; // Stringtable - unsigned long Section; // StringTable (StringItem) - unsigned long Arch; // StringTable - - // Lists - unsigned long FileList; // VerFile - unsigned long NextVer; // Version - unsigned long DependsList; // Dependency - unsigned long ParentPkg; // Package - unsigned long ProvidesList; // Provides - - unsigned long Size; - unsigned long InstalledSize; - unsigned long Hash; - unsigned short ID; - unsigned char Priority; - }; - - - -VerStr -This is the complete version string. - -FileList -References the all the PackageFile's that this version came out of. FileList -can be used to determine what distribution(s) the Version applies to. If -FileList is 0 then this is a blank version. The structure should also have -a 0 in all other fields excluding VerStr and Possibly NextVer. - -Section -This string indicates which section it is part of. The string should be -contained in the StringItem list. - -Arch -Architecture the package was compiled for. - -NextVer -Next step in the linked list. - -DependsList -This is the base of the dependency list. - -ParentPkg -This links the version to the owning package, allowing reverse dependencies -to determine the package. - -ProvidesList -Head of the linked list of Provides::NextPkgProv, forward provides. - -Size -InstalledSize -The archive size for this version. For Debian this is the size of the .deb -file. Installed size is the uncompressed size for this version - -Hash -This is a characteristic value representing this package. No two packages -in existence should have the same VerStr and Hash with different contents. - -ID -See Package::ID. - -Priority -This is the parsed priority value of the package. - - - - - -Dependency -

-Dependency contains the information for a single dependency record. The records -are split up like this to ease processing by the client. The base of list -linked list is Version.DependsList. All forms of dependencies are recorded -here including Conflicts, Breaks, Suggests and Recommends. - -

-Multiple depends on the same package must be grouped together in -the Dependency lists. Clients should assume this is always true. - - - struct Dependency - { - unsigned long Version; // Stringtable - unsigned long Package; // Package - unsigned long NextDepends; // Dependency - unsigned long NextRevDepends; // Reverse dependency linking - unsigned long ParentVer; // Upwards parent version link - - // Specific types of depends - unsigned char Type; - unsigned char CompareOp; - unsigned short ID; - }; - - -Version -The string form of the version that the dependency is applied against. - -Package -The index of the package file this depends applies to. If the package file -does not already exist when the dependency is inserted a blank one (no -version records) should be created. - -NextDepends -Linked list based off a Version structure of all the dependencies in that -version. - -NextRevDepends -Reverse dependency linking, based off a Package structure. This linked list -is a list of all packages that have a depends line for a given package. - -ParentVer -Parent version linking, allows the reverse dependency list to link -back to the version and package that the dependency are for. - -Type -Describes weather it is depends, predepends, recommends, suggests, etc. - -CompareOp -Describes the comparison operator specified on the depends line. If the high -bit is set then it is a logical or with the previous record. - -ID -See Package::ID. - - - - - - -Provides -

-Provides handles virtual packages. When a Provides: line is encountered -a new provides record is added associating the package with a virtual -package name. The provides structures are linked off the package structures. -This simplifies the analysis of dependencies and other aspects A provides -refers to a specific version of a specific package, not all versions need to -provide that provides. - -

-There is a linked list of provided package names started from each -version that provides packages. This is the forwards provides mechanism. - - struct Provides - { - unsigned long ParentPkg; // Package - unsigned long Version; // Version - unsigned long ProvideVersion; // Stringtable - unsigned long NextProvides; // Provides - unsigned long NextPkgProv; // Provides - }; - - -ParentPkg -The index of the package that head of this linked list is in. ParentPkg->Name -is the name of the provides. - -Version -The index of the version this provide line applies to. - -ProvideVersion -Each provides can specify a version in the provides line. This version allows -dependencies to depend on specific versions of a Provides, as well as allowing -Provides to override existing packages. This is experimental. - -NextProvides -Next link in the singly linked list of provides (based off package) - -NextPkgProv -Next link in the singly linked list of provides for 'Version'. - - - - - - -VerFile -

-VerFile associates a version with a PackageFile, this allows a full -description of all Versions in all files (and hence all sources) under -consideration. - - - struct pkgCache::VerFile - { - unsigned long File; // PackageFile - unsigned long NextFile; // PkgVerFile - unsigned long Offset; - unsigned short Size; - } - - -File -The index of the package file that this version was found in. - -NextFile -The next step in the linked list. - -Offset -Size -These describe the exact position in the package file for the section from -this version. - - - - - -StringItem -

-StringItem is used for generating single instances of strings. Some things -like Section Name are are useful to have as unique tags. It is part of -a linked list based at Header::StringList. - - struct StringItem - { - unsigned long String; // Stringtable - unsigned long NextItem; // StringItem - }; - - -String -The string this refers to. - -NextItem -Next link in the chain. - - - - -StringTable -

-All strings are simply inlined any place in the file that is natural for the -writer. The client should make no assumptions about the positioning of -strings. All stringtable values point to a byte offset from the start of the -file that a null terminated string will begin. - - - -Defines -

-Several structures use variables to indicate things. Here is a list of all -of them. - -Definitions for Dependency::Type -

- -#define pkgDEP_Depends 1 -#define pkgDEP_PreDepends 2 -#define pkgDEP_Suggests 3 -#define pkgDEP_Recommends 4 -#define pkgDEP_Conflicts 5 -#define pkgDEP_Replaces 6 -#define pkgDEP_Breaks 8 - - - -Definitions for Dependency::CompareOp -

- -#define pkgOP_OR 0x10 -#define pkgOP_LESSEQ 0x1 -#define pkgOP_GREATEREQ 0x2 -#define pkgOP_LESS 0x3 -#define pkgOP_GREATER 0x4 -#define pkgOP_EQUALS 0x5 - -The lower 4 bits are used to indicate what operator is being specified and -the upper 4 bits are flags. pkgOP_OR indicates that the next package is -or'd with the current package. - - -Definitions for Package::SelectedState -

- -#define pkgSTATE_Unkown 0 -#define pkgSTATE_Install 1 -#define pkgSTATE_Hold 2 -#define pkgSTATE_DeInstall 3 -#define pkgSTATE_Purge 4 - - - -Definitions for Package::InstState -

- -#define pkgSTATE_Ok 0 -#define pkgSTATE_ReInstReq 1 -#define pkgSTATE_Hold 2 -#define pkgSTATE_HoldReInstReq 3 - - - -Definitions for Package::CurrentState -

- -#define pkgSTATE_NotInstalled 0 -#define pkgSTATE_UnPacked 1 -#define pkgSTATE_HalfConfigured 2 -#define pkgSTATE_UnInstalled 3 -#define pkgSTATE_HalfInstalled 4 -#define pkgSTATE_ConfigFiles 5 -#define pkgSTATE_Installed 6 -#define pkgSTATE_TriggersAwaited 7 -#define pkgSTATE_TriggersPending 8 - - - -Definitions for Package::Flags -

- -#define pkgFLAG_Auto (1 << 0) -#define pkgFLAG_New (1 << 1) -#define pkgFLAG_Obsolete (1 << 2) -#define pkgFLAG_Essential (1 << 3) -#define pkgFLAG_ImmediateConf (1 << 4) - - - -Definitions for Version::Priority -

-Zero is used for unparsable or absent Priority fields. - -#define pkgPRIO_Important 1 -#define pkgPRIO_Required 2 -#define pkgPRIO_Standard 3 -#define pkgPRIO_Optional 4 -#define pkgPRIO_Extra 5 - - - -Definitions for PackageFile::Flags -

- -#define pkgFLAG_NotSource (1 << 0) -#define pkgFLAG_NotAutomatic (1 << 1) - - - - - -Notes on the Generator - - -

-The pkgCache::MergePackageFile function is currently the only generator of -the cache file. It implements a conversion from the normal textual package -file into the cache file. - -

-The generator assumes any package declaration with a -Status: line is a 'Status of the package' type of package declaration. -A Package with a Target-Version field should also really have a status field. -The processing of a Target-Version field can create a place-holder Version -structure that is empty to refer to the specified version (See Version -for info on what a empty Version looks like). The Target-Version syntax -allows the specification of a specific version and a target distribution. - -

-Different section names on different versions is supported, but I -do not expect to use it. To simplify the GUI it will merely use the section -in the Package structure. This should be okay as I hope sections do not change -much. - -

-The generator goes through a number of post processing steps after producing -a disk file. It sorts all of the version lists to be in descending order -and then generates the reverse dependency lists for all of the packages. -ID numbers and count values are also generated in the post processing step. - -

-It is possible to extend many of the structures in the cache with extra data. -This is done by using the ID member. ID will be a unique number from 0 to -Header->??Count. For example - -struct MyPkgData; -MyPkgData *Data = new MyPkgData[Header->PackageCount]; -Data[Package->ID]->Item = 0; - -This provides a one way reference between package structures and user data. To -get a two way reference would require a member inside the MyPkgData structure. - -

-The generators use of free space pools tend to make the package file quite -large, and quite full of blank space. This could be fixed with sparse files. - - - -Future Directions - - -

-Some good directions to take the cache file is into a cache directory that -contains many associated caches that cache other important bits of -information. (/var/cache/apt, FHS2) - -

-Caching of the info/*.list is an excellent place to start, by generating all -the list files into a tree structure and reverse linking them to the package -structures in the main cache file major speed gains in dpkg might be achieved. - - - - -- cgit v1.2.3 From 52c41485092d6da77d2848a955609f22da50372c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 4 May 2010 12:43:08 +0200 Subject: * apt-pkg/pkgcache.h: - enhance the Groups ABI by providing a ID as the other structs does - check also the size of the Group struct then checking for the others --- apt-pkg/pkgcache.cc | 3 +++ apt-pkg/pkgcache.h | 10 +++++++--- apt-pkg/pkgcachegen.cc | 3 +-- debian/changelog | 3 +++ 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 1bbd74bd9..ba3c5cbf8 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -55,6 +55,7 @@ pkgCache::Header::Header() Dirty = false; HeaderSz = sizeof(pkgCache::Header); + GroupSz = sizeof(pkgCache::Group); PackageSz = sizeof(pkgCache::Package); PackageFileSz = sizeof(pkgCache::PackageFile); VersionSz = sizeof(pkgCache::Version); @@ -64,6 +65,7 @@ pkgCache::Header::Header() VerFileSz = sizeof(pkgCache::VerFile); DescFileSz = sizeof(pkgCache::DescFile); + GroupCount = 0; PackageCount = 0; VersionCount = 0; DescriptionCount = 0; @@ -90,6 +92,7 @@ pkgCache::Header::Header() bool pkgCache::Header::CheckSizes(Header &Against) const { if (HeaderSz == Against.HeaderSz && + GroupSz == Against.GroupSz && PackageSz == Against.PackageSz && PackageFileSz == Against.PackageFileSz && VersionSz == Against.VersionSz && diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index a2e63ff03..643f240b0 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -244,6 +244,7 @@ struct pkgCache::Header If any of the size values do not exactly match what the client expects then the client should refuse the load the file. */ unsigned short HeaderSz; + unsigned short GroupSz; unsigned short PackageSz; unsigned short PackageFileSz; unsigned short VersionSz; @@ -329,12 +330,15 @@ struct pkgCache::Group map_ptrloc Name; // StringItem // Linked List - /** Link to the first package which belongs to the group */ + /** \brief Link to the first package which belongs to the group */ map_ptrloc FirstPackage; // Package - /** Link to the last package which belongs to the group */ + /** \brief Link to the last package which belongs to the group */ map_ptrloc LastPackage; // Package - /** Link to the next Group */ + /** \brief Link to the next Group */ map_ptrloc Next; // Group + /** \brief unique sequel ID */ + unsigned int ID; + }; /*}}}*/ // Package structure /*{{{*/ diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 114c9d5ed..d96d3370f 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -356,8 +356,7 @@ bool pkgCacheGenerator::NewGroup(pkgCache::GrpIterator &Grp, const string &Name) Grp->Next = Cache.HeaderP->GrpHashTable[Hash]; Cache.HeaderP->GrpHashTable[Hash] = Group; - Cache.HeaderP->GroupCount++; - + Grp->ID = Cache.HeaderP->GroupCount++; return true; } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 76fc2550b..5885f9246 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,9 @@ apt (0.7.26~exp4) experimental; urgency=low use, extended_states and uri schemes. * doc/cache.sgml: - drop the file in favor of inplace documentation with doxygen + * apt-pkg/pkgcache.h: + - enhance the Groups ABI by providing a ID as the other structs does + - check also the size of the Group struct then checking for the others [ Jari Aalto ] * cmdline/apt-get.cc: -- cgit v1.2.3 From 173ae2a460b905b18911f42964fd38dbac2959d6 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 4 May 2010 12:54:52 +0200 Subject: use GroupCount for package names in stats and add a package struct line --- cmdline/apt-cache.cc | 4 +++- debian/changelog | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index b0034bf6d..b981e2fa7 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -242,7 +242,9 @@ bool DumpPackage(CommandLine &CmdL) bool Stats(CommandLine &Cmd) { pkgCache &Cache = *GCache; - cout << _("Total package names: ") << Cache.Head().PackageCount << " (" << + cout << _("Total package names: ") << Cache.Head().GroupCount << " (" << + SizeToStr(Cache.Head().GroupCount*Cache.Head().GroupSz) << ')' << endl + << _("Total package structures: ") << Cache.Head().PackageCount << " (" << SizeToStr(Cache.Head().PackageCount*Cache.Head().PackageSz) << ')' << endl; int Normal = 0; diff --git a/debian/changelog b/debian/changelog index 5885f9246..3fd3f0a33 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,7 @@ apt (0.7.26~exp4) experimental; urgency=low * cmdline/apt-cache.cc: - align Installed and Candidate Version in policy so they can be compared easier, thanks Ralf Gesellensetter for the pointer! (Closes: #578657) + - use GroupCount for package names in stats and add a package struct line * doc/apt.ent: - Add a note about APT_CONFIG in the -c description (Closes: #578267) * doc/po/de.po: -- cgit v1.2.3 From 61a07c57a8898f3888245493032784cd1c82e956 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 4 May 2010 13:34:34 +0200 Subject: fix compiler warning: reaching end of non-void method --- apt-pkg/acquire-item.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 1f253bb81..c035b9163 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1685,5 +1685,6 @@ string pkgAcqFile::Custom600Headers() { if (IsIndexFile) return "\nIndex-File: true"; + return ""; } /*}}}*/ -- cgit v1.2.3 From b81dbe40d48ce6fcf76a4df1eab6f9b0905962e2 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 4 May 2010 13:45:36 +0200 Subject: make update-po --- doc/po/apt-doc.pot | 480 +++++++++++++++------------ doc/po/de.po | 565 ++++++++++++++++++------------- doc/po/es.po | 558 ++++++++++++++++++------------- doc/po/fr.po | 960 ++++++++++++++++++++++++++--------------------------- doc/po/it.po | 482 +++++++++++++++------------ doc/po/ja.po | 559 ++++++++++++++++++------------- doc/po/pl.po | 507 ++++++++++++++++------------ doc/po/pt.po | 559 ++++++++++++++++++------------- doc/po/pt_BR.po | 505 +++++++++++++++------------- po/apt-all.pot | 714 ++++++++++++++++++++------------------- po/ar.po | 817 ++++++++++++++++++++++++--------------------- po/ast.po | 831 +++++++++++++++++++++++++--------------------- po/bg.po | 838 +++++++++++++++++++++++++--------------------- po/bs.po | 816 ++++++++++++++++++++++++--------------------- po/ca.po | 830 ++++++++++++++++++++++++--------------------- po/cs.po | 829 ++++++++++++++++++++++++--------------------- po/cy.po | 832 +++++++++++++++++++++++++--------------------- po/da.po | 837 +++++++++++++++++++++++++--------------------- po/de.po | 834 +++++++++++++++++++++++++--------------------- po/dz.po | 827 ++++++++++++++++++++++++--------------------- po/el.po | 834 +++++++++++++++++++++++++--------------------- po/en_GB.po | 830 ++++++++++++++++++++++++--------------------- po/es.po | 835 +++++++++++++++++++++++++--------------------- po/eu.po | 830 ++++++++++++++++++++++++--------------------- po/fi.po | 831 +++++++++++++++++++++++++--------------------- po/fr.po | 846 +++++++++++++++++++++++++--------------------- po/gl.po | 828 ++++++++++++++++++++++++--------------------- po/hu.po | 824 ++++++++++++++++++++++++--------------------- po/it.po | 835 +++++++++++++++++++++++++--------------------- po/ja.po | 830 ++++++++++++++++++++++++--------------------- po/km.po | 825 ++++++++++++++++++++++++--------------------- po/ko.po | 833 +++++++++++++++++++++++++--------------------- po/ku.po | 826 ++++++++++++++++++++++++--------------------- po/lt.po | 828 ++++++++++++++++++++++++--------------------- po/mr.po | 826 ++++++++++++++++++++++++--------------------- po/nb.po | 833 +++++++++++++++++++++++++--------------------- po/ne.po | 825 ++++++++++++++++++++++++--------------------- po/nl.po | 835 +++++++++++++++++++++++++--------------------- po/nn.po | 827 ++++++++++++++++++++++++--------------------- po/pl.po | 835 +++++++++++++++++++++++++--------------------- po/pt.po | 831 +++++++++++++++++++++++++--------------------- po/pt_BR.po | 835 +++++++++++++++++++++++++--------------------- po/ro.po | 839 +++++++++++++++++++++++++--------------------- po/ru.po | 840 +++++++++++++++++++++++++--------------------- po/sk.po | 835 +++++++++++++++++++++++++--------------------- po/sl.po | 826 ++++++++++++++++++++++++--------------------- po/sv.po | 829 ++++++++++++++++++++++++--------------------- po/th.po | 826 ++++++++++++++++++++++++--------------------- po/tl.po | 827 ++++++++++++++++++++++++--------------------- po/uk.po | 830 ++++++++++++++++++++++++--------------------- po/vi.po | 829 ++++++++++++++++++++++++--------------------- po/zh_CN.po | 828 ++++++++++++++++++++++++--------------------- po/zh_TW.po | 826 ++++++++++++++++++++++++--------------------- 53 files changed, 22942 insertions(+), 18655 deletions(-) diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 85146d4f2..a95cc87e2 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2010-03-19 11:14+0100\n" +"POT-Creation-Date: 2010-05-04 13:41+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -588,7 +588,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:268 +#: apt.ent:270 #, no-wrap msgid "" " \n" @@ -597,14 +597,18 @@ msgid "" " Configuration File; Specify a configuration file to " "use. \n" " The program will read the default configuration file and then this \n" -" configuration file. See &apt-conf; for syntax information. \n" +" configuration file. If configuration settings need to be set before " +"the\n" +" default configuration files are parsed specify a file with the " +"APT_CONFIG\n" +" environment variable. See &apt-conf; for syntax information.\n" " \n" " \n" " \n" msgstr "" #. type: Plain text -#: apt.ent:280 +#: apt.ent:282 #, no-wrap msgid "" " \n" @@ -624,7 +628,7 @@ msgid "" msgstr "" #. type: Plain text -#: apt.ent:291 +#: apt.ent:293 #, no-wrap msgid "" " diff --git a/doc/examples/configure-index b/doc/examples/configure-index index d168417d8..487c09acb 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -294,9 +294,8 @@ Dir "/" State "var/lib/apt/" { Lists "lists/"; - xstatus "xstatus"; - userstatus "status.user"; status "/var/lib/dpkg/status"; + extended_states "extended_states"; cdroms "cdroms.list"; }; -- cgit v1.2.3 From 8378913047031bd1433a5b17e9affc1e055a150e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 28 May 2010 19:04:53 +0200 Subject: * apt-pkg/depcache.cc: - do the autoremove mark process also for required packages to handle these illegally depending on lower priority packages (Closes: #583517) --- apt-pkg/depcache.cc | 7 +++++-- debian/changelog | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index bdb89b5ce..c29114a65 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1638,8 +1638,11 @@ bool pkgDepCache::MarkRequired(InRootSetFunc &userFunc) { if(!(PkgState[p->ID].Flags & Flag::Auto) || (p->Flags & Flag::Essential) || - userFunc.InRootSet(p)) - + userFunc.InRootSet(p) || + // be nice even then a required package violates the policy (#583517) + // and do the full mark process also for required packages + (p.CurrentVer().end() != true && + p.CurrentVer()->Priority == pkgCache::State::Required)) { // the package is installed (and set to keep) if(PkgState[p->ID].Keep() && !p.CurrentVer().end()) diff --git a/debian/changelog b/debian/changelog index 028452751..ce7ff48b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,11 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - forward manual-installed bit on package disappearance * apt-pkg/deb/debsystem.cc: - add better config item for extended_states file + * apt-pkg/depcache.cc: + - do the autoremove mark process also for required packages to handle + these illegally depending on lower priority packages (Closes: #583517) - -- David Kalnischkies Thu, 27 May 2010 17:34:51 +0200 + -- David Kalnischkies Fri, 28 May 2010 19:03:30 +0200 apt (0.7.26~exp5) experimental; urgency=low -- cgit v1.2.3 From 392a882ad8a299d55889e9c0fa581a266d6dd2c9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 28 May 2010 19:30:19 +0200 Subject: try harder to find the other pseudo versions for autoremove multiarch --- apt-pkg/depcache.cc | 7 ++----- debian/changelog | 1 + 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index c29114a65..afec7ba83 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1719,10 +1719,6 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, // If the version belongs to a Multi-Arch all package // we will mark all others in this Group with this version also - // Beware: We compare versions here the lazy way: string comparision - // this is bad if multiple repositories provide different versions - // of the package with an identical version number - but even in this - // case the dependencies are likely the same. if (ver->MultiArch == pkgCache::Version::All && strcmp(ver.Arch(true), "all") == 0) { @@ -1734,7 +1730,8 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, for (VerIterator V = P.VersionList(); V.end() != true; ++V) { - if (strcmp(VerStr, V.VerStr()) != 0) + if (ver->Hash != V->Hash || + strcmp(VerStr, V.VerStr()) != 0) continue; MarkPackage(P, V, follow_recommends, follow_suggests); break; diff --git a/debian/changelog b/debian/changelog index ce7ff48b7..c1ee360f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low * apt-pkg/depcache.cc: - do the autoremove mark process also for required packages to handle these illegally depending on lower priority packages (Closes: #583517) + - try harder to find the other pseudo versions for autoremove multiarch -- David Kalnischkies Fri, 28 May 2010 19:03:30 +0200 -- cgit v1.2.3 From 3152f4aa4a97ad06ef1073aabe137f999f787ee1 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 28 May 2010 23:11:36 +0200 Subject: * apt-pkg/aptconfiguration.cc: - remove duplicate architectures in getArchitectures() --- apt-pkg/aptconfiguration.cc | 15 ++++++++- debian/changelog | 2 ++ test/libapt/getarchitectures_test.cc | 61 ++++++++++++++++++++++++++++++++++++ test/libapt/makefile | 5 +++ 4 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 test/libapt/getarchitectures_test.cc diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 2acf8dd9f..0c050d9dc 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -327,11 +327,24 @@ std::vector const Configuration::getArchitectures(bool const &Cache if (likely(Cached == true) && archs.empty() == false) return archs; - string const arch = _config->Find("APT::Architecture"); archs = _config->FindVector("APT::Architectures"); + string const arch = _config->Find("APT::Architecture"); + if (unlikely(arch.empty() == true)) + return archs; + if (archs.empty() == true || std::find(archs.begin(), archs.end(), arch) == archs.end()) archs.push_back(arch); + + // erase duplicates and empty strings + for (std::vector::reverse_iterator a = archs.rbegin(); + a != archs.rend(); ++a) { + if (a->empty() == true || std::find(a + 1, archs.rend(), *a) != archs.rend()) + archs.erase(a.base()-1); + if (a == archs.rend()) + break; + } + return archs; } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index c1ee360f0..66c41ef5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - do the autoremove mark process also for required packages to handle these illegally depending on lower priority packages (Closes: #583517) - try harder to find the other pseudo versions for autoremove multiarch + * apt-pkg/aptconfiguration.cc: + - remove duplicate architectures in getArchitectures() -- David Kalnischkies Fri, 28 May 2010 19:03:30 +0200 diff --git a/test/libapt/getarchitectures_test.cc b/test/libapt/getarchitectures_test.cc new file mode 100644 index 000000000..1500caeed --- /dev/null +++ b/test/libapt/getarchitectures_test.cc @@ -0,0 +1,61 @@ +#include +#include + +#include "assert.h" +#include +#include + +#include + +// simple helper to quickly output a vector of strings +void dumpVector(std::vector vec) { + for (std::vector::const_iterator v = vec.begin(); + v != vec.end(); v++) + std::cout << *v << std::endl; +} + +int main(int argc,char *argv[]) +{ + std::vector vec; + + _config->Set("APT::Architectures::1", "i386"); + _config->Set("APT::Architectures::2", "amd64"); + vec = APT::Configuration::getArchitectures(false); + equals(vec.size(), 2); + equals(vec[0], "i386"); + equals(vec[1], "amd64"); + + _config->Set("APT::Architecture", "i386"); + vec = APT::Configuration::getArchitectures(false); + equals(vec.size(), 2); + equals(vec[0], "i386"); + equals(vec[1], "amd64"); + + _config->Set("APT::Architectures::2", ""); + vec = APT::Configuration::getArchitectures(false); + equals(vec.size(), 1); + equals(vec[0], "i386"); + + _config->Set("APT::Architecture", "armel"); + vec = APT::Configuration::getArchitectures(false); + equals(vec.size(), 2); + equals(vec[0], "i386"); + equals(vec[1], "armel"); + + _config->Set("APT::Architectures::2", "amd64"); + _config->Set("APT::Architectures::3", "i386"); + _config->Set("APT::Architectures::4", "armel"); + _config->Set("APT::Architectures::5", "i386"); + _config->Set("APT::Architectures::6", "amd64"); + _config->Set("APT::Architectures::7", "armel"); + _config->Set("APT::Architectures::8", "armel"); + _config->Set("APT::Architectures::9", "amd64"); + _config->Set("APT::Architectures::10", "amd64"); + vec = APT::Configuration::getArchitectures(false); + equals(vec.size(), 3); + equals(vec[0], "i386"); + equals(vec[1], "amd64"); + equals(vec[2], "armel"); + + return 0; +} diff --git a/test/libapt/makefile b/test/libapt/makefile index 98bdb3348..ee3401b35 100644 --- a/test/libapt/makefile +++ b/test/libapt/makefile @@ -12,6 +12,11 @@ SLIBS = -lapt-pkg SOURCE = getlanguages_test.cc include $(PROGRAM_H) +PROGRAM = getArchitectures${BASENAME} +SLIBS = -lapt-pkg +SOURCE = getarchitectures_test.cc +include $(PROGRAM_H) + # Program for testing ParseDepends PROGRAM = ParseDepends${BASENAME} SLIBS = -lapt-pkg -- cgit v1.2.3 From 8fa7eefb8a320e8fa4a26c4718fa606d4d27a56f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 28 May 2010 23:40:08 +0200 Subject: create the bin-test directory automatic in the runner --- test/libapt/run-tests.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/test/libapt/run-tests.sh b/test/libapt/run-tests.sh index f9df1af5f..cb7769e4a 100755 --- a/test/libapt/run-tests.sh +++ b/test/libapt/run-tests.sh @@ -2,6 +2,7 @@ set -e echo "Compiling the tests ..." +test -d '../../build/obj/test/libapt/' || mkdir -p '../../build/obj/test/libapt/' make echo "Running all testcases ..." LDPATH=$(pwd)/../../build/bin -- cgit v1.2.3 From e1430400bf012ab7e29b00c78796a14ce9f97107 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 29 May 2010 12:04:51 +0200 Subject: * apt-pkg/indexrecords.{cc,h}: - add a constant Exists check for MetaKeys * apt-pkg/acquire-item.cc: - do not try PDiff if it is not listed in the Meta file --- apt-pkg/acquire-item.cc | 13 ++++++++----- apt-pkg/indexrecords.cc | 5 +++++ apt-pkg/indexrecords.h | 2 ++ debian/changelog | 6 +++++- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index c035b9163..9e29f8189 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1105,13 +1105,16 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify) /*{{{*/ return; } } - - // Queue Packages file (either diff or full packages files, depending - // on the users option) - if(_config->FindB("Acquire::PDiffs",true) == true) + + /* Queue Packages file (either diff or full packages files, depending + on the users option) - we also check if the PDiff Index file is listed + in the Meta-Index file. Ideal would be if pkgAcqDiffIndex would test this + instead, but passing the required info to it is to much hassle */ + if(_config->FindB("Acquire::PDiffs",true) == true && (verify == false || + MetaIndexParser->Exists(string((*Target)->MetaKey).append(".diff/Index")) == true)) new pkgAcqDiffIndex(Owner, (*Target)->URI, (*Target)->Description, (*Target)->ShortDesc, ExpectedIndexHash); - else + else new pkgAcqIndex(Owner, (*Target)->URI, (*Target)->Description, (*Target)->ShortDesc, ExpectedIndexHash); } diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc index 1fc27b1a1..9a9600531 100644 --- a/apt-pkg/indexrecords.cc +++ b/apt-pkg/indexrecords.cc @@ -31,6 +31,11 @@ const indexRecords::checkSum *indexRecords::Lookup(const string MetaKey) return Entries[MetaKey]; } +bool indexRecords::Exists(string const &MetaKey) const +{ + return Entries.count(MetaKey) == 1; +} + bool indexRecords::Load(const string Filename) /*{{{*/ { FileFd Fd(Filename, FileFd::ReadOnly); diff --git a/apt-pkg/indexrecords.h b/apt-pkg/indexrecords.h index 468d2bd0f..2e3103b70 100644 --- a/apt-pkg/indexrecords.h +++ b/apt-pkg/indexrecords.h @@ -34,6 +34,8 @@ class indexRecords // Lookup function virtual const checkSum *Lookup(const string MetaKey); + /** \brief tests if a checksum for this file is available */ + bool Exists(string const &MetaKey) const; std::vector MetaKeys(); virtual bool Load(string Filename); diff --git a/debian/changelog b/debian/changelog index 66c41ef5f..1fa254b0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,12 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - try harder to find the other pseudo versions for autoremove multiarch * apt-pkg/aptconfiguration.cc: - remove duplicate architectures in getArchitectures() + * apt-pkg/indexrecords.{cc,h}: + - add a constant Exists check for MetaKeys + * apt-pkg/acquire-item.cc: + - do not try PDiff if it is not listed in the Meta file - -- David Kalnischkies Fri, 28 May 2010 19:03:30 +0200 + -- David Kalnischkies Sat, 29 May 2010 12:03:20 +0200 apt (0.7.26~exp5) experimental; urgency=low -- cgit v1.2.3 From b3fdb998016beb8bf3d8bedb3ad6218f9050eece Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 29 May 2010 15:44:47 +0200 Subject: * apt-pkg/cacheiterator.h: - let pkgCache::Iterator inherent std::iterator --- apt-pkg/cacheiterators.h | 4 +++- debian/changelog | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index e2ca74683..3d58f7ec0 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -29,10 +29,12 @@ /*}}}*/ #ifndef PKGLIB_CACHEITERATORS_H #define PKGLIB_CACHEITERATORS_H +#include // abstract Iterator template /*{{{*/ /* This template provides the very basic iterator methods we need to have for doing some walk-over-the-cache magic */ -template class pkgCache::Iterator { +template class pkgCache::Iterator : + public std::iterator { protected: Str *S; pkgCache *Owner; diff --git a/debian/changelog b/debian/changelog index 1fa254b0d..839c8c800 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,8 +16,10 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - add a constant Exists check for MetaKeys * apt-pkg/acquire-item.cc: - do not try PDiff if it is not listed in the Meta file + * apt-pkg/cacheiterator.h: + - let pkgCache::Iterator inherent std::iterator - -- David Kalnischkies Sat, 29 May 2010 12:03:20 +0200 + -- David Kalnischkies Sat, 29 May 2010 15:39:07 +0200 apt (0.7.26~exp5) experimental; urgency=low -- cgit v1.2.3 From 461e4a5e0d30549e5b9758ce816027d92747f00d Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 29 May 2010 19:02:32 +0200 Subject: * apt-pkg/depcache.cc: - correct "Dangerous iterator usage." pointed out by cppcheck --- apt-pkg/depcache.cc | 6 +++--- debian/changelog | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index afec7ba83..6c73b9cfd 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -806,7 +806,7 @@ void pkgDepCache::Update(OpProgress *Prog) a bit we increase with a kill, but we should do something more clever… */ while(recheck.empty() == false) for (std::set::const_iterator p = recheck.begin(); - p != recheck.end(); ++p) { + p != recheck.end();) { if (Prog != 0 && Done%20 == 0) Prog->Progress(Done); PkgIterator P = PkgIterator(*Cache, Cache->PkgP + *p); @@ -814,7 +814,7 @@ void pkgDepCache::Update(OpProgress *Prog) ++killed; ++Done; } - recheck.erase(p); + recheck.erase(p++); } /* Okay, we have killed a great amount of pseudopackages - @@ -849,7 +849,7 @@ void pkgDepCache::Update(OpProgress *Prog) unsigned long const G = *g; recheck.erase(g); if (unlikely(ReInstallPseudoForGroup(G, recheck) == false)) - _error->Warning(_("Internal error, group '%s' has no installable pseudo package"), GrpIterator(*Cache, Cache->GrpP + *g).Name()); + _error->Warning(_("Internal error, group '%s' has no installable pseudo package"), GrpIterator(*Cache, Cache->GrpP + G).Name()); } } diff --git a/debian/changelog b/debian/changelog index 839c8c800..e8c1f9596 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,8 +18,10 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - do not try PDiff if it is not listed in the Meta file * apt-pkg/cacheiterator.h: - let pkgCache::Iterator inherent std::iterator + * apt-pkg/depcache.cc: + - correct "Dangerous iterator usage." pointed out by cppcheck - -- David Kalnischkies Sat, 29 May 2010 15:39:07 +0200 + -- David Kalnischkies Sat, 29 May 2010 19:02:12 +0200 apt (0.7.26~exp5) experimental; urgency=low -- cgit v1.2.3 From f5cd2dbfc493127b18d9ea2b0bb258b736b91cd4 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 29 May 2010 19:10:19 +0200 Subject: * ftparchive/writer.h: - add a virtual destructor to FTWScanner class (for cppcheck) --- debian/changelog | 4 +++- ftparchive/writer.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e8c1f9596..2755e7c5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,8 +20,10 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - let pkgCache::Iterator inherent std::iterator * apt-pkg/depcache.cc: - correct "Dangerous iterator usage." pointed out by cppcheck + * ftparchive/writer.h: + - add a virtual destructor to FTWScanner class (for cppcheck) - -- David Kalnischkies Sat, 29 May 2010 19:02:12 +0200 + -- David Kalnischkies Sat, 29 May 2010 19:09:05 +0200 apt (0.7.26~exp5) experimental; urgency=low diff --git a/ftparchive/writer.h b/ftparchive/writer.h index 3123a7f46..c08ddea85 100644 --- a/ftparchive/writer.h +++ b/ftparchive/writer.h @@ -72,6 +72,7 @@ class FTWScanner bool SetExts(string const &Vals); FTWScanner(string const &Arch = string()); + virtual ~FTWScanner(); }; class TranslationWriter -- cgit v1.2.3 From e1dbde8dd006ca0ed6b7a6c383af7bbc60014912 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 30 May 2010 07:57:32 +0200 Subject: * apt-pkg/packageset.h: - add a simple wrapper around std::set for packages with it --- apt-pkg/makefile | 3 ++- apt-pkg/packageset.h | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 2 ++ 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 apt-pkg/packageset.h diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 148ad581b..d4537859d 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -42,7 +42,8 @@ HEADERS+= algorithms.h depcache.h pkgcachegen.h cacheiterators.h \ acquire.h acquire-worker.h acquire-item.h acquire-method.h \ clean.h srcrecords.h cachefile.h versionmatch.h policy.h \ pkgsystem.h indexfile.h metaindex.h indexrecords.h vendor.h \ - vendorlist.h cdrom.h indexcopy.h aptconfiguration.h + vendorlist.h cdrom.h indexcopy.h aptconfiguration.h \ + packageset.h # Source code for the debian specific components # In theory the deb headers do not need to be exported.. diff --git a/apt-pkg/packageset.h b/apt-pkg/packageset.h new file mode 100644 index 000000000..d80536942 --- /dev/null +++ b/apt-pkg/packageset.h @@ -0,0 +1,53 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +/** \class APT::PackageSet + + Simple wrapper around a std::set to provide a similar interface to + a set of packages as to the complete set of all packages in the + pkgCache. +*/ + /*}}}*/ +#ifndef APT_PACKAGESET_H +#define APT_PACKAGESET_H +// Include Files /*{{{*/ +#include +#include + /*}}}*/ +namespace APT { +class PackageSet : public std::set { /*{{{*/ +public: /*{{{*/ + /** \brief smell like a pkgCache::PkgIterator */ + class const_iterator : public std::set::const_iterator { + public: + const_iterator(std::set::const_iterator x) : + std::set::const_iterator(x) {} + + inline const char *Name() const {return (*this)->Name(); } + inline std::string FullName(bool const &Pretty) const { return (*this)->FullName(Pretty); } + inline std::string FullName() const { return (*this)->FullName(); } + inline const char *Section() const {return (*this)->Section(); } + inline bool Purge() const {return (*this)->Purge(); } + inline const char *Arch() const {return (*this)->Arch(); } + inline pkgCache::GrpIterator Group() const { return (*this)->Group(); } + inline pkgCache::VerIterator VersionList() const { return (*this)->VersionList(); } + inline pkgCache::VerIterator CurrentVer() const { return (*this)->CurrentVer(); } + inline pkgCache::DepIterator RevDependsList() const { return (*this)->RevDependsList(); } + inline pkgCache::PrvIterator ProvidesList() const { return (*this)->ProvidesList(); } + inline pkgCache::PkgIterator::OkState State() const { return (*this)->State(); } + inline const char *CandVersion() const { return (*this)->CandVersion(); } + inline const char *CurVersion() const { return (*this)->CurVersion(); } + inline pkgCache *Cache() {return (*this)->Cache();}; + + friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, (*i)); } + + inline pkgCache::PkgIterator const * operator->() const { + return &**this; + }; + }; + // 103. set::iterator is required to be modifiable, but this allows modification of keys + typedef typename APT::PackageSet::const_iterator iterator; + /*}}}*/ +}; + /*}}}*/ +} +#endif diff --git a/debian/changelog b/debian/changelog index 2755e7c5f..6980e5fcf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - correct "Dangerous iterator usage." pointed out by cppcheck * ftparchive/writer.h: - add a virtual destructor to FTWScanner class (for cppcheck) + * apt-pkg/packageset.h: + - add a simple wrapper around std::set for packages with it -- David Kalnischkies Sat, 29 May 2010 19:09:05 +0200 -- cgit v1.2.3 From ffee1c2bed4accfe25b2ac9e9f0ab9a0ebae9b5b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 30 May 2010 23:12:41 +0200 Subject: move regex magic from apt-get to new FromRegEx method --- apt-pkg/cacheiterators.h | 2 +- apt-pkg/makefile | 2 +- apt-pkg/packageset.cc | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ apt-pkg/packageset.h | 24 ++++++++++++++++++- cmdline/apt-get.cc | 42 +++++++------------------------- debian/changelog | 1 + 6 files changed, 96 insertions(+), 37 deletions(-) create mode 100644 apt-pkg/packageset.cc diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 3d58f7ec0..ee852f594 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -66,7 +66,7 @@ template class pkgCache::Iterator : inline operator Str const *() const {return S == OwnerPointer() ? 0 : S;}; inline Str &operator *() {return *S;}; inline Str const &operator *() const {return *S;}; - inline pkgCache *Cache() {return Owner;}; + inline pkgCache *Cache() const {return Owner;}; // Mixed stuff inline void operator =(const Itr &B) {S = B.S; Owner = B.Owner;}; diff --git a/apt-pkg/makefile b/apt-pkg/makefile index d4537859d..968275c5c 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -35,7 +35,7 @@ SOURCE+= pkgcache.cc version.cc depcache.cc \ srcrecords.cc cachefile.cc versionmatch.cc policy.cc \ pkgsystem.cc indexfile.cc pkgcachegen.cc acquire-item.cc \ indexrecords.cc vendor.cc vendorlist.cc cdrom.cc indexcopy.cc \ - aptconfiguration.cc + aptconfiguration.cc packageset.cc HEADERS+= algorithms.h depcache.h pkgcachegen.h cacheiterators.h \ orderlist.h sourcelist.h packagemanager.h tagfile.h \ init.h pkgcache.h version.h progress.h pkgrecords.h \ diff --git a/apt-pkg/packageset.cc b/apt-pkg/packageset.cc new file mode 100644 index 000000000..f452bc052 --- /dev/null +++ b/apt-pkg/packageset.cc @@ -0,0 +1,62 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +/* ###################################################################### + + Simple wrapper around a std::set to provide a similar interface to + a set of packages as to the complete set of all packages in the + pkgCache. + + ##################################################################### */ + /*}}}*/ +// Include Files /*{{{*/ +#include +#include +#include + +#include + +#include + /*}}}*/ +namespace APT { +// FromRegEx - Return all packages in the cache matching a pattern /*{{{*/ +PackageSet PackageSet::FromRegEx(pkgCache &Cache, const char * const pattern, std::ostream &out) { + PackageSet pkgset; + + const char * I; + for (I = pattern; *I != 0; I++) + if (*I == '.' || *I == '?' || *I == '+' || *I == '*' || + *I == '|' || *I == '[' || *I == '^' || *I == '$') + break; + if (*I == 0) + return pkgset; + + regex_t Pattern; + int Res; + if ((Res = regcomp(&Pattern, pattern , REG_EXTENDED | REG_ICASE | REG_NOSUB)) != 0) { + char Error[300]; + regerror(Res, &Pattern, Error, sizeof(Error)); + _error->Error(_("Regex compilation error - %s"), Error); + return pkgset; + } + + for (pkgCache::GrpIterator Grp = Cache.GrpBegin(); Grp.end() == false; ++Grp) + { + if (regexec(&Pattern, Grp.Name(), 0, 0, 0) != 0) + continue; + pkgCache::PkgIterator Pkg = Grp.FindPkg("native"); + if (unlikely(Pkg.end() == true)) + // FIXME: Fallback to different architectures here? + continue; + + ioprintf(out, _("Note, selecting %s for regex '%s'\n"), + Pkg.Name(), pattern); + + pkgset.insert(Pkg); + } + + regfree(&Pattern); + + return pkgset; +} + /*}}}*/ +} diff --git a/apt-pkg/packageset.h b/apt-pkg/packageset.h index d80536942..cd1430a2a 100644 --- a/apt-pkg/packageset.h +++ b/apt-pkg/packageset.h @@ -10,7 +10,11 @@ #ifndef APT_PACKAGESET_H #define APT_PACKAGESET_H // Include Files /*{{{*/ +#include +#include +#include #include + #include /*}}}*/ namespace APT { @@ -22,6 +26,8 @@ public: /*{{{*/ const_iterator(std::set::const_iterator x) : std::set::const_iterator(x) {} + operator pkgCache::PkgIterator(void) { return **this; } + inline const char *Name() const {return (*this)->Name(); } inline std::string FullName(bool const &Pretty) const { return (*this)->FullName(Pretty); } inline std::string FullName() const { return (*this)->FullName(); } @@ -36,7 +42,8 @@ public: /*{{{*/ inline pkgCache::PkgIterator::OkState State() const { return (*this)->State(); } inline const char *CandVersion() const { return (*this)->CandVersion(); } inline const char *CurVersion() const { return (*this)->CurVersion(); } - inline pkgCache *Cache() {return (*this)->Cache();}; + inline pkgCache *Cache() const { return (*this)->Cache(); }; + inline unsigned long Index() const {return (*this)->Index();}; friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, (*i)); } @@ -46,6 +53,21 @@ public: /*{{{*/ }; // 103. set::iterator is required to be modifiable, but this allows modification of keys typedef typename APT::PackageSet::const_iterator iterator; + + /** \brief returns all packages in the cache whose name matchs a given pattern + + A simple helper responsible for executing a regular expression on all + package names in the cache. Optional it prints a a notice about the + packages chosen cause of the given package. + \param Cache the packages are in + \param pattern regular expression for package names + \param out stream to print the notice to */ + static APT::PackageSet FromRegEx(pkgCache &Cache, const char *pattern, std::ostream &out); + static APT::PackageSet FromRegEx(pkgCache &Cache, const char *pattern) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::PackageSet::FromRegEx(Cache, pattern, out); + } + /*}}}*/ }; /*}}}*/ diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 44235e358..1cffd6730 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -40,7 +40,8 @@ #include #include #include - +#include + #include #include @@ -1780,51 +1781,24 @@ bool DoInstall(CommandLine &CmdL) Packages++; if (Pkg.end() == true) { - // Check if the name is a regex - const char *I; - for (I = S; *I != 0; I++) - if (*I == '?' || *I == '*' || *I == '|' || - *I == '[' || *I == '^' || *I == '$') - break; - if (*I == 0) + APT::PackageSet pkgset = APT::PackageSet::FromRegEx(Cache, S, c1out); + if (pkgset.empty() == true) return _error->Error(_("Couldn't find package %s"),S); // Regexs must always be confirmed ExpectedInst += 1000; - - // Compile the regex pattern - regex_t Pattern; - int Res; - if ((Res = regcomp(&Pattern,S,REG_EXTENDED | REG_ICASE | - REG_NOSUB)) != 0) - { - char Error[300]; - regerror(Res,&Pattern,Error,sizeof(Error)); - return _error->Error(_("Regex compilation error - %s"),Error); - } - - // Run over the matches + bool Hit = false; - for (pkgCache::GrpIterator Grp = Cache->GrpBegin(); Grp.end() == false; ++Grp) + for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { - if (regexec(&Pattern,Grp.Name(),0,0,0) != 0) - continue; - Pkg = Grp.FindPkg("native"); - if (unlikely(Pkg.end() == true)) - continue; - - ioprintf(c1out,_("Note, selecting %s for regex '%s'\n"), - Pkg.Name(),S); - if (VerTag != 0) if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false) return false; - + Hit |= TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix, ExpectedInst,false); } - regfree(&Pattern); - + if (Hit == false) return _error->Error(_("Couldn't find package %s"),S); } diff --git a/debian/changelog b/debian/changelog index 6980e5fcf..023d513be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - add a virtual destructor to FTWScanner class (for cppcheck) * apt-pkg/packageset.h: - add a simple wrapper around std::set for packages with it + - move regex magic from apt-get to new FromRegEx method -- David Kalnischkies Sat, 29 May 2010 19:09:05 +0200 -- cgit v1.2.3 From 78c325968642255fd2325003f19729b617477666 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 31 May 2010 00:28:14 +0200 Subject: move cmdline parsing from apt-cache to new FromCommandLine method --- apt-pkg/packageset.cc | 42 ++++++++++++++++++++++++--- apt-pkg/packageset.h | 53 ++++++++++++++++++++++------------ cmdline/apt-cache.cc | 80 ++++++++++++++------------------------------------- debian/changelog | 1 + 4 files changed, 95 insertions(+), 81 deletions(-) diff --git a/apt-pkg/packageset.cc b/apt-pkg/packageset.cc index f452bc052..baa1c211b 100644 --- a/apt-pkg/packageset.cc +++ b/apt-pkg/packageset.cc @@ -9,12 +9,15 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ +#include #include #include #include #include +#include + #include /*}}}*/ namespace APT { @@ -44,18 +47,49 @@ PackageSet PackageSet::FromRegEx(pkgCache &Cache, const char * const pattern, st if (regexec(&Pattern, Grp.Name(), 0, 0, 0) != 0) continue; pkgCache::PkgIterator Pkg = Grp.FindPkg("native"); - if (unlikely(Pkg.end() == true)) - // FIXME: Fallback to different architectures here? - continue; + if (Pkg.end() == true) { + std::vector archs = APT::Configuration::getArchitectures(); + for (std::vector::const_iterator a = archs.begin(); + a != archs.end() || Pkg.end() != true; ++a) { + Pkg = Grp.FindPkg(*a); + } + if (Pkg.end() == true) + continue; + } ioprintf(out, _("Note, selecting %s for regex '%s'\n"), - Pkg.Name(), pattern); + Pkg.FullName(true).c_str(), pattern); pkgset.insert(Pkg); } regfree(&Pattern); + return pkgset; +} + /*}}}*/ +// FromCommandLine - Return all packages specified on commandline /*{{{*/ +PackageSet PackageSet::FromCommandLine(pkgCache &Cache, const char **cmdline, std::ostream &out) { + PackageSet pkgset; + for (const char **I = cmdline + 1; *I != 0; I++) { + pkgCache::PkgIterator Pkg = Cache.FindPkg(*I); + if (Pkg.end() == true) { + std::vector archs = APT::Configuration::getArchitectures(); + for (std::vector::const_iterator a = archs.begin(); + a != archs.end() || Pkg.end() != true; ++a) { + Pkg = Cache.FindPkg(*I, *a); + } + if (Pkg.end() == true) { + PackageSet regex = FromRegEx(Cache, *I, out); + if (regex.empty() == true) + _error->Warning(_("Unable to locate package %s"),*I); + else + pkgset.insert(regex.begin(), regex.end()); + continue; + } + } + pkgset.insert(Pkg); + } return pkgset; } /*}}}*/ diff --git a/apt-pkg/packageset.h b/apt-pkg/packageset.h index cd1430a2a..0bd60c56b 100644 --- a/apt-pkg/packageset.h +++ b/apt-pkg/packageset.h @@ -28,27 +28,29 @@ public: /*{{{*/ operator pkgCache::PkgIterator(void) { return **this; } - inline const char *Name() const {return (*this)->Name(); } - inline std::string FullName(bool const &Pretty) const { return (*this)->FullName(Pretty); } - inline std::string FullName() const { return (*this)->FullName(); } - inline const char *Section() const {return (*this)->Section(); } - inline bool Purge() const {return (*this)->Purge(); } - inline const char *Arch() const {return (*this)->Arch(); } - inline pkgCache::GrpIterator Group() const { return (*this)->Group(); } - inline pkgCache::VerIterator VersionList() const { return (*this)->VersionList(); } - inline pkgCache::VerIterator CurrentVer() const { return (*this)->CurrentVer(); } - inline pkgCache::DepIterator RevDependsList() const { return (*this)->RevDependsList(); } - inline pkgCache::PrvIterator ProvidesList() const { return (*this)->ProvidesList(); } - inline pkgCache::PkgIterator::OkState State() const { return (*this)->State(); } - inline const char *CandVersion() const { return (*this)->CandVersion(); } - inline const char *CurVersion() const { return (*this)->CurVersion(); } - inline pkgCache *Cache() const { return (*this)->Cache(); }; - inline unsigned long Index() const {return (*this)->Index();}; + inline const char *Name() const {return (**this).Name(); } + inline std::string FullName(bool const &Pretty) const { return (**this).FullName(Pretty); } + inline std::string FullName() const { return (**this).FullName(); } + inline const char *Section() const {return (**this).Section(); } + inline bool Purge() const {return (**this).Purge(); } + inline const char *Arch() const {return (**this).Arch(); } + inline pkgCache::GrpIterator Group() const { return (**this).Group(); } + inline pkgCache::VerIterator VersionList() const { return (**this).VersionList(); } + inline pkgCache::VerIterator CurrentVer() const { return (**this).CurrentVer(); } + inline pkgCache::DepIterator RevDependsList() const { return (**this).RevDependsList(); } + inline pkgCache::PrvIterator ProvidesList() const { return (**this).ProvidesList(); } + inline pkgCache::PkgIterator::OkState State() const { return (**this).State(); } + inline const char *CandVersion() const { return (**this).CandVersion(); } + inline const char *CurVersion() const { return (**this).CurVersion(); } + inline pkgCache *Cache() const { return (**this).Cache(); }; + inline unsigned long Index() const {return (**this).Index();}; + // we have only valid iterators here + inline bool end() const { return false; }; friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, (*i)); } - inline pkgCache::PkgIterator const * operator->() const { - return &**this; + inline pkgCache::Package const * operator->() const { + return &***this; }; }; // 103. set::iterator is required to be modifiable, but this allows modification of keys @@ -68,6 +70,21 @@ public: /*{{{*/ return APT::PackageSet::FromRegEx(Cache, pattern, out); } + /** \brief returns all packages specified on the commandline + + Get all package names from the commandline and executes regex's if needed. + No special package command is supported, just plain names. + \param Cache the packages are in + \param cmdline Command line the package names should be extracted from + \param out stream to print various notices to */ + static APT::PackageSet FromCommandLine(pkgCache &Cache, const char **cmdline, std::ostream &out); + static APT::PackageSet FromCommandLine(pkgCache &Cache, const char **cmdline) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::PackageSet::FromCommandLine(Cache, cmdline, out); + } + + + /*}}}*/ }; /*}}}*/ diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 10dbf44d2..95f185b4f 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -29,6 +29,7 @@ #include #include #include +#include #include #include @@ -175,15 +176,10 @@ bool UnMet(CommandLine &CmdL) bool DumpPackage(CommandLine &CmdL) { pkgCache &Cache = *GCache; - for (const char **I = CmdL.FileList + 1; *I != 0; I++) - { - pkgCache::PkgIterator Pkg = Cache.FindPkg(*I); - if (Pkg.end() == true) - { - _error->Warning(_("Unable to locate package %s"),*I); - continue; - } + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(Cache, CmdL.FileList); + for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) + { cout << "Package: " << Pkg.FullName(true) << endl; cout << "Versions: " << endl; for (pkgCache::VerIterator Cur = Pkg.VersionList(); Cur.end() != true; Cur++) @@ -545,18 +541,11 @@ bool Depends(CommandLine &CmdL) pkgCache &Cache = *GCache; SPtrArray Colours = new unsigned[Cache.Head().PackageCount]; memset(Colours,0,sizeof(*Colours)*Cache.Head().PackageCount); - - for (const char **I = CmdL.FileList + 1; *I != 0; I++) - { - pkgCache::PkgIterator Pkg = Cache.FindPkg(*I); - if (Pkg.end() == true) - { - _error->Warning(_("Unable to locate package %s"),*I); - continue; - } + + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(Cache, CmdL.FileList); + for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) Colours[Pkg->ID] = 1; - } - + bool Recurse = _config->FindB("APT::Cache::RecurseDepends",false); bool Installed = _config->FindB("APT::Cache::Installed",false); bool Important = _config->FindB("APT::Cache::Important",false); @@ -639,18 +628,11 @@ bool RDepends(CommandLine &CmdL) pkgCache &Cache = *GCache; SPtrArray Colours = new unsigned[Cache.Head().PackageCount]; memset(Colours,0,sizeof(*Colours)*Cache.Head().PackageCount); - - for (const char **I = CmdL.FileList + 1; *I != 0; I++) - { - pkgCache::PkgIterator Pkg = Cache.FindPkg(*I); - if (Pkg.end() == true) - { - _error->Warning(_("Unable to locate package %s"),*I); - continue; - } + + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(Cache, CmdL.FileList); + for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) Colours[Pkg->ID] = 1; - } - + bool Recurse = _config->FindB("APT::Cache::RecurseDepends",false); bool Installed = _config->FindB("APT::Cache::Installed",false); bool DidSomething; @@ -1440,23 +1422,9 @@ bool ShowPackage(CommandLine &CmdL) pkgCache &Cache = *GCache; pkgDepCache::Policy Plcy; - unsigned found = 0; - - for (const char **I = CmdL.FileList + 1; *I != 0; I++) + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(Cache, CmdL.FileList); + for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { - // FIXME: Handle the case in which pkgname name:arch is not found - pkgCache::PkgIterator Pkg = Cache.FindPkg(*I); - if (Pkg.end() == true) - { - Pkg = Cache.FindPkg(*I, "any"); - if (Pkg.end() == true) { - _error->Warning(_("Unable to locate package %s"),*I); - continue; - } - } - - ++found; - // Find the proper version to use. if (_config->FindB("APT::Cache::AllVersions","true") == true) { @@ -1477,7 +1445,7 @@ bool ShowPackage(CommandLine &CmdL) } } - if (found > 0) + if (pkgset.empty() == false) return true; return _error->Error(_("No packages found")); } @@ -1622,15 +1590,10 @@ bool Policy(CommandLine &CmdL) (InstalledLessCandidate > 0 ? (InstalledLessCandidate) : 0) - 1; // Print out detailed information for each package - for (const char **I = CmdL.FileList + 1; *I != 0; I++) + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(Cache, CmdL.FileList); + for (APT::PackageSet::const_iterator I = pkgset.begin(); I != pkgset.end(); ++I) { - pkgCache::GrpIterator Grp = Cache.FindGrp(*I); - pkgCache::PkgIterator Pkg = Grp.FindPkg("any"); - if (Pkg.end() == true) - { - _error->Warning(_("Unable to locate package %s"),*I); - continue; - } + pkgCache::PkgIterator Pkg = I.Group().FindPkg("any"); for (; Pkg.end() != true; Pkg = Grp.NextPkg(Pkg)) { if (strcmp(Pkg.Arch(),"all") == 0) @@ -1708,10 +1671,9 @@ bool Madison(CommandLine &CmdL) if (_error->PendingError() == true) _error->Discard(); - for (const char **I = CmdL.FileList + 1; *I != 0; I++) + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(Cache, CmdL.FileList); + for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { - pkgCache::PkgIterator Pkg = Cache.FindPkg(*I); - if (Pkg.end() == false) { for (pkgCache::VerIterator V = Pkg.VersionList(); V.end() == false; V++) @@ -1746,7 +1708,7 @@ bool Madison(CommandLine &CmdL) SrcRecs.Restart(); pkgSrcRecords::Parser *SrcParser; - while ((SrcParser = SrcRecs.Find(*I,false)) != 0) + while ((SrcParser = SrcRecs.Find(Pkg.Name(),false)) != 0) { // Maybe support Release info here too eventually cout << setw(10) << SrcParser->Package() << " | " diff --git a/debian/changelog b/debian/changelog index 023d513be..79768a779 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low * apt-pkg/packageset.h: - add a simple wrapper around std::set for packages with it - move regex magic from apt-get to new FromRegEx method + - move cmdline parsing from apt-cache to new FromCommandLine method -- David Kalnischkies Sat, 29 May 2010 19:09:05 +0200 -- cgit v1.2.3 From 4c265635a8417b857a3a8f537c74313d5533da9b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 31 May 2010 12:58:20 +0200 Subject: =?UTF-8?q?i=20managed=20to=20commit=20broken=20code=E2=80=A6=20wh?= =?UTF-8?q?ich=20(at=20least=20in=20my=20mind)=20worked=20yesterday.=20Str?= =?UTF-8?q?ange=E2=80=A6=20anyway=20only=20small=20fixes.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmdline/apt-cache.cc | 2 +- ftparchive/writer.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 95f185b4f..943a001a8 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1595,7 +1595,7 @@ bool Policy(CommandLine &CmdL) { pkgCache::PkgIterator Pkg = I.Group().FindPkg("any"); - for (; Pkg.end() != true; Pkg = Grp.NextPkg(Pkg)) { + for (; Pkg.end() != true; Pkg = I.Group().NextPkg(Pkg)) { if (strcmp(Pkg.Arch(),"all") == 0) continue; diff --git a/ftparchive/writer.h b/ftparchive/writer.h index c08ddea85..49d430c47 100644 --- a/ftparchive/writer.h +++ b/ftparchive/writer.h @@ -72,7 +72,7 @@ class FTWScanner bool SetExts(string const &Vals); FTWScanner(string const &Arch = string()); - virtual ~FTWScanner(); + virtual ~FTWScanner() {}; }; class TranslationWriter -- cgit v1.2.3 From 6e235c6640cdc6cb9a8c3eaa1e65a6141f463676 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 31 May 2010 14:16:44 +0200 Subject: improve the handling of regex together with the architecture modifier --- apt-pkg/packageset.cc | 35 +++++++++++++++++++++-------------- apt-pkg/packageset.h | 4 ++-- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/apt-pkg/packageset.cc b/apt-pkg/packageset.cc index baa1c211b..f296b7c45 100644 --- a/apt-pkg/packageset.cc +++ b/apt-pkg/packageset.cc @@ -22,20 +22,26 @@ /*}}}*/ namespace APT { // FromRegEx - Return all packages in the cache matching a pattern /*{{{*/ -PackageSet PackageSet::FromRegEx(pkgCache &Cache, const char * const pattern, std::ostream &out) { +PackageSet PackageSet::FromRegEx(pkgCache &Cache, std::string pattern, std::ostream &out) { PackageSet pkgset; + std::string arch = "native"; + static const char * const isregex = ".?+*|[^$"; - const char * I; - for (I = pattern; *I != 0; I++) - if (*I == '.' || *I == '?' || *I == '+' || *I == '*' || - *I == '|' || *I == '[' || *I == '^' || *I == '$') - break; - if (*I == 0) + if (pattern.find_first_of(isregex) == std::string::npos) return pkgset; + size_t archfound = pattern.find_last_of(':'); + if (archfound != std::string::npos) { + arch = pattern.substr(archfound+1); + if (arch.find_first_of(isregex) == std::string::npos) + pattern.erase(archfound); + else + arch = "native"; + } + regex_t Pattern; int Res; - if ((Res = regcomp(&Pattern, pattern , REG_EXTENDED | REG_ICASE | REG_NOSUB)) != 0) { + if ((Res = regcomp(&Pattern, pattern.c_str() , REG_EXTENDED | REG_ICASE | REG_NOSUB)) != 0) { char Error[300]; regerror(Res, &Pattern, Error, sizeof(Error)); _error->Error(_("Regex compilation error - %s"), Error); @@ -46,19 +52,20 @@ PackageSet PackageSet::FromRegEx(pkgCache &Cache, const char * const pattern, st { if (regexec(&Pattern, Grp.Name(), 0, 0, 0) != 0) continue; - pkgCache::PkgIterator Pkg = Grp.FindPkg("native"); + pkgCache::PkgIterator Pkg = Grp.FindPkg(arch); if (Pkg.end() == true) { - std::vector archs = APT::Configuration::getArchitectures(); - for (std::vector::const_iterator a = archs.begin(); - a != archs.end() || Pkg.end() != true; ++a) { - Pkg = Grp.FindPkg(*a); + if (archfound == std::string::npos) { + std::vector archs = APT::Configuration::getArchitectures(); + for (std::vector::const_iterator a = archs.begin(); + a != archs.end() && Pkg.end() != true; ++a) + Pkg = Grp.FindPkg(*a); } if (Pkg.end() == true) continue; } ioprintf(out, _("Note, selecting %s for regex '%s'\n"), - Pkg.FullName(true).c_str(), pattern); + Pkg.FullName(true).c_str(), pattern.c_str()); pkgset.insert(Pkg); } diff --git a/apt-pkg/packageset.h b/apt-pkg/packageset.h index 0bd60c56b..9f80d60ed 100644 --- a/apt-pkg/packageset.h +++ b/apt-pkg/packageset.h @@ -64,8 +64,8 @@ public: /*{{{*/ \param Cache the packages are in \param pattern regular expression for package names \param out stream to print the notice to */ - static APT::PackageSet FromRegEx(pkgCache &Cache, const char *pattern, std::ostream &out); - static APT::PackageSet FromRegEx(pkgCache &Cache, const char *pattern) { + static APT::PackageSet FromRegEx(pkgCache &Cache, std::string pattern, std::ostream &out); + static APT::PackageSet FromRegEx(pkgCache &Cache, std::string const &pattern) { std::ostream out (std::ofstream("/dev/null").rdbuf()); return APT::PackageSet::FromRegEx(Cache, pattern, out); } -- cgit v1.2.3 From 093e9f5d30f37164dd28d639fedfb059e105e43e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 31 May 2010 17:22:04 +0200 Subject: * apt-pkg/contrib/cmdline.cc: - fix segfault in SaveInConfig caused by writing over char[] sizes --- apt-pkg/contrib/cmndline.cc | 4 ++-- debian/changelog | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc index 0b16bf51a..5a9944096 100644 --- a/apt-pkg/contrib/cmndline.cc +++ b/apt-pkg/contrib/cmndline.cc @@ -360,11 +360,11 @@ bool CommandLine::DispatchArg(Dispatch *Map,bool NoMatch) than nothing after all. */ void CommandLine::SaveInConfig(unsigned int const &argc, char const * const * const argv) { - char cmdline[300]; + char cmdline[100 + argc * 50]; unsigned int length = 0; bool lastWasOption = false; bool closeQuote = false; - for (unsigned int i = 0; i < argc; ++i, ++length) + for (unsigned int i = 0; i < argc && length < sizeof(cmdline); ++i, ++length) { for (unsigned int j = 0; argv[i][j] != '\0' && length < sizeof(cmdline)-1; ++j, ++length) { diff --git a/debian/changelog b/debian/changelog index 79768a779..6341484f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,8 +26,10 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - add a simple wrapper around std::set for packages with it - move regex magic from apt-get to new FromRegEx method - move cmdline parsing from apt-cache to new FromCommandLine method + * apt-pkg/contrib/cmdline.cc: + - fix segfault in SaveInConfig caused by writing over char[] sizes - -- David Kalnischkies Sat, 29 May 2010 19:09:05 +0200 + -- David Kalnischkies Mon, 31 May 2010 17:21:00 +0200 apt (0.7.26~exp5) experimental; urgency=low -- cgit v1.2.3 From bd2fb30a8647293f80b085d0308e66bb9219e662 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 31 May 2010 20:00:16 +0200 Subject: * apt-pkg/pkgcache.cc: - get the best matching arch package from a group with FindPreferredPkg --- apt-pkg/cacheiterators.h | 5 +++++ apt-pkg/pkgcache.cc | 19 +++++++++++++++++++ debian/changelog | 4 +++- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index ee852f594..e5b23a818 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -104,6 +104,11 @@ class pkgCache::GrpIterator: public Iterator { inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;}; inline PkgIterator PackageList() const; PkgIterator FindPkg(string Arch = "any"); + /** \brief find the package with the "best" architecture + + The best architecture is either the "native" or the first + in the list of Architectures which is not an end-Pointer */ + PkgIterator FindPreferredPkg(); PkgIterator NextPkg(PkgIterator const &Pkg); // Constructors diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index a59a06d65..adaae9c89 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -340,6 +340,25 @@ pkgCache::PkgIterator pkgCache::GrpIterator::FindPkg(string Arch) { break; } + return PkgIterator(*Owner, 0); +} + /*}}}*/ +// GrpIterator::FindPreferredPkg - Locate the "best" package /*{{{*/ +// --------------------------------------------------------------------- +/* Returns an End-Pointer on error, pointer to the package otherwise */ +pkgCache::PkgIterator pkgCache::GrpIterator::FindPreferredPkg() { + pkgCache::PkgIterator Pkg = FindPkg("native"); + if (Pkg.end() == false) + return Pkg; + + std::vector const archs = APT::Configuration::getArchitectures(); + for (std::vector::const_iterator a = archs.begin(); + a != archs.end(); ++a) { + Pkg = FindPkg(*a); + if (Pkg.end() == false) + return Pkg; + } + return PkgIterator(*Owner, 0); } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 6341484f2..920003484 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,8 +28,10 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - move cmdline parsing from apt-cache to new FromCommandLine method * apt-pkg/contrib/cmdline.cc: - fix segfault in SaveInConfig caused by writing over char[] sizes + * apt-pkg/pkgcache.cc: + - get the best matching arch package from a group with FindPreferredPkg - -- David Kalnischkies Mon, 31 May 2010 17:21:00 +0200 + -- David Kalnischkies Mon, 31 May 2010 19:59:04 +0200 apt (0.7.26~exp5) experimental; urgency=low -- cgit v1.2.3 From d5cc17d6c2ba4e29e800e489d5f3b3cf4a405543 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 31 May 2010 20:02:41 +0200 Subject: * cmdline/apt-cache.cc: - make the search multiarch compatible by using GrpIterator instead --- cmdline/apt-cache.cc | 77 +++++++++++++++++++++++++++------------------------- debian/changelog | 4 ++- 2 files changed, 43 insertions(+), 38 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 943a001a8..d8e14617a 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1272,15 +1272,15 @@ struct ExDescFile bool Search(CommandLine &CmdL) { pkgCache &Cache = *GCache; - bool ShowFull = _config->FindB("APT::Cache::ShowFull",false); - bool NamesOnly = _config->FindB("APT::Cache::NamesOnly",false); - unsigned NumPatterns = CmdL.FileSize() -1; + bool const ShowFull = _config->FindB("APT::Cache::ShowFull",false); + bool const NamesOnly = _config->FindB("APT::Cache::NamesOnly",false); + unsigned int const NumPatterns = CmdL.FileSize() -1; pkgDepCache::Policy Plcy; // Make sure there is at least one argument if (NumPatterns < 1) - return _error->Error(_("You must give exactly one pattern")); + return _error->Error(_("You must give at least one search pattern")); // Compile the regex pattern regex_t *Patterns = new regex_t[NumPatterns]; @@ -1296,8 +1296,6 @@ bool Search(CommandLine &CmdL) } } - // Create the text record parser - pkgRecords Recs(Cache); if (_error->PendingError() == true) { for (unsigned I = 0; I != NumPatterns; I++) @@ -1305,70 +1303,75 @@ bool Search(CommandLine &CmdL) return false; } - ExDescFile *DFList = new ExDescFile[Cache.HeaderP->PackageCount+1]; - memset(DFList,0,sizeof(*DFList)*Cache.HeaderP->PackageCount+1); + ExDescFile *DFList = new ExDescFile[Cache.HeaderP->GroupCount+1]; + memset(DFList,0,sizeof(*DFList)*Cache.HeaderP->GroupCount+1); // Map versions that we want to write out onto the VerList array. - for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++) + for (pkgCache::GrpIterator G = Cache.GrpBegin(); G.end() == false; ++G) { - DFList[P->ID].NameMatch = NumPatterns != 0; + if (DFList[G->ID].NameMatch == true) + continue; + + DFList[G->ID].NameMatch = true; for (unsigned I = 0; I != NumPatterns; I++) { - if (regexec(&Patterns[I],P.Name(),0,0,0) == 0) - DFList[P->ID].NameMatch &= true; - else - DFList[P->ID].NameMatch = false; + if (regexec(&Patterns[I],G.Name(),0,0,0) == 0) + continue; + DFList[G->ID].NameMatch = false; + break; } // Doing names only, drop any that dont match.. - if (NamesOnly == true && DFList[P->ID].NameMatch == false) + if (NamesOnly == true && DFList[G->ID].NameMatch == false) continue; - // Find the proper version to use. + // Find the proper version to use + pkgCache::PkgIterator P = G.FindPreferredPkg(); + if (P.end() == true) + continue; pkgCache::VerIterator V = Plcy.GetCandidateVer(P); if (V.end() == false) - DFList[P->ID].Df = V.DescriptionList().FileList(); - } - - // Include all the packages that provide matching names too - for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++) - { - if (DFList[P->ID].NameMatch == false) + DFList[G->ID].Df = V.DescriptionList().FileList(); + + if (DFList[G->ID].NameMatch == false) continue; + // Include all the packages that provide matching names too for (pkgCache::PrvIterator Prv = P.ProvidesList() ; Prv.end() == false; Prv++) { pkgCache::VerIterator V = Plcy.GetCandidateVer(Prv.OwnerPkg()); - if (V.end() == false) - { - DFList[Prv.OwnerPkg()->ID].Df = V.DescriptionList().FileList(); - DFList[Prv.OwnerPkg()->ID].NameMatch = true; - } + if (V.end() == true) + continue; + + unsigned long id = Prv.OwnerPkg().Group()->ID; + DFList[id].Df = V.DescriptionList().FileList(); + DFList[id].NameMatch = true; } } - LocalitySort(&DFList->Df,Cache.HeaderP->PackageCount,sizeof(*DFList)); + LocalitySort(&DFList->Df,Cache.HeaderP->GroupCount,sizeof(*DFList)); + // Create the text record parser + pkgRecords Recs(Cache); // Iterate over all the version records and check them for (ExDescFile *J = DFList; J->Df != 0; J++) { pkgRecords::Parser &P = Recs.Lookup(pkgCache::DescFileIterator(Cache,J->Df)); - bool Match = true; - if (J->NameMatch == false) + if (J->NameMatch == false && NamesOnly == false) { - string LongDesc = P.LongDesc(); - Match = NumPatterns != 0; + string const LongDesc = P.LongDesc(); + J->NameMatch = true; for (unsigned I = 0; I != NumPatterns; I++) { if (regexec(&Patterns[I],LongDesc.c_str(),0,0,0) == 0) - Match &= true; - else - Match = false; + continue; + J->NameMatch = false; + break; } } - if (Match == true) + if (J->NameMatch == true) { if (ShowFull == true) { diff --git a/debian/changelog b/debian/changelog index 920003484..054088ec2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,8 +30,10 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - fix segfault in SaveInConfig caused by writing over char[] sizes * apt-pkg/pkgcache.cc: - get the best matching arch package from a group with FindPreferredPkg + * cmdline/apt-cache.cc: + - make the search multiarch compatible by using GrpIterator instead - -- David Kalnischkies Mon, 31 May 2010 19:59:04 +0200 + -- David Kalnischkies Mon, 31 May 2010 20:00:24 +0200 apt (0.7.26~exp5) experimental; urgency=low -- cgit v1.2.3 From 7959c5eda83bd6d69876942566cf47d74fc76530 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 31 May 2010 21:00:09 +0200 Subject: rename packageset into cacheset while it is not too late --- apt-pkg/cacheset.cc | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++ apt-pkg/cacheset.h | 96 ++++++++++++++++++++++++++++++++++++++++++++++ apt-pkg/makefile | 4 +- apt-pkg/packageset.cc | 103 -------------------------------------------------- apt-pkg/packageset.h | 92 -------------------------------------------- cmdline/apt-cache.cc | 2 +- cmdline/apt-get.cc | 2 +- debian/changelog | 2 +- 8 files changed, 204 insertions(+), 200 deletions(-) create mode 100644 apt-pkg/cacheset.cc create mode 100644 apt-pkg/cacheset.h delete mode 100644 apt-pkg/packageset.cc delete mode 100644 apt-pkg/packageset.h diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc new file mode 100644 index 000000000..b49b36539 --- /dev/null +++ b/apt-pkg/cacheset.cc @@ -0,0 +1,103 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +/* ###################################################################### + + Simple wrapper around a std::set to provide a similar interface to + a set of cache structures as to the complete set of all structures + in the pkgCache. Currently only Package is supported. + + ##################################################################### */ + /*}}}*/ +// Include Files /*{{{*/ +#include +#include +#include +#include + +#include + +#include + +#include + /*}}}*/ +namespace APT { +// FromRegEx - Return all packages in the cache matching a pattern /*{{{*/ +PackageSet PackageSet::FromRegEx(pkgCache &Cache, std::string pattern, std::ostream &out) { + PackageSet pkgset; + std::string arch = "native"; + static const char * const isregex = ".?+*|[^$"; + + if (pattern.find_first_of(isregex) == std::string::npos) + return pkgset; + + size_t archfound = pattern.find_last_of(':'); + if (archfound != std::string::npos) { + arch = pattern.substr(archfound+1); + if (arch.find_first_of(isregex) == std::string::npos) + pattern.erase(archfound); + else + arch = "native"; + } + + regex_t Pattern; + int Res; + if ((Res = regcomp(&Pattern, pattern.c_str() , REG_EXTENDED | REG_ICASE | REG_NOSUB)) != 0) { + char Error[300]; + regerror(Res, &Pattern, Error, sizeof(Error)); + _error->Error(_("Regex compilation error - %s"), Error); + return pkgset; + } + + for (pkgCache::GrpIterator Grp = Cache.GrpBegin(); Grp.end() == false; ++Grp) + { + if (regexec(&Pattern, Grp.Name(), 0, 0, 0) != 0) + continue; + pkgCache::PkgIterator Pkg = Grp.FindPkg(arch); + if (Pkg.end() == true) { + if (archfound == std::string::npos) { + std::vector archs = APT::Configuration::getArchitectures(); + for (std::vector::const_iterator a = archs.begin(); + a != archs.end() && Pkg.end() != true; ++a) + Pkg = Grp.FindPkg(*a); + } + if (Pkg.end() == true) + continue; + } + + ioprintf(out, _("Note, selecting %s for regex '%s'\n"), + Pkg.FullName(true).c_str(), pattern.c_str()); + + pkgset.insert(Pkg); + } + + regfree(&Pattern); + + return pkgset; +} + /*}}}*/ +// FromCommandLine - Return all packages specified on commandline /*{{{*/ +PackageSet PackageSet::FromCommandLine(pkgCache &Cache, const char **cmdline, std::ostream &out) { + PackageSet pkgset; + for (const char **I = cmdline + 1; *I != 0; I++) { + pkgCache::PkgIterator Pkg = Cache.FindPkg(*I); + if (Pkg.end() == true) { + std::vector archs = APT::Configuration::getArchitectures(); + for (std::vector::const_iterator a = archs.begin(); + a != archs.end() || Pkg.end() != true; ++a) { + Pkg = Cache.FindPkg(*I, *a); + } + if (Pkg.end() == true) { + PackageSet regex = FromRegEx(Cache, *I, out); + if (regex.empty() == true) + _error->Warning(_("Unable to locate package %s"),*I); + else + pkgset.insert(regex.begin(), regex.end()); + continue; + } + } + pkgset.insert(Pkg); + } + return pkgset; +} + /*}}}*/ +} diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h new file mode 100644 index 000000000..7c05face6 --- /dev/null +++ b/apt-pkg/cacheset.h @@ -0,0 +1,96 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +/** \file cacheset.h + Wrappers around std::set to have set::iterators which behave + similar to the Iterators of the cache structures. + + Provides also a few helper methods which work with these sets */ + /*}}}*/ +#ifndef APT_CACHESET_H +#define APT_CACHESET_H +// Include Files /*{{{*/ +#include +#include +#include +#include + +#include + /*}}}*/ +namespace APT { +/** \class APT::PackageSet + + Simple wrapper around a std::set to provide a similar interface to + a set of packages as to the complete set of all packages in the + pkgCache. */ +class PackageSet : public std::set { /*{{{*/ +public: /*{{{*/ + /** \brief smell like a pkgCache::PkgIterator */ + class const_iterator : public std::set::const_iterator { + public: + const_iterator(std::set::const_iterator x) : + std::set::const_iterator(x) {} + + operator pkgCache::PkgIterator(void) { return **this; } + + inline const char *Name() const {return (**this).Name(); } + inline std::string FullName(bool const &Pretty) const { return (**this).FullName(Pretty); } + inline std::string FullName() const { return (**this).FullName(); } + inline const char *Section() const {return (**this).Section(); } + inline bool Purge() const {return (**this).Purge(); } + inline const char *Arch() const {return (**this).Arch(); } + inline pkgCache::GrpIterator Group() const { return (**this).Group(); } + inline pkgCache::VerIterator VersionList() const { return (**this).VersionList(); } + inline pkgCache::VerIterator CurrentVer() const { return (**this).CurrentVer(); } + inline pkgCache::DepIterator RevDependsList() const { return (**this).RevDependsList(); } + inline pkgCache::PrvIterator ProvidesList() const { return (**this).ProvidesList(); } + inline pkgCache::PkgIterator::OkState State() const { return (**this).State(); } + inline const char *CandVersion() const { return (**this).CandVersion(); } + inline const char *CurVersion() const { return (**this).CurVersion(); } + inline pkgCache *Cache() const { return (**this).Cache(); }; + inline unsigned long Index() const {return (**this).Index();}; + // we have only valid iterators here + inline bool end() const { return false; }; + + friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, (*i)); } + + inline pkgCache::Package const * operator->() const { + return &***this; + }; + }; + // 103. set::iterator is required to be modifiable, but this allows modification of keys + typedef typename APT::PackageSet::const_iterator iterator; + + /** \brief returns all packages in the cache whose name matchs a given pattern + + A simple helper responsible for executing a regular expression on all + package names in the cache. Optional it prints a a notice about the + packages chosen cause of the given package. + \param Cache the packages are in + \param pattern regular expression for package names + \param out stream to print the notice to */ + static APT::PackageSet FromRegEx(pkgCache &Cache, std::string pattern, std::ostream &out); + static APT::PackageSet FromRegEx(pkgCache &Cache, std::string const &pattern) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::PackageSet::FromRegEx(Cache, pattern, out); + } + + /** \brief returns all packages specified on the commandline + + Get all package names from the commandline and executes regex's if needed. + No special package command is supported, just plain names. + \param Cache the packages are in + \param cmdline Command line the package names should be extracted from + \param out stream to print various notices to */ + static APT::PackageSet FromCommandLine(pkgCache &Cache, const char **cmdline, std::ostream &out); + static APT::PackageSet FromCommandLine(pkgCache &Cache, const char **cmdline) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::PackageSet::FromCommandLine(Cache, cmdline, out); + } + + + + /*}}}*/ +}; + /*}}}*/ +} +#endif diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 968275c5c..1a7078693 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -35,7 +35,7 @@ SOURCE+= pkgcache.cc version.cc depcache.cc \ srcrecords.cc cachefile.cc versionmatch.cc policy.cc \ pkgsystem.cc indexfile.cc pkgcachegen.cc acquire-item.cc \ indexrecords.cc vendor.cc vendorlist.cc cdrom.cc indexcopy.cc \ - aptconfiguration.cc packageset.cc + aptconfiguration.cc cacheset.cc HEADERS+= algorithms.h depcache.h pkgcachegen.h cacheiterators.h \ orderlist.h sourcelist.h packagemanager.h tagfile.h \ init.h pkgcache.h version.h progress.h pkgrecords.h \ @@ -43,7 +43,7 @@ HEADERS+= algorithms.h depcache.h pkgcachegen.h cacheiterators.h \ clean.h srcrecords.h cachefile.h versionmatch.h policy.h \ pkgsystem.h indexfile.h metaindex.h indexrecords.h vendor.h \ vendorlist.h cdrom.h indexcopy.h aptconfiguration.h \ - packageset.h + cacheset.h # Source code for the debian specific components # In theory the deb headers do not need to be exported.. diff --git a/apt-pkg/packageset.cc b/apt-pkg/packageset.cc deleted file mode 100644 index f296b7c45..000000000 --- a/apt-pkg/packageset.cc +++ /dev/null @@ -1,103 +0,0 @@ -// -*- mode: cpp; mode: fold -*- -// Description /*{{{*/ -/* ###################################################################### - - Simple wrapper around a std::set to provide a similar interface to - a set of packages as to the complete set of all packages in the - pkgCache. - - ##################################################################### */ - /*}}}*/ -// Include Files /*{{{*/ -#include -#include -#include -#include - -#include - -#include - -#include - /*}}}*/ -namespace APT { -// FromRegEx - Return all packages in the cache matching a pattern /*{{{*/ -PackageSet PackageSet::FromRegEx(pkgCache &Cache, std::string pattern, std::ostream &out) { - PackageSet pkgset; - std::string arch = "native"; - static const char * const isregex = ".?+*|[^$"; - - if (pattern.find_first_of(isregex) == std::string::npos) - return pkgset; - - size_t archfound = pattern.find_last_of(':'); - if (archfound != std::string::npos) { - arch = pattern.substr(archfound+1); - if (arch.find_first_of(isregex) == std::string::npos) - pattern.erase(archfound); - else - arch = "native"; - } - - regex_t Pattern; - int Res; - if ((Res = regcomp(&Pattern, pattern.c_str() , REG_EXTENDED | REG_ICASE | REG_NOSUB)) != 0) { - char Error[300]; - regerror(Res, &Pattern, Error, sizeof(Error)); - _error->Error(_("Regex compilation error - %s"), Error); - return pkgset; - } - - for (pkgCache::GrpIterator Grp = Cache.GrpBegin(); Grp.end() == false; ++Grp) - { - if (regexec(&Pattern, Grp.Name(), 0, 0, 0) != 0) - continue; - pkgCache::PkgIterator Pkg = Grp.FindPkg(arch); - if (Pkg.end() == true) { - if (archfound == std::string::npos) { - std::vector archs = APT::Configuration::getArchitectures(); - for (std::vector::const_iterator a = archs.begin(); - a != archs.end() && Pkg.end() != true; ++a) - Pkg = Grp.FindPkg(*a); - } - if (Pkg.end() == true) - continue; - } - - ioprintf(out, _("Note, selecting %s for regex '%s'\n"), - Pkg.FullName(true).c_str(), pattern.c_str()); - - pkgset.insert(Pkg); - } - - regfree(&Pattern); - - return pkgset; -} - /*}}}*/ -// FromCommandLine - Return all packages specified on commandline /*{{{*/ -PackageSet PackageSet::FromCommandLine(pkgCache &Cache, const char **cmdline, std::ostream &out) { - PackageSet pkgset; - for (const char **I = cmdline + 1; *I != 0; I++) { - pkgCache::PkgIterator Pkg = Cache.FindPkg(*I); - if (Pkg.end() == true) { - std::vector archs = APT::Configuration::getArchitectures(); - for (std::vector::const_iterator a = archs.begin(); - a != archs.end() || Pkg.end() != true; ++a) { - Pkg = Cache.FindPkg(*I, *a); - } - if (Pkg.end() == true) { - PackageSet regex = FromRegEx(Cache, *I, out); - if (regex.empty() == true) - _error->Warning(_("Unable to locate package %s"),*I); - else - pkgset.insert(regex.begin(), regex.end()); - continue; - } - } - pkgset.insert(Pkg); - } - return pkgset; -} - /*}}}*/ -} diff --git a/apt-pkg/packageset.h b/apt-pkg/packageset.h deleted file mode 100644 index 9f80d60ed..000000000 --- a/apt-pkg/packageset.h +++ /dev/null @@ -1,92 +0,0 @@ -// -*- mode: cpp; mode: fold -*- -// Description /*{{{*/ -/** \class APT::PackageSet - - Simple wrapper around a std::set to provide a similar interface to - a set of packages as to the complete set of all packages in the - pkgCache. -*/ - /*}}}*/ -#ifndef APT_PACKAGESET_H -#define APT_PACKAGESET_H -// Include Files /*{{{*/ -#include -#include -#include -#include - -#include - /*}}}*/ -namespace APT { -class PackageSet : public std::set { /*{{{*/ -public: /*{{{*/ - /** \brief smell like a pkgCache::PkgIterator */ - class const_iterator : public std::set::const_iterator { - public: - const_iterator(std::set::const_iterator x) : - std::set::const_iterator(x) {} - - operator pkgCache::PkgIterator(void) { return **this; } - - inline const char *Name() const {return (**this).Name(); } - inline std::string FullName(bool const &Pretty) const { return (**this).FullName(Pretty); } - inline std::string FullName() const { return (**this).FullName(); } - inline const char *Section() const {return (**this).Section(); } - inline bool Purge() const {return (**this).Purge(); } - inline const char *Arch() const {return (**this).Arch(); } - inline pkgCache::GrpIterator Group() const { return (**this).Group(); } - inline pkgCache::VerIterator VersionList() const { return (**this).VersionList(); } - inline pkgCache::VerIterator CurrentVer() const { return (**this).CurrentVer(); } - inline pkgCache::DepIterator RevDependsList() const { return (**this).RevDependsList(); } - inline pkgCache::PrvIterator ProvidesList() const { return (**this).ProvidesList(); } - inline pkgCache::PkgIterator::OkState State() const { return (**this).State(); } - inline const char *CandVersion() const { return (**this).CandVersion(); } - inline const char *CurVersion() const { return (**this).CurVersion(); } - inline pkgCache *Cache() const { return (**this).Cache(); }; - inline unsigned long Index() const {return (**this).Index();}; - // we have only valid iterators here - inline bool end() const { return false; }; - - friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, (*i)); } - - inline pkgCache::Package const * operator->() const { - return &***this; - }; - }; - // 103. set::iterator is required to be modifiable, but this allows modification of keys - typedef typename APT::PackageSet::const_iterator iterator; - - /** \brief returns all packages in the cache whose name matchs a given pattern - - A simple helper responsible for executing a regular expression on all - package names in the cache. Optional it prints a a notice about the - packages chosen cause of the given package. - \param Cache the packages are in - \param pattern regular expression for package names - \param out stream to print the notice to */ - static APT::PackageSet FromRegEx(pkgCache &Cache, std::string pattern, std::ostream &out); - static APT::PackageSet FromRegEx(pkgCache &Cache, std::string const &pattern) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); - return APT::PackageSet::FromRegEx(Cache, pattern, out); - } - - /** \brief returns all packages specified on the commandline - - Get all package names from the commandline and executes regex's if needed. - No special package command is supported, just plain names. - \param Cache the packages are in - \param cmdline Command line the package names should be extracted from - \param out stream to print various notices to */ - static APT::PackageSet FromCommandLine(pkgCache &Cache, const char **cmdline, std::ostream &out); - static APT::PackageSet FromCommandLine(pkgCache &Cache, const char **cmdline) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); - return APT::PackageSet::FromCommandLine(Cache, cmdline, out); - } - - - - /*}}}*/ -}; - /*}}}*/ -} -#endif diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index d8e14617a..891b10873 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 1cffd6730..9894747f4 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include diff --git a/debian/changelog b/debian/changelog index 054088ec2..6b9057ae3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,7 +22,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - correct "Dangerous iterator usage." pointed out by cppcheck * ftparchive/writer.h: - add a virtual destructor to FTWScanner class (for cppcheck) - * apt-pkg/packageset.h: + * apt-pkg/cacheset.h: - add a simple wrapper around std::set for packages with it - move regex magic from apt-get to new FromRegEx method - move cmdline parsing from apt-cache to new FromCommandLine method -- cgit v1.2.3 From d4489d4983d5b9840bb2882a088dd1f363a280b9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 31 May 2010 22:36:41 +0200 Subject: * apt-pkg/cacheset.{cc,h}: - add simple wrapper around std::set for cache structures --- apt-pkg/cacheiterators.h | 4 ++-- apt-pkg/cacheset.h | 49 +++++++++++++++++++++++++++++++++++++++++++++--- apt-pkg/pkgcache.cc | 2 +- debian/changelog | 6 +++--- 4 files changed, 52 insertions(+), 9 deletions(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index e5b23a818..f0b40dbb5 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -205,8 +205,8 @@ class pkgCache::VerIterator : public Iterator { inline PrvIterator ProvidesList() const; inline VerFileIterator FileList() const; bool Downloadable() const; - inline const char *PriorityType() {return Owner->Priority(S->Priority);}; - string RelStr(); + inline const char *PriorityType() const {return Owner->Priority(S->Priority);}; + string RelStr() const; bool Automatic() const; bool Pseudo() const; diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index 7c05face6..f0131bfed 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -17,12 +17,12 @@ #include /*}}}*/ namespace APT { +class PackageSet : public std::set { /*{{{*/ /** \class APT::PackageSet Simple wrapper around a std::set to provide a similar interface to a set of packages as to the complete set of all packages in the pkgCache. */ -class PackageSet : public std::set { /*{{{*/ public: /*{{{*/ /** \brief smell like a pkgCache::PkgIterator */ class const_iterator : public std::set::const_iterator { @@ -86,11 +86,54 @@ public: /*{{{*/ std::ostream out (std::ofstream("/dev/null").rdbuf()); return APT::PackageSet::FromCommandLine(Cache, cmdline, out); } + /*}}}*/ +}; /*}}}*/ +class VersionSet : public std::set { /*{{{*/ +/** \class APT::VersionSet + Simple wrapper around a std::set to provide a similar interface to + a set of versions as to the complete set of all versions in the + pkgCache. */ +public: /*{{{*/ + /** \brief smell like a pkgCache::VerIterator */ + class const_iterator : public std::set::const_iterator { + public: + const_iterator(std::set::const_iterator x) : + std::set::const_iterator(x) {} + operator pkgCache::VerIterator(void) { return **this; } + + inline pkgCache *Cache() const { return (**this).Cache(); }; + inline unsigned long Index() const {return (**this).Index();}; + // we have only valid iterators here + inline bool end() const { return false; }; + + inline pkgCache::Version const * operator->() const { + return &***this; + }; + + inline int CompareVer(const pkgCache::VerIterator &B) const { return (**this).CompareVer(B); }; + inline const char *VerStr() const { return (**this).VerStr(); }; + inline const char *Section() const { return (**this).Section(); }; + inline const char *Arch() const { return (**this).Arch(); }; + inline const char *Arch(bool const pseudo) const { return (**this).Arch(pseudo); }; + inline pkgCache::PkgIterator ParentPkg() const { return (**this).ParentPkg(); }; + inline pkgCache::DescIterator DescriptionList() const { return (**this).DescriptionList(); }; + inline pkgCache::DescIterator TranslatedDescription() const { return (**this).TranslatedDescription(); }; + inline pkgCache::DepIterator DependsList() const { return (**this).DependsList(); }; + inline pkgCache::PrvIterator ProvidesList() const { return (**this).ProvidesList(); }; + inline pkgCache::VerFileIterator FileList() const { return (**this).FileList(); }; + inline bool Downloadable() const { return (**this).Downloadable(); }; + inline const char *PriorityType() const { return (**this).PriorityType(); }; + inline string RelStr() const { return (**this).RelStr(); }; + inline bool Automatic() const { return (**this).Automatic(); }; + inline bool Pseudo() const { return (**this).Pseudo(); }; + inline pkgCache::VerFileIterator NewestFile() const { return (**this).NewestFile(); }; + }; + // 103. set::iterator is required to be modifiable, but this allows modification of keys + typedef typename APT::VersionSet::const_iterator iterator; /*}}}*/ -}; - /*}}}*/ +}; /*}}}*/ } #endif diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index adaae9c89..30bb41470 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -742,7 +742,7 @@ pkgCache::VerFileIterator pkgCache::VerIterator::NewestFile() const // --------------------------------------------------------------------- /* This describes the version from a release-centric manner. The output is a list of Label:Version/Archive */ -string pkgCache::VerIterator::RelStr() +string pkgCache::VerIterator::RelStr() const { bool First = true; string Res; diff --git a/debian/changelog b/debian/changelog index 6b9057ae3..994be2bbc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,8 +22,8 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - correct "Dangerous iterator usage." pointed out by cppcheck * ftparchive/writer.h: - add a virtual destructor to FTWScanner class (for cppcheck) - * apt-pkg/cacheset.h: - - add a simple wrapper around std::set for packages with it + * apt-pkg/cacheset.{cc,h}: + - add simple wrapper around std::set for cache structures - move regex magic from apt-get to new FromRegEx method - move cmdline parsing from apt-cache to new FromCommandLine method * apt-pkg/contrib/cmdline.cc: @@ -33,7 +33,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low * cmdline/apt-cache.cc: - make the search multiarch compatible by using GrpIterator instead - -- David Kalnischkies Mon, 31 May 2010 20:00:24 +0200 + -- David Kalnischkies Mon, 31 May 2010 22:36:35 +0200 apt (0.7.26~exp5) experimental; urgency=low -- cgit v1.2.3 From 96db74ce38e9451609fe33f9e25f3f9d42b1fe22 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 2 Jun 2010 16:40:40 +0200 Subject: * apt-pkg/deb/dpkgpm.cc: - add missing include * methods/mirror.{cc,h}: - add SelectNextMirror() and InitMirrors() functions - read all mirrors into the AllMirrors vector --- apt-pkg/deb/dpkgpm.cc | 1 + methods/mirror.cc | 30 +++++++++++++++++++++++------- methods/mirror.h | 4 +++- 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 18c731788..7e5171eda 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include diff --git a/methods/mirror.cc b/methods/mirror.cc index b3a956b95..0a0d07e6b 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -162,7 +162,21 @@ bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str) return res; } -bool MirrorMethod::SelectMirror() +bool MirrorMethod::SelectNextMirror() +{ + if (AllMirrors.size() < 1) + return false; + + Mirror = AllMirrors[0]; + AllMirrors.erase(AllMirrors.begin()); + if(Debug) + cerr << "using mirror: " << Mirror << endl; + + UsedMirror = Mirror; + return true; +} + +bool MirrorMethod::InitMirrors() { // if we do not have a MirrorFile, fallback if(!FileExists(MirrorFile)) @@ -179,11 +193,13 @@ bool MirrorMethod::SelectMirror() // get into sync issues (got indexfiles from mirror A, // but packages from mirror B - one might be out of date etc) ifstream in(MirrorFile.c_str()); - getline(in, Mirror); - if(Debug) - cerr << "Using mirror: " << Mirror << endl; - - UsedMirror = Mirror; + string s; + while (!in.eof()) + { + getline(in, s); + AllMirrors.push_back(s); + } + SelectNextMirror(); return true; } @@ -275,7 +291,7 @@ bool MirrorMethod::Fetch(FetchItem *Itm) } if(Mirror.empty()) { - if(!SelectMirror()) { + if(!InitMirrors()) { // no valid mirror selected, something went wrong downloading // from the master mirror site most likely and there is // no old mirror file availalbe diff --git a/methods/mirror.h b/methods/mirror.h index ed817806b..1b506dc87 100644 --- a/methods/mirror.h +++ b/methods/mirror.h @@ -26,6 +26,7 @@ class MirrorMethod : public HttpMethod // we simply transform between BaseUri and Mirror string BaseUri; // the original mirror://... url string Mirror; // the selected mirror uri (http://...) + vector AllMirrors; // all available mirrors string MirrorFile; // the file that contains the list of mirrors bool DownloadedMirrorFile; // already downloaded this session @@ -34,7 +35,8 @@ class MirrorMethod : public HttpMethod protected: bool DownloadMirrorFile(string uri); string GetMirrorFileName(string uri); - bool SelectMirror(); + bool InitMirrors(); + bool SelectNextMirror(); bool Clean(string dir); // we need to overwrite those to transform the url back -- cgit v1.2.3 From 483dfdd8aced593e966d221073c056c2e332584f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 2 Jun 2010 16:51:25 +0200 Subject: methods/mirror.cc: on fail try the next mirror --- methods/mirror.cc | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/methods/mirror.cc b/methods/mirror.cc index 0a0d07e6b..b8bd6db73 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -197,7 +197,8 @@ bool MirrorMethod::InitMirrors() while (!in.eof()) { getline(in, s); - AllMirrors.push_back(s); + if (s.size() > 0) + AllMirrors.push_back(s); } SelectNextMirror(); return true; @@ -314,6 +315,15 @@ bool MirrorMethod::Fetch(FetchItem *Itm) void MirrorMethod::Fail(string Err,bool Transient) { + // try the next mirror on fail + string old_mirror = Mirror; + if (SelectNextMirror()) + { + Queue->Uri.replace(0, old_mirror.size(), Mirror); + return; + } + + // all mirrors failed, so bail out if(Queue->Uri.find("http://") != string::npos) Queue->Uri.replace(0,Mirror.size(), BaseUri); pkgAcqMethod::Fail(Err, Transient); -- cgit v1.2.3 From 164fed49362b28c0264c293a14a06d167e32b76f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 2 Jun 2010 21:43:55 +0200 Subject: cmdline/apt-report-mirror-failure: port to latest python-apt --- cmdline/apt-report-mirror-failure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmdline/apt-report-mirror-failure b/cmdline/apt-report-mirror-failure index ef77d4954..e8ffdc2c7 100755 --- a/cmdline/apt-report-mirror-failure +++ b/cmdline/apt-report-mirror-failure @@ -5,7 +5,7 @@ import urllib import apt_pkg apt_pkg.init() -url = apt_pkg.Config.Find("Acquire::Mirror::ReportFailures", "") +url = apt_pkg.Config.find("Acquire::Mirror::ReportFailures", "") #"http://people.ubuntu.com:9000/mirror-failure") #"http://localhost:9000/mirror-failure") if not url: -- cgit v1.2.3 From 0ded3ad3438666f833773895ef6318f84d2f849d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 2 Jun 2010 22:44:49 +0200 Subject: improve error message if mirror method fails --- methods/mirror.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/methods/mirror.cc b/methods/mirror.cc index b8bd6db73..b9fa55d87 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -25,6 +25,8 @@ using namespace std; +#include + #include "mirror.h" #include "http.h" #include "apti18n.h" @@ -164,16 +166,12 @@ bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str) bool MirrorMethod::SelectNextMirror() { - if (AllMirrors.size() < 1) - return false; - - Mirror = AllMirrors[0]; - AllMirrors.erase(AllMirrors.begin()); if(Debug) cerr << "using mirror: " << Mirror << endl; + Mirror = AllMirrors[0]; UsedMirror = Mirror; - return true; + return false; } bool MirrorMethod::InitMirrors() @@ -324,6 +322,10 @@ void MirrorMethod::Fail(string Err,bool Transient) } // all mirrors failed, so bail out + string s; + strprintf(s, _("[Mirror: %s]"), Mirror.c_str()); + SetIP(s); + if(Queue->Uri.find("http://") != string::npos) Queue->Uri.replace(0,Mirror.size(), BaseUri); pkgAcqMethod::Fail(Err, Transient); -- cgit v1.2.3 From 661f7b1c727aada703ffbb350d44759189a441fe Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 2 Jun 2010 22:47:49 +0200 Subject: methods/mirror.cc: remove Acquire::Mirror::RefreshInterval (not really useful) --- methods/mirror.cc | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/methods/mirror.cc b/methods/mirror.cc index b9fa55d87..4d767c9f3 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -128,28 +128,6 @@ bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str) if(Debug) clog << "MirrorMethod::DownloadMirrorFile(): " << endl; - // check the file, if it is not older than RefreshInterval just use it - // otherwise try to get a new one - if(FileExists(MirrorFile)) - { - struct stat buf; - time_t t,now,refresh; - if(stat(MirrorFile.c_str(), &buf) != 0) - return false; - t = std::max(buf.st_mtime, buf.st_ctime); - now = time(NULL); - refresh = 60*_config->FindI("Acquire::Mirror::RefreshInterval",360); - if(t + refresh > now) - { - if(Debug) - clog << "Mirror file is in RefreshInterval" << endl; - DownloadedMirrorFile = true; - return true; - } - if(Debug) - clog << "Mirror file " << MirrorFile << " older than " << refresh << "min, re-download it" << endl; - } - // not that great to use pkgAcquire here, but we do not have // any other way right now string fetch = BaseUri; -- cgit v1.2.3 From 0391542729e5e8a2ba9ae9b1d470f252e24eb296 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 2 Jun 2010 23:13:42 +0200 Subject: methods/mirrors.cc: make cycle through the mirrors work properly --- methods/mirror.cc | 55 ++++++++++++++++++++++++++++++++++++++++--------------- methods/mirror.h | 3 ++- 2 files changed, 42 insertions(+), 16 deletions(-) diff --git a/methods/mirror.cc b/methods/mirror.cc index 4d767c9f3..567522478 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -142,13 +142,44 @@ bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str) return res; } -bool MirrorMethod::SelectNextMirror() +/* convert a the Queue->Uri back to the mirror base uri and look + * at all mirrors we have for this, this is needed as queue->uri + * may point to different mirrors (if TryNextMirror() was run) + */ +void MirrorMethod::CurrentQueueUriToMirror() +{ + // already in mirror:// style so nothing to do + if(Queue->Uri.find("mirror://") == 0) + return; + + // find current mirror and select next one + for (int i=0; i < AllMirrors.size(); i++) + { + if (Queue->Uri.find(AllMirrors[i]) == 0) + { + Queue->Uri.replace(0, AllMirrors[i].size(), BaseUri); + return; + } + } + _error->Error("Internal error: Failed to convert %s back to %s", + Queue->Uri, BaseUri); +} + +bool MirrorMethod::TryNextMirror() { if(Debug) cerr << "using mirror: " << Mirror << endl; - Mirror = AllMirrors[0]; - UsedMirror = Mirror; + // find current mirror and select next one + for (int i=0; i < AllMirrors.size()-1; i++) + { + if (Queue->Uri.find(AllMirrors[i]) == 0) + { + Queue->Uri.replace(0, AllMirrors[i].size(), AllMirrors[i+1]); + return true; + } + } + return false; } @@ -176,7 +207,8 @@ bool MirrorMethod::InitMirrors() if (s.size() > 0) AllMirrors.push_back(s); } - SelectNextMirror(); + Mirror = AllMirrors[0]; + UsedMirror = Mirror; return true; } @@ -292,34 +324,27 @@ bool MirrorMethod::Fetch(FetchItem *Itm) void MirrorMethod::Fail(string Err,bool Transient) { // try the next mirror on fail - string old_mirror = Mirror; - if (SelectNextMirror()) - { - Queue->Uri.replace(0, old_mirror.size(), Mirror); + if (TryNextMirror()) return; - } // all mirrors failed, so bail out string s; strprintf(s, _("[Mirror: %s]"), Mirror.c_str()); SetIP(s); - if(Queue->Uri.find("http://") != string::npos) - Queue->Uri.replace(0,Mirror.size(), BaseUri); + CurrentQueueUriToMirror(); pkgAcqMethod::Fail(Err, Transient); } void MirrorMethod::URIStart(FetchResult &Res) { - if(Queue->Uri.find("http://") != string::npos) - Queue->Uri.replace(0,Mirror.size(), BaseUri); + CurrentQueueUriToMirror(); pkgAcqMethod::URIStart(Res); } void MirrorMethod::URIDone(FetchResult &Res,FetchResult *Alt) { - if(Queue->Uri.find("http://") != string::npos) - Queue->Uri.replace(0,Mirror.size(), BaseUri); + CurrentQueueUriToMirror(); pkgAcqMethod::URIDone(Res, Alt); } diff --git a/methods/mirror.h b/methods/mirror.h index 1b506dc87..0a3ea6e92 100644 --- a/methods/mirror.h +++ b/methods/mirror.h @@ -36,7 +36,8 @@ class MirrorMethod : public HttpMethod bool DownloadMirrorFile(string uri); string GetMirrorFileName(string uri); bool InitMirrors(); - bool SelectNextMirror(); + bool TryNextMirror(); + void CurrentQueueUriToMirror(); bool Clean(string dir); // we need to overwrite those to transform the url back -- cgit v1.2.3 From b86f642111954754dd9932ed2f28a9ea85035e87 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 2 Jun 2010 23:15:55 +0200 Subject: methods/mirror.cc: simplify uri.startswith() --- methods/mirror.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/methods/mirror.cc b/methods/mirror.cc index 567522478..cfc155f58 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -106,7 +106,7 @@ bool MirrorMethod::Clean(string Dir) for(I=list.begin(); I != list.end(); I++) { string uri = (*I)->GetURI(); - if(uri.substr(0,strlen("mirror://")) != string("mirror://")) + if(uri.find("mirror://") != 0) continue; string BaseUri = uri.substr(0,uri.size()-1); if (URItoFileName(BaseUri) == Dir->d_name) -- cgit v1.2.3 From 963b16dcebba149ae2c35bd255b34242923fbea0 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 2 Jun 2010 23:30:01 +0200 Subject: implement Fail-Ignore bool in FetchItem that tells the method that a failure of this item is ok and does not need to be tried on all mirrors --- apt-pkg/acquire-item.cc | 7 +++++++ apt-pkg/acquire-item.h | 1 + apt-pkg/acquire-method.cc | 1 + apt-pkg/acquire-method.h | 1 + methods/mirror.cc | 23 +++++++++++------------ 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index a959253bc..3cc2c8717 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -820,6 +820,13 @@ pkgAcqIndexTrans::pkgAcqIndexTrans(pkgAcquire *Owner, string URI,string URIDesc,string ShortDesc) : pkgAcqIndex(Owner, URI, URIDesc, ShortDesc, HashString(), "") { +} + /*}}}*/ +// AcqIndexTrans::Custom600Headers - Insert custom request headers /*{{{*/ +// --------------------------------------------------------------------- +string pkgAcqIndexTrans::Custom600Headers() +{ + return "\nFail-Ignore: true"; } /*}}}*/ // AcqIndexTrans::Failed - Silence failure messages for missing files /*{{{*/ diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index 06fcffc73..3ac8a19e2 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -573,6 +573,7 @@ class pkgAcqIndexTrans : public pkgAcqIndex public: virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf); + virtual string Custom600Headers(); /** \brief Create a pkgAcqIndexTrans. * diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc index 3008c8d1a..6e021a445 100644 --- a/apt-pkg/acquire-method.cc +++ b/apt-pkg/acquire-method.cc @@ -381,6 +381,7 @@ int pkgAcqMethod::Run(bool Single) if (StrToTime(LookupTag(Message,"Last-Modified"),Tmp->LastModified) == false) Tmp->LastModified = 0; Tmp->IndexFile = StringToBool(LookupTag(Message,"Index-File"),false); + Tmp->FailIgnore = StringToBool(LookupTag(Message,"Fail-Ignore"),false); Tmp->Next = 0; // Append it to the list diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h index 99a4605b1..03851e823 100644 --- a/apt-pkg/acquire-method.h +++ b/apt-pkg/acquire-method.h @@ -37,6 +37,7 @@ class pkgAcqMethod string DestFile; time_t LastModified; bool IndexFile; + bool FailIgnore; }; struct FetchResult diff --git a/methods/mirror.cc b/methods/mirror.cc index cfc155f58..ea0fba438 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -162,24 +162,26 @@ void MirrorMethod::CurrentQueueUriToMirror() } } _error->Error("Internal error: Failed to convert %s back to %s", - Queue->Uri, BaseUri); + Queue->Uri.c_str(), BaseUri.c_str()); } bool MirrorMethod::TryNextMirror() { - if(Debug) - cerr << "using mirror: " << Mirror << endl; - // find current mirror and select next one for (int i=0; i < AllMirrors.size()-1; i++) { if (Queue->Uri.find(AllMirrors[i]) == 0) { Queue->Uri.replace(0, AllMirrors[i].size(), AllMirrors[i+1]); + if (Debug) + clog << "TryNextMirror: " << Queue->Uri << endl; return true; } } + if (Debug) + clog << "TryNextMirror could not find another mirror to try" << endl; + return false; } @@ -307,15 +309,12 @@ bool MirrorMethod::Fetch(FetchItem *Itm) return false; } } - if(Debug) - clog << "selected mirror: " << Mirror << endl; + if(Itm->Uri.find("mirror://") != string::npos) + Itm->Uri.replace(0,BaseUri.size(), Mirror); - for (FetchItem *I = Queue; I != 0; I = I->Next) - { - if(I->Uri.find("mirror://") != string::npos) - I->Uri.replace(0,BaseUri.size(), Mirror); - } + if(Debug) + clog << "Fetch: " << Itm->Uri << endl << endl; // now run the real fetcher return HttpMethod::Fetch(Itm); @@ -324,7 +323,7 @@ bool MirrorMethod::Fetch(FetchItem *Itm) void MirrorMethod::Fail(string Err,bool Transient) { // try the next mirror on fail - if (TryNextMirror()) + if (!Queue->FailIgnore && TryNextMirror()) return; // all mirrors failed, so bail out -- cgit v1.2.3 From 2ac9b90b7b3ebeea9a2580b6f317f1dfefc8c8fe Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 2 Jun 2010 23:57:00 +0200 Subject: methods/mirror.cc: debug improvements --- methods/mirror.cc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/methods/mirror.cc b/methods/mirror.cc index ea0fba438..b2b6b2ecf 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -301,7 +301,7 @@ bool MirrorMethod::Fetch(FetchItem *Itm) DownloadMirrorFile(Itm->Uri); } - if(Mirror.empty()) { + if(AllMirrors.empty()) { if(!InitMirrors()) { // no valid mirror selected, something went wrong downloading // from the master mirror site most likely and there is @@ -322,7 +322,14 @@ bool MirrorMethod::Fetch(FetchItem *Itm) void MirrorMethod::Fail(string Err,bool Transient) { - // try the next mirror on fail + // FIXME: TryNextMirror is not ideal for indexfile as we may + // run into auth issues + + if (Debug) + clog << "Failure to get " << Queue->Uri << endl; + + // try the next mirror on fail (if its not a expected failure, + // e.g. translations are ok to ignore) if (!Queue->FailIgnore && TryNextMirror()) return; -- cgit v1.2.3 From e2c66de5c5e63d8400efb0522c31fbe1ec225f93 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 3 Jun 2010 09:22:00 +0200 Subject: * apt-pkg/pkgcache.h: - switch {,Install-}Size to unsigned long long * apt-pkg/depcache.cc: - deal with long long, not with int to remove 2GB Limit (LP: #250909) --- apt-pkg/acquire-item.h | 4 ++-- apt-pkg/deb/deblistparser.cc | 5 ++--- apt-pkg/depcache.cc | 14 +++++++------- apt-pkg/pkgcache.h | 4 ++-- apt-pkg/tagfile.cc | 24 ++++++++++++++++++++++++ apt-pkg/tagfile.h | 1 + debian/changelog | 10 ++++++++++ 7 files changed, 48 insertions(+), 14 deletions(-) diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index b338b2a41..36fc53b92 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -112,10 +112,10 @@ class pkgAcquire::Item : public WeakPointable string ErrorText; /** \brief The size of the object to fetch. */ - unsigned long FileSize; + unsigned long long FileSize; /** \brief How much of the object was already fetched. */ - unsigned long PartialSize; + unsigned long long PartialSize; /** \brief If not \b NULL, contains the name of a subprocess that * is operating on this object (for instance, "gzip" or "gpgv"). diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 0551a5f7c..83c5b8d2e 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -133,10 +133,9 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver) } // Archive Size - Ver->Size = (unsigned)Section.FindI("Size"); - + Ver->Size = Section.FindULL("Size"); // Unpacked Size (in K) - Ver->InstalledSize = (unsigned)Section.FindI("Installed-Size"); + Ver->InstalledSize = Section.FindULL("Installed-Size"); Ver->InstalledSize *= 1024; // Priority diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 411ae5f62..6e0eeab5b 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -422,8 +422,8 @@ void pkgDepCache::AddSizes(const PkgIterator &Pkg,signed long Mult) // Compute the size data if (P.NewInstall() == true) { - iUsrSize += (signed)(Mult*P.InstVerIter(*this)->InstalledSize); - iDownloadSize += (signed)(Mult*P.InstVerIter(*this)->Size); + iUsrSize += (signed long long)(Mult*P.InstVerIter(*this)->InstalledSize); + iDownloadSize += (signed long long)(Mult*P.InstVerIter(*this)->Size); return; } @@ -432,9 +432,9 @@ void pkgDepCache::AddSizes(const PkgIterator &Pkg,signed long Mult) (P.InstallVer != (Version *)Pkg.CurrentVer() || (P.iFlags & ReInstall) == ReInstall) && P.InstallVer != 0) { - iUsrSize += (signed)(Mult*((signed)P.InstVerIter(*this)->InstalledSize - - (signed)Pkg.CurrentVer()->InstalledSize)); - iDownloadSize += (signed)(Mult*P.InstVerIter(*this)->Size); + iUsrSize += (signed long long)(Mult*((signed long long)P.InstVerIter(*this)->InstalledSize - + (signed long long)Pkg.CurrentVer()->InstalledSize)); + iDownloadSize += (signed long long)(Mult*P.InstVerIter(*this)->Size); return; } @@ -442,14 +442,14 @@ void pkgDepCache::AddSizes(const PkgIterator &Pkg,signed long Mult) if (Pkg.State() == pkgCache::PkgIterator::NeedsUnpack && P.Delete() == false) { - iDownloadSize += (signed)(Mult*P.InstVerIter(*this)->Size); + iDownloadSize += (signed long long)(Mult*P.InstVerIter(*this)->Size); return; } // Removing if (Pkg->CurrentVer != 0 && P.InstallVer == 0) { - iUsrSize -= (signed)(Mult*Pkg.CurrentVer()->InstalledSize); + iUsrSize -= (signed long long)(Mult*Pkg.CurrentVer()->InstalledSize); return; } } diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 643f240b0..426bb9f13 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -532,9 +532,9 @@ struct pkgCache::Version /** \brief archive size for this version For Debian this is the size of the .deb file. */ - map_ptrloc Size; // These are the .deb size + unsigned long long Size; // These are the .deb size /** \brief uncompressed size for this version */ - map_ptrloc InstalledSize; + unsigned long long InstalledSize; /** \brief characteristic value representing this version No two packages in existence should have the same VerStr diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index 0d4999ee7..1394d7e24 100644 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@ -365,6 +365,30 @@ signed int pkgTagSection::FindI(const char *Tag,signed long Default) const return Result; } /*}}}*/ +// TagSection::FindULL - Find an unsigned long long integer /*{{{*/ +// --------------------------------------------------------------------- +/* */ +unsigned long long pkgTagSection::FindULL(const char *Tag, unsigned long long const &Default) const +{ + const char *Start; + const char *Stop; + if (Find(Tag,Start,Stop) == false) + return Default; + + // Copy it into a temp buffer so we can use strtoull + char S[100]; + if ((unsigned)(Stop - Start) >= sizeof(S)) + return Default; + strncpy(S,Start,Stop-Start); + S[Stop - Start] = 0; + + char *End; + unsigned long long Result = strtoull(S,&End,10); + if (S == End) + return Default; + return Result; +} + /*}}}*/ // TagSection::FindFlag - Locate a yes/no type flag /*{{{*/ // --------------------------------------------------------------------- /* The bits marked in Flag are masked on/off in Flags */ diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h index f63a51d07..6891c1d81 100644 --- a/apt-pkg/tagfile.h +++ b/apt-pkg/tagfile.h @@ -57,6 +57,7 @@ class pkgTagSection bool Find(const char *Tag,unsigned &Pos) const; string FindS(const char *Tag) const; signed int FindI(const char *Tag,signed long Default = 0) const ; + unsigned long long FindULL(const char *Tag, unsigned long long const &Default = 0) const; bool FindFlag(const char *Tag,unsigned long &Flags, unsigned long Flag) const; bool Scan(const char *Start,unsigned long MaxLength); diff --git a/debian/changelog b/debian/changelog index 3771ca415..e153027b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +apt (0.7.26~exp6) UNRELEASED; urgency=low + + [ David Kalnischkies ] + * apt-pkg/pkgcache.h: + - switch {,Install-}Size to unsigned long long + * apt-pkg/depcache.cc: + - deal with long long, not with int to remove 2GB Limit (LP: #250909) + + -- David Kalnischkies Thu, 03 Jun 2010 09:19:01 +0200 + apt (0.7.26~exp5) experimental; urgency=low [ David Kalnischkies ] -- cgit v1.2.3 From 81305a0b30cc12aa6d32081bbdcf930907ecfbbe Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 3 Jun 2010 09:50:06 +0200 Subject: deprecate AddSize with Multiplier as it is unused and switch to boolean instead to handle the sizes more gracefully. --- apt-pkg/depcache.cc | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++-- apt-pkg/depcache.h | 5 ++-- debian/changelog | 2 ++ 3 files changed, 76 insertions(+), 4 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 6e0eeab5b..786b20ec0 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -407,8 +407,11 @@ bool pkgDepCache::CheckDep(DepIterator Dep,int Type,PkgIterator &Res) /*}}}*/ // DepCache::AddSizes - Add the packages sizes to the counters /*{{{*/ // --------------------------------------------------------------------- -/* Call with Mult = -1 to preform the inverse opration */ -void pkgDepCache::AddSizes(const PkgIterator &Pkg,signed long Mult) +/* Call with Mult = -1 to preform the inverse opration + The Mult increases the complexity of the calulations here and is unused - + or do we really have a usecase for removing the size of a package two + times? So let us replace it with a simple bool and be done with it… */ +__deprecated void pkgDepCache::AddSizes(const PkgIterator &Pkg,signed long Mult) { StateCache &P = PkgState[Pkg->ID]; @@ -454,6 +457,72 @@ void pkgDepCache::AddSizes(const PkgIterator &Pkg,signed long Mult) } } /*}}}*/ +// DepCache::AddSizes - Add the packages sizes to the counters /*{{{*/ +// --------------------------------------------------------------------- +/* Call with Inverse = true to preform the inverse opration */ +void pkgDepCache::AddSizes(const PkgIterator &Pkg, bool const &Inverse) +{ + StateCache &P = PkgState[Pkg->ID]; + + if (Pkg->VersionList == 0) + return; + + if (Pkg.State() == pkgCache::PkgIterator::NeedsConfigure && + P.Keep() == true) + return; + + // Compute the size data + if (P.NewInstall() == true) + { + if (Inverse == false) { + iUsrSize += P.InstVerIter(*this)->InstalledSize; + iDownloadSize += P.InstVerIter(*this)->Size; + } else { + iUsrSize -= P.InstVerIter(*this)->InstalledSize; + iDownloadSize -= P.InstVerIter(*this)->Size; + } + return; + } + + // Upgrading + if (Pkg->CurrentVer != 0 && + (P.InstallVer != (Version *)Pkg.CurrentVer() || + (P.iFlags & ReInstall) == ReInstall) && P.InstallVer != 0) + { + if (Inverse == false) { + iUsrSize -= Pkg.CurrentVer()->InstalledSize; + iUsrSize += P.InstVerIter(*this)->InstalledSize; + iDownloadSize += P.InstVerIter(*this)->Size; + } else { + iUsrSize -= P.InstVerIter(*this)->InstalledSize; + iUsrSize += Pkg.CurrentVer()->InstalledSize; + iDownloadSize -= P.InstVerIter(*this)->Size; + } + return; + } + + // Reinstall + if (Pkg.State() == pkgCache::PkgIterator::NeedsUnpack && + P.Delete() == false) + { + if (Inverse == false) + iDownloadSize += P.InstVerIter(*this)->Size; + else + iDownloadSize -= P.InstVerIter(*this)->Size; + return; + } + + // Removing + if (Pkg->CurrentVer != 0 && P.InstallVer == 0) + { + if (Inverse == false) + iUsrSize -= Pkg.CurrentVer()->InstalledSize; + else + iUsrSize += Pkg.CurrentVer()->InstalledSize; + return; + } +} + /*}}}*/ // DepCache::AddStates - Add the package to the state counter /*{{{*/ // --------------------------------------------------------------------- /* This routine is tricky to use, you must make sure that it is never diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 3decc7a5f..d4258438f 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -321,8 +321,9 @@ class pkgDepCache : protected pkgCache::Namespace void Update(PkgIterator const &P); // Count manipulators - void AddSizes(const PkgIterator &Pkg,signed long Mult = 1); - inline void RemoveSizes(const PkgIterator &Pkg) {AddSizes(Pkg,-1);}; + void AddSizes(const PkgIterator &Pkg, bool const &Invert = false); + inline void RemoveSizes(const PkgIterator &Pkg) {AddSizes(Pkg, true);}; + void AddSizes(const PkgIterator &Pkg,signed long Mult) __deprecated; void AddStates(const PkgIterator &Pkg,int Add = 1); inline void RemoveStates(const PkgIterator &Pkg) {AddStates(Pkg,-1);}; diff --git a/debian/changelog b/debian/changelog index e153027b3..2be956752 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - switch {,Install-}Size to unsigned long long * apt-pkg/depcache.cc: - deal with long long, not with int to remove 2GB Limit (LP: #250909) + - deprecate AddSize with Multiplier as it is unused and switch to + boolean instead to handle the sizes more gracefully. -- David Kalnischkies Thu, 03 Jun 2010 09:19:01 +0200 -- cgit v1.2.3 From a3c4c81afe25377020470ff71c1362136437397c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 3 Jun 2010 10:45:58 +0200 Subject: * apt-pkg/depcache.cc: - switch i{Download,Usr}Size from double to (un)signed long long The biggest reason is that this saves a lot of float point operations we do in AddSizes() on integers. The only reason i see that this was a double is that it was 64bit long and can therefore store bigger values than int/long, but with the availablity of (un)signed long long we are now also at 64bit and can store sizes more than 8 Exabytes big - by the time this will be a limit the C/C++ Standard will have bigger types, hopefully. --- apt-pkg/acquire.cc | 12 ++++++------ apt-pkg/acquire.h | 6 +++--- apt-pkg/depcache.h | 12 +++++++----- debian/changelog | 1 + 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 832eaa02c..63825da93 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -506,9 +506,9 @@ bool pkgAcquire::Clean(string Dir) // Acquire::TotalNeeded - Number of bytes to fetch /*{{{*/ // --------------------------------------------------------------------- /* This is the total number of bytes needed */ -double pkgAcquire::TotalNeeded() +unsigned long long pkgAcquire::TotalNeeded() { - double Total = 0; + unsigned long long Total = 0; for (ItemCIterator I = ItemsBegin(); I != ItemsEnd(); I++) Total += (*I)->FileSize; return Total; @@ -517,9 +517,9 @@ double pkgAcquire::TotalNeeded() // Acquire::FetchNeeded - Number of bytes needed to get /*{{{*/ // --------------------------------------------------------------------- /* This is the number of bytes that is not local */ -double pkgAcquire::FetchNeeded() +unsigned long long pkgAcquire::FetchNeeded() { - double Total = 0; + unsigned long long Total = 0; for (ItemCIterator I = ItemsBegin(); I != ItemsEnd(); I++) if ((*I)->Local == false) Total += (*I)->FileSize; @@ -529,9 +529,9 @@ double pkgAcquire::FetchNeeded() // Acquire::PartialPresent - Number of partial bytes we already have /*{{{*/ // --------------------------------------------------------------------- /* This is the number of bytes that is not local */ -double pkgAcquire::PartialPresent() +unsigned long long pkgAcquire::PartialPresent() { - double Total = 0; + unsigned long long Total = 0; for (ItemCIterator I = ItemsBegin(); I != ItemsEnd(); I++) if ((*I)->Local == false) Total += (*I)->PartialSize; diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h index 8e2c21151..82be8b843 100644 --- a/apt-pkg/acquire.h +++ b/apt-pkg/acquire.h @@ -323,17 +323,17 @@ class pkgAcquire /** \return the total size in bytes of all the items included in * this download. */ - double TotalNeeded(); + unsigned long long TotalNeeded(); /** \return the size in bytes of all non-local items included in * this download. */ - double FetchNeeded(); + unsigned long long FetchNeeded(); /** \return the amount of data to be fetched that is already * present on the filesystem. */ - double PartialPresent(); + unsigned long long PartialPresent(); /** \brief Delayed constructor * diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index d4258438f..c6f245a80 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -286,9 +286,11 @@ class pkgDepCache : protected pkgCache::Namespace pkgCache *Cache; StateCache *PkgState; unsigned char *DepState; - - double iUsrSize; - double iDownloadSize; + + /** Stores the space changes after installation */ + signed long long iUsrSize; + /** Stores how much we need to download to get the packages */ + unsigned long long iDownloadSize; unsigned long iInstCount; unsigned long iDelCount; unsigned long iKeepCount; @@ -452,8 +454,8 @@ class pkgDepCache : protected pkgCache::Namespace bool writeStateFile(OpProgress *prog, bool InstalledOnly=true); // Size queries - inline double UsrSize() {return iUsrSize;}; - inline double DebSize() {return iDownloadSize;}; + inline signed long long UsrSize() {return iUsrSize;}; + inline unsigned long long DebSize() {return iDownloadSize;}; inline unsigned long DelCount() {return iDelCount;}; inline unsigned long KeepCount() {return iKeepCount;}; inline unsigned long InstCount() {return iInstCount;}; diff --git a/debian/changelog b/debian/changelog index 2be956752..97d6abe8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - deal with long long, not with int to remove 2GB Limit (LP: #250909) - deprecate AddSize with Multiplier as it is unused and switch to boolean instead to handle the sizes more gracefully. + - switch i{Download,Usr}Size from double to (un)signed long long -- David Kalnischkies Thu, 03 Jun 2010 09:19:01 +0200 -- cgit v1.2.3 From 3a882565a943644dcf7287c9673fb07f617fb851 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 3 Jun 2010 10:48:19 +0200 Subject: * cmdline/apt-get.cc: - use unsigned long long instead of double to store values it gets --- cmdline/apt-get.cc | 12 ++++++------ debian/changelog | 4 +++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 44235e358..661ca6147 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -837,9 +837,9 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, return false; // Display statistics - double FetchBytes = Fetcher.FetchNeeded(); - double FetchPBytes = Fetcher.PartialPresent(); - double DebBytes = Fetcher.TotalNeeded(); + unsigned long long FetchBytes = Fetcher.FetchNeeded(); + unsigned long long FetchPBytes = Fetcher.PartialPresent(); + unsigned long long DebBytes = Fetcher.TotalNeeded(); if (DebBytes != Cache->DebSize()) { c0out << DebBytes << ',' << Cache->DebSize() << endl; @@ -2362,9 +2362,9 @@ bool DoSource(CommandLine &CmdL) } // Display statistics - double FetchBytes = Fetcher.FetchNeeded(); - double FetchPBytes = Fetcher.PartialPresent(); - double DebBytes = Fetcher.TotalNeeded(); + unsigned long long FetchBytes = Fetcher.FetchNeeded(); + unsigned long long FetchPBytes = Fetcher.PartialPresent(); + unsigned long long DebBytes = Fetcher.TotalNeeded(); // Check for enough free space struct statvfs Buf; diff --git a/debian/changelog b/debian/changelog index 97d6abe8e..cad4bf990 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,10 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - deprecate AddSize with Multiplier as it is unused and switch to boolean instead to handle the sizes more gracefully. - switch i{Download,Usr}Size from double to (un)signed long long + * cmdline/apt-get.cc: + - use unsigned long long instead of double to store values it gets - -- David Kalnischkies Thu, 03 Jun 2010 09:19:01 +0200 + -- David Kalnischkies Thu, 03 Jun 2010 10:46:46 +0200 apt (0.7.26~exp5) experimental; urgency=low -- cgit v1.2.3 From 2e5f4e45f593535e2c88181ff7a9e2d32a5e60f9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 4 Jun 2010 14:43:03 +0200 Subject: * apt-pkg/cachefile.{cc,h}: - split Open() into submethods to be able to build only parts - make the OpProgress optional in the Cache buildprocess --- apt-pkg/cachefile.cc | 50 ++++++++++++++++++++++++++++++++------------- apt-pkg/cachefile.h | 15 ++++++++------ apt-pkg/deb/debindexfile.cc | 18 ++++++++-------- apt-pkg/deb/debindexfile.h | 6 +++--- apt-pkg/indexfile.h | 8 ++++++-- apt-pkg/pkgcachegen.cc | 45 +++++++++++++++++++++++++--------------- apt-pkg/pkgcachegen.h | 10 +++++++-- debian/changelog | 3 +++ 8 files changed, 103 insertions(+), 52 deletions(-) diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc index 790312dc8..b0f8bc424 100644 --- a/apt-pkg/cachefile.cc +++ b/apt-pkg/cachefile.cc @@ -46,7 +46,7 @@ pkgCacheFile::~pkgCacheFile() // CacheFile::BuildCaches - Open and build the cache files /*{{{*/ // --------------------------------------------------------------------- /* */ -bool pkgCacheFile::BuildCaches(OpProgress &Progress,bool WithLock) +bool pkgCacheFile::BuildCaches(OpProgress *Progress, bool WithLock) { const bool ErrorWasEmpty = _error->empty(); if (WithLock == true) @@ -65,8 +65,9 @@ bool pkgCacheFile::BuildCaches(OpProgress &Progress,bool WithLock) return _error->Error(_("The list of sources could not be read.")); // Read the caches - bool Res = pkgMakeStatusCache(List,Progress,&Map,!WithLock); - Progress.Done(); + bool Res = pkgCacheGenerator::MakeStatusCache(List,Progress,&Map,!WithLock); + if (Progress != NULL) + Progress->Done(); if (Res == false) return _error->Error(_("The package lists or status file could not be parsed or opened.")); @@ -80,29 +81,50 @@ bool pkgCacheFile::BuildCaches(OpProgress &Progress,bool WithLock) return true; } /*}}}*/ -// CacheFile::Open - Open the cache files, creating if necessary /*{{{*/ +// CacheFile::BuildPolicy - Open and build all relevant preferences /*{{{*/ // --------------------------------------------------------------------- /* */ -bool pkgCacheFile::Open(OpProgress &Progress,bool WithLock) +bool pkgCacheFile::BuildPolicy(OpProgress *Progress) { - if (BuildCaches(Progress,WithLock) == false) - return false; - - // The policy engine Policy = new pkgPolicy(Cache); if (_error->PendingError() == true) return false; if (ReadPinFile(*Policy) == false || ReadPinDir(*Policy) == false) return false; - - // Create the dependency cache + + return true; +} + /*}}}*/ +// CacheFile::BuildDepCache - Open and build the dependency cache /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool pkgCacheFile::BuildDepCache(OpProgress *Progress) +{ DCache = new pkgDepCache(Cache,Policy); if (_error->PendingError() == true) return false; - - DCache->Init(&Progress); - Progress.Done(); + + DCache->Init(Progress); + return true; +} + /*}}}*/ +// CacheFile::Open - Open the cache files, creating if necessary /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool pkgCacheFile::Open(OpProgress *Progress, bool WithLock) +{ + if (BuildCaches(Progress,WithLock) == false) + return false; + + if (BuildPolicy(Progress) == false) + return false; + + if (BuildDepCache(Progress) == false) + return false; + + if (Progress != NULL) + Progress->Done(); if (_error->PendingError() == true) return false; diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h index 3b057951c..b75a7dbe4 100644 --- a/apt-pkg/cachefile.h +++ b/apt-pkg/cachefile.h @@ -30,11 +30,10 @@ class pkgCacheFile MMap *Map; pkgCache *Cache; pkgDepCache *DCache; - + pkgPolicy *Policy; + public: - pkgPolicy *Policy; - // We look pretty much exactly like a pointer to a dep cache inline operator pkgCache &() {return *Cache;}; inline operator pkgCache *() {return Cache;}; @@ -45,12 +44,16 @@ class pkgCacheFile inline pkgDepCache::StateCache &operator [](pkgCache::PkgIterator const &I) {return (*DCache)[I];}; inline unsigned char &operator [](pkgCache::DepIterator const &I) {return (*DCache)[I];}; - bool BuildCaches(OpProgress &Progress,bool WithLock = true); - bool Open(OpProgress &Progress,bool WithLock = true); + bool BuildCaches(OpProgress *Progress = NULL,bool WithLock = true); + __deprecated bool BuildCaches(OpProgress &Progress,bool const &WithLock = true) { return BuildCaches(&Progress, WithLock); }; + bool BuildPolicy(OpProgress *Progress = NULL); + bool BuildDepCache(OpProgress *Progress = NULL); + bool Open(OpProgress *Progress = NULL, bool WithLock = true); + __deprecated bool Open(OpProgress &Progress,bool const &WithLock = true) { return Open(&Progress, WithLock); }; void Close(); pkgCacheFile(); - ~pkgCacheFile(); + virtual ~pkgCacheFile(); }; #endif diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index b89429d86..6d9e99497 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -262,15 +262,15 @@ unsigned long debPackagesIndex::Size() const // PackagesIndex::Merge - Load the index file into a cache /*{{{*/ // --------------------------------------------------------------------- /* */ -bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const +bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const { string PackageFile = IndexFile("Packages"); FileFd Pkg(PackageFile,FileFd::ReadOnly); debListParser Parser(&Pkg, Architecture); if (_error->PendingError() == true) return _error->Error("Problem opening %s",PackageFile.c_str()); - - Prog.SubProgress(0,Info("Packages")); + if (Prog != NULL) + Prog->SubProgress(0,Info("Packages")); ::URI Tmp(URI); if (Gen.SelectFile(PackageFile,Tmp.Host,*this) == false) return _error->Error("Problem with SelectFile %s",PackageFile.c_str()); @@ -445,7 +445,7 @@ unsigned long debTranslationsIndex::Size() const // TranslationsIndex::Merge - Load the index file into a cache /*{{{*/ // --------------------------------------------------------------------- /* */ -bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const +bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const { // Check the translation file, if in use string TranslationFile = IndexFile(Language); @@ -456,7 +456,8 @@ bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const if (_error->PendingError() == true) return false; - Prog.SubProgress(0, Info(TranslationFile.c_str())); + if (Prog != NULL) + Prog->SubProgress(0, Info(TranslationFile.c_str())); if (Gen.SelectFile(TranslationFile,string(),*this) == false) return _error->Error("Problem with SelectFile %s",TranslationFile.c_str()); @@ -529,7 +530,7 @@ unsigned long debStatusIndex::Size() const // StatusIndex::Merge - Load the index file into a cache /*{{{*/ // --------------------------------------------------------------------- /* */ -bool debStatusIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const +bool debStatusIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const { FileFd Pkg(File,FileFd::ReadOnly); if (_error->PendingError() == true) @@ -537,8 +538,9 @@ bool debStatusIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const debListParser Parser(&Pkg); if (_error->PendingError() == true) return false; - - Prog.SubProgress(0,File); + + if (Prog != NULL) + Prog->SubProgress(0,File); if (Gen.SelectFile(File,string(),*this,pkgCache::Flag::NotSource) == false) return _error->Error("Problem with SelectFile %s",File.c_str()); diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h index 766e8b214..b5085992d 100644 --- a/apt-pkg/deb/debindexfile.h +++ b/apt-pkg/deb/debindexfile.h @@ -35,7 +35,7 @@ class debStatusIndex : public pkgIndexFile virtual bool Exists() const; virtual bool HasPackages() const {return true;}; virtual unsigned long Size() const; - virtual bool Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const; + virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const; virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const; debStatusIndex(string File); @@ -67,7 +67,7 @@ class debPackagesIndex : public pkgIndexFile virtual bool Exists() const; virtual bool HasPackages() const {return true;}; virtual unsigned long Size() const; - virtual bool Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const; + virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const; virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const; debPackagesIndex(string const &URI, string const &Dist, string const &Section, @@ -99,7 +99,7 @@ class debTranslationsIndex : public pkgIndexFile virtual bool Exists() const; virtual bool HasPackages() const; virtual unsigned long Size() const; - virtual bool Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const; + virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const; virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const; debTranslationsIndex(string URI,string Dist,string Section, char const * const Language); diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h index 3cc501629..2b5ae6342 100644 --- a/apt-pkg/indexfile.h +++ b/apt-pkg/indexfile.h @@ -74,8 +74,12 @@ class pkgIndexFile virtual bool Exists() const = 0; virtual bool HasPackages() const = 0; virtual unsigned long Size() const = 0; - virtual bool Merge(pkgCacheGenerator &/*Gen*/,OpProgress &/*Prog*/) const {return false;}; - virtual bool MergeFileProvides(pkgCacheGenerator &/*Gen*/,OpProgress &/*Prog*/) const {return true;}; + virtual bool Merge(pkgCacheGenerator &/*Gen*/,OpProgress* /*Prog*/) const { return false; }; + __deprecated virtual bool Merge(pkgCacheGenerator &Gen, OpProgress &Prog) const + { return Merge(Gen, &Prog); }; + virtual bool MergeFileProvides(pkgCacheGenerator &/*Gen*/,OpProgress* /*Prog*/) const {return true;}; + __deprecated virtual bool MergeFileProvides(pkgCacheGenerator &Gen, OpProgress &Prog) const + {return MergeFileProvides(Gen, &Prog);}; virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const; static bool TranslationsAvailable(); diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index d96d3370f..5649cd6f8 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -526,7 +526,7 @@ map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc, // CacheGenerator::FinishCache - do various finish operations /*{{{*/ // --------------------------------------------------------------------- /* This prepares the Cache for delivery */ -bool pkgCacheGenerator::FinishCache(OpProgress &Progress) +bool pkgCacheGenerator::FinishCache(OpProgress *Progress) { // FIXME: add progress reporting for this operation // Do we have different architectures in your groups ? @@ -923,7 +923,7 @@ static unsigned long ComputeSize(FileIterator Start,FileIterator End) // --------------------------------------------------------------------- /* */ static bool BuildCache(pkgCacheGenerator &Gen, - OpProgress &Progress, + OpProgress *Progress, unsigned long &CurrentSize,unsigned long TotalSize, FileIterator Start, FileIterator End) { @@ -944,7 +944,8 @@ static bool BuildCache(pkgCacheGenerator &Gen, } unsigned long Size = (*I)->Size(); - Progress.OverallProgress(CurrentSize,TotalSize,Size,_("Reading package lists")); + if (Progress != NULL) + Progress->OverallProgress(CurrentSize,TotalSize,Size,_("Reading package lists")); CurrentSize += Size; if ((*I)->Merge(Gen,Progress) == false) @@ -953,13 +954,15 @@ static bool BuildCache(pkgCacheGenerator &Gen, if (Gen.HasFileDeps() == true) { - Progress.Done(); + if (Progress != NULL) + Progress->Done(); TotalSize = ComputeSize(Start, End); CurrentSize = 0; for (I = Start; I != End; I++) { unsigned long Size = (*I)->Size(); - Progress.OverallProgress(CurrentSize,TotalSize,Size,_("Collecting File Provides")); + if (Progress != NULL) + Progress->OverallProgress(CurrentSize,TotalSize,Size,_("Collecting File Provides")); CurrentSize += Size; if ((*I)->MergeFileProvides(Gen,Progress) == false) return false; @@ -969,7 +972,7 @@ static bool BuildCache(pkgCacheGenerator &Gen, return true; } /*}}}*/ -// MakeStatusCache - Construct the status cache /*{{{*/ +// CacheGenerator::MakeStatusCache - Construct the status cache /*{{{*/ // --------------------------------------------------------------------- /* This makes sure that the status cache (the cache that has all index files from the sources list and all local ones) is ready @@ -977,7 +980,10 @@ static bool BuildCache(pkgCacheGenerator &Gen, the cache will be stored there. This is pretty much mandetory if you are using AllowMem. AllowMem lets the function be run as non-root where it builds the cache 'fast' into a memory buffer. */ -bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, +__deprecated bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, + MMap **OutMap, bool AllowMem) + { return pkgCacheGenerator::MakeStatusCache(List, &Progress, OutMap, AllowMem); } +bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress, MMap **OutMap,bool AllowMem) { bool const Debug = _config->FindB("Debug::pkgCacheGen", false); @@ -1028,13 +1034,15 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, if (Writeable == false && AllowMem == false && CacheFile.empty() == false) return _error->Error(_("Unable to write to %s"),flNotFile(CacheFile).c_str()); - - Progress.OverallProgress(0,1,1,_("Reading package lists")); - + + if (Progress != NULL) + Progress->OverallProgress(0,1,1,_("Reading package lists")); + // Cache is OK, Fin. if (CheckValidity(CacheFile,Files.begin(),Files.end(),OutMap) == true) { - Progress.OverallProgress(1,1,1,_("Reading package lists")); + if (Progress != NULL) + Progress->OverallProgress(1,1,1,_("Reading package lists")); if (Debug == true) std::clog << "pkgcache.bin is valid - no need to build anything" << std::endl; return true; @@ -1084,7 +1092,7 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, TotalSize = ComputeSize(Files.begin()+EndOfSource,Files.end()); // Build the status cache - pkgCacheGenerator Gen(Map.Get(),&Progress); + pkgCacheGenerator Gen(Map.Get(),Progress); if (_error->PendingError() == true) return false; if (BuildCache(Gen,Progress,CurrentSize,TotalSize, @@ -1101,7 +1109,7 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, TotalSize = ComputeSize(Files.begin(),Files.end()); // Build the source cache - pkgCacheGenerator Gen(Map.Get(),&Progress); + pkgCacheGenerator Gen(Map.Get(),Progress); if (_error->PendingError() == true) return false; if (BuildCache(Gen,Progress,CurrentSize,TotalSize, @@ -1160,10 +1168,12 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, return true; } /*}}}*/ -// MakeOnlyStatusCache - Build a cache with just the status files /*{{{*/ +// CacheGenerator::MakeOnlyStatusCache - Build only a status files cache/*{{{*/ // --------------------------------------------------------------------- /* */ -bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap) +__deprecated bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap) + { return pkgCacheGenerator::MakeOnlyStatusCache(&Progress, OutMap); } +bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap) { unsigned long MapSize = _config->FindI("APT::Cache-Limit",20*1024*1024); vector Files; @@ -1178,8 +1188,9 @@ bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap) TotalSize = ComputeSize(Files.begin()+EndOfSource,Files.end()); // Build the status cache - Progress.OverallProgress(0,1,1,_("Reading package lists")); - pkgCacheGenerator Gen(Map.Get(),&Progress); + if (Progress != NULL) + Progress->OverallProgress(0,1,1,_("Reading package lists")); + pkgCacheGenerator Gen(Map.Get(),Progress); if (_error->PendingError() == true) return false; if (BuildCache(Gen,Progress,CurrentSize,TotalSize, diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index 46d0cd893..ff0941e0c 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -76,7 +76,11 @@ class pkgCacheGenerator /*{{{*/ bool HasFileDeps() {return FoundFileDeps;}; bool MergeFileProvides(ListParser &List); - bool FinishCache(OpProgress &Progress); + bool FinishCache(OpProgress *Progress); + + static bool MakeStatusCache(pkgSourceList &List,OpProgress *Progress, + MMap **OutMap = 0,bool AllowMem = false); + static bool MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap); pkgCacheGenerator(DynamicMMap *Map,OpProgress *Progress); ~pkgCacheGenerator(); @@ -134,10 +138,12 @@ class pkgCacheGenerator::ListParser virtual ~ListParser() {}; }; /*}}}*/ + bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, MMap **OutMap = 0,bool AllowMem = false); bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap); + #ifdef APT_COMPATIBILITY #if APT_COMPATIBILITY != 986 #warning "Using APT_COMPATIBILITY" @@ -145,7 +151,7 @@ bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap); MMap *pkgMakeStatusCacheMem(pkgSourceList &List,OpProgress &Progress) { MMap *Map = 0; - if (pkgMakeStatusCache(List,Progress,&Map,true) == false) + if (pkgCacheGenerator::MakeStatusCache(List,&Progress,&Map,true) == false) return 0; return Map; } diff --git a/debian/changelog b/debian/changelog index 994be2bbc..097916d1e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,9 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - get the best matching arch package from a group with FindPreferredPkg * cmdline/apt-cache.cc: - make the search multiarch compatible by using GrpIterator instead + * apt-pkg/cachefile.{cc,h}: + - split Open() into submethods to be able to build only parts + - make the OpProgress optional in the Cache buildprocess -- David Kalnischkies Mon, 31 May 2010 22:36:35 +0200 -- cgit v1.2.3 From ea4b220b1b17b270fc1a05e454439c32589548b7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 4 Jun 2010 14:51:21 +0200 Subject: Switch away from the now deprecated methods for Cache building --- apt-inst/deb/dpkgdb.cc | 2 +- cmdline/apt-extracttemplates.cc | 3 +-- cmdline/apt-get.cc | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/apt-inst/deb/dpkgdb.cc b/apt-inst/deb/dpkgdb.cc index e51e4f8b3..a75cf59ca 100644 --- a/apt-inst/deb/dpkgdb.cc +++ b/apt-inst/deb/dpkgdb.cc @@ -142,7 +142,7 @@ bool debDpkgDB::ReadyPkgCache(OpProgress &Progress) CacheMap = 0; } - if (pkgMakeOnlyStatusCache(Progress,&CacheMap) == false) + if (pkgCacheGenerator::MakeOnlyStatusCache(&Progress,&CacheMap) == false) return false; Cache->DropProgress(); diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc index 21ef1a050..07bc0c25d 100644 --- a/cmdline/apt-extracttemplates.cc +++ b/cmdline/apt-extracttemplates.cc @@ -296,8 +296,7 @@ bool Go(CommandLine &CmdL) MMap *Map = 0; pkgSourceList List; List.ReadMainList(); - OpProgress Prog; - pkgMakeStatusCache(List,Prog,&Map,true); + pkgCacheGenerator::MakeStatusCache(List,NULL,&Map,true); if (Map == 0) return false; DebFile::Cache = new pkgCache(Map); diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 9894747f4..c70dd56ac 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -91,14 +91,14 @@ class CacheFile : public pkgCacheFile bool BuildCaches(bool WithLock = true) { OpTextProgress Prog(*_config); - if (pkgCacheFile::BuildCaches(Prog,WithLock) == false) + if (pkgCacheFile::BuildCaches(&Prog,WithLock) == false) return false; return true; } bool Open(bool WithLock = true) { OpTextProgress Prog(*_config); - if (pkgCacheFile::Open(Prog,WithLock) == false) + if (pkgCacheFile::Open(&Prog,WithLock) == false) return false; Sort(); -- cgit v1.2.3 From 3f8621c5effb167a51944b86334867e2fe8fedb3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 4 Jun 2010 22:58:57 +0200 Subject: store also the SourceList we use internally for export --- apt-pkg/cachefile.cc | 58 +++++++++++++++++++++++++++++++++++++++++----------- apt-pkg/cachefile.h | 15 +++++++++++++- debian/changelog | 1 + 3 files changed, 61 insertions(+), 13 deletions(-) diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc index b0f8bc424..01598386c 100644 --- a/apt-pkg/cachefile.cc +++ b/apt-pkg/cachefile.cc @@ -27,7 +27,8 @@ // CacheFile::CacheFile - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -pkgCacheFile::pkgCacheFile() : Map(0), Cache(0), DCache(0), Policy(0) +pkgCacheFile::pkgCacheFile() : Map(NULL), Cache(NULL), DCache(NULL), + Policy(NULL), SrcList(NULL) { } /*}}}*/ @@ -38,16 +39,30 @@ pkgCacheFile::~pkgCacheFile() { delete DCache; delete Policy; + delete SrcList; delete Cache; delete Map; _system->UnLock(true); -} +} /*}}}*/ // CacheFile::BuildCaches - Open and build the cache files /*{{{*/ // --------------------------------------------------------------------- /* */ bool pkgCacheFile::BuildCaches(OpProgress *Progress, bool WithLock) { + if (Cache != NULL) + return true; + + if (_config->FindB("pkgCacheFile::Generate", true) == false) + { + Map = new MMap(*new FileFd(_config->FindFile("Dir::Cache::pkgcache"), + FileFd::ReadOnly),MMap::Public|MMap::ReadOnly); + Cache = new pkgCache(Map); + if (_error->PendingError() == true) + return false; + return true; + } + const bool ErrorWasEmpty = _error->empty(); if (WithLock == true) if (_system->Lock() == false) @@ -58,14 +73,11 @@ bool pkgCacheFile::BuildCaches(OpProgress *Progress, bool WithLock) if (_error->PendingError() == true) return false; - - // Read the source list - pkgSourceList List; - if (List.ReadMainList() == false) - return _error->Error(_("The list of sources could not be read.")); + + BuildSourceList(Progress); // Read the caches - bool Res = pkgCacheGenerator::MakeStatusCache(List,Progress,&Map,!WithLock); + bool Res = pkgCacheGenerator::MakeStatusCache(*SrcList,Progress,&Map,!WithLock); if (Progress != NULL) Progress->Done(); if (Res == false) @@ -81,11 +93,28 @@ bool pkgCacheFile::BuildCaches(OpProgress *Progress, bool WithLock) return true; } /*}}}*/ +// CacheFile::BuildSourceList - Open and build all relevant sources.list/*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool pkgCacheFile::BuildSourceList(OpProgress *Progress) +{ + if (SrcList != NULL) + return true; + + SrcList = new pkgSourceList(); + if (SrcList->ReadMainList() == false) + return _error->Error(_("The list of sources could not be read.")); + return true; +} + /*}}}*/ // CacheFile::BuildPolicy - Open and build all relevant preferences /*{{{*/ // --------------------------------------------------------------------- /* */ bool pkgCacheFile::BuildPolicy(OpProgress *Progress) { + if (Policy != NULL) + return true; + Policy = new pkgPolicy(Cache); if (_error->PendingError() == true) return false; @@ -101,6 +130,9 @@ bool pkgCacheFile::BuildPolicy(OpProgress *Progress) /* */ bool pkgCacheFile::BuildDepCache(OpProgress *Progress) { + if (DCache != NULL) + return true; + DCache = new pkgDepCache(Cache,Policy); if (_error->PendingError() == true) return false; @@ -139,12 +171,14 @@ void pkgCacheFile::Close() delete DCache; delete Policy; delete Cache; + delete SrcList; delete Map; _system->UnLock(true); - Map = 0; - DCache = 0; - Policy = 0; - Cache = 0; + Map = NULL; + DCache = NULL; + Policy = NULL; + Cache = NULL; + SrcList = NULL; } /*}}}*/ diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h index b75a7dbe4..1647aff8e 100644 --- a/apt-pkg/cachefile.h +++ b/apt-pkg/cachefile.h @@ -23,6 +23,7 @@ #include class pkgPolicy; +class pkgSourceList; class pkgCacheFile { protected: @@ -31,6 +32,7 @@ class pkgCacheFile pkgCache *Cache; pkgDepCache *DCache; pkgPolicy *Policy; + pkgSourceList *SrcList; public: @@ -39,6 +41,10 @@ class pkgCacheFile inline operator pkgCache *() {return Cache;}; inline operator pkgDepCache &() {return *DCache;}; inline operator pkgDepCache *() {return DCache;}; + inline operator pkgPolicy &() {return *Policy;}; + inline operator pkgPolicy *() {return Policy;}; + inline operator pkgSourceList &() {return *SrcList;}; + inline operator pkgSourceList *() {return SrcList;}; inline pkgDepCache *operator ->() {return DCache;}; inline pkgDepCache &operator *() {return *DCache;}; inline pkgDepCache::StateCache &operator [](pkgCache::PkgIterator const &I) {return (*DCache)[I];}; @@ -46,12 +52,19 @@ class pkgCacheFile bool BuildCaches(OpProgress *Progress = NULL,bool WithLock = true); __deprecated bool BuildCaches(OpProgress &Progress,bool const &WithLock = true) { return BuildCaches(&Progress, WithLock); }; + bool BuildSourceList(OpProgress *Progress = NULL); bool BuildPolicy(OpProgress *Progress = NULL); bool BuildDepCache(OpProgress *Progress = NULL); bool Open(OpProgress *Progress = NULL, bool WithLock = true); + inline bool ReadOnlyOpen(OpProgress *Progress = NULL) { return Open(Progress, false); }; __deprecated bool Open(OpProgress &Progress,bool const &WithLock = true) { return Open(&Progress, WithLock); }; void Close(); - + + inline pkgCache* GetPkgCache() { BuildCaches(NULL, false); return Cache; }; + inline pkgDepCache* GetDepCache() { BuildDepCache(); return DCache; }; + inline pkgPolicy* GetPolicy() { BuildPolicy(); return Policy; }; + inline pkgSourceList* GetSourceList() { BuildSourceList(); return SrcList; }; + pkgCacheFile(); virtual ~pkgCacheFile(); }; diff --git a/debian/changelog b/debian/changelog index 097916d1e..9001e91a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low * apt-pkg/cachefile.{cc,h}: - split Open() into submethods to be able to build only parts - make the OpProgress optional in the Cache buildprocess + - store also the SourceList we use internally for export -- David Kalnischkies Mon, 31 May 2010 22:36:35 +0200 -- cgit v1.2.3 From 856d3b06a6eb6a7f455294c69fc13604e099fd56 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 5 Jun 2010 09:20:29 +0200 Subject: Add a method to get a VersionSet from the Commandline and refactor the existing methods a bit to reuse them easier intern --- apt-pkg/cacheset.cc | 140 +++++++++++++++++++++++++++++++++++++++++++++------- apt-pkg/cacheset.h | 74 +++++++++++++++++++++++++-- 2 files changed, 191 insertions(+), 23 deletions(-) diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index b49b36539..7372c909e 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -13,6 +13,7 @@ #include #include #include +#include #include @@ -22,7 +23,7 @@ /*}}}*/ namespace APT { // FromRegEx - Return all packages in the cache matching a pattern /*{{{*/ -PackageSet PackageSet::FromRegEx(pkgCache &Cache, std::string pattern, std::ostream &out) { +PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, std::ostream &out) { PackageSet pkgset; std::string arch = "native"; static const char * const isregex = ".?+*|[^$"; @@ -48,7 +49,7 @@ PackageSet PackageSet::FromRegEx(pkgCache &Cache, std::string pattern, std::ostr return pkgset; } - for (pkgCache::GrpIterator Grp = Cache.GrpBegin(); Grp.end() == false; ++Grp) + for (pkgCache::GrpIterator Grp = Cache.GetPkgCache()->GrpBegin(); Grp.end() == false; ++Grp) { if (regexec(&Pattern, Grp.Name(), 0, 0, 0) != 0) continue; @@ -76,28 +77,129 @@ PackageSet PackageSet::FromRegEx(pkgCache &Cache, std::string pattern, std::ostr } /*}}}*/ // FromCommandLine - Return all packages specified on commandline /*{{{*/ -PackageSet PackageSet::FromCommandLine(pkgCache &Cache, const char **cmdline, std::ostream &out) { +PackageSet PackageSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, std::ostream &out) { PackageSet pkgset; for (const char **I = cmdline + 1; *I != 0; I++) { - pkgCache::PkgIterator Pkg = Cache.FindPkg(*I); - if (Pkg.end() == true) { - std::vector archs = APT::Configuration::getArchitectures(); - for (std::vector::const_iterator a = archs.begin(); - a != archs.end() || Pkg.end() != true; ++a) { - Pkg = Cache.FindPkg(*I, *a); - } - if (Pkg.end() == true) { - PackageSet regex = FromRegEx(Cache, *I, out); - if (regex.empty() == true) - _error->Warning(_("Unable to locate package %s"),*I); - else - pkgset.insert(regex.begin(), regex.end()); - continue; + PackageSet pset = FromString(Cache, *I, out); + pkgset.insert(pset.begin(), pset.end()); + } + return pkgset; +} + /*}}}*/ +// FromString - Return all packages matching a specific string /*{{{*/ +PackageSet PackageSet::FromString(pkgCacheFile &Cache, const char * const str, std::ostream &out) { + pkgCache::GrpIterator Grp = Cache.GetPkgCache()->FindGrp(str); + if (Grp.end() == false) { + pkgCache::PkgIterator Pkg = Grp.FindPreferredPkg(); + PackageSet pkgset; + pkgset.insert(Pkg); + return pkgset; + } + PackageSet regex = FromRegEx(Cache, str, out); + if (regex.empty() == true) + _error->Warning(_("Unable to locate package %s"), str); + return regex; +} + /*}}}*/ +// FromCommandLine - Return all versions specified on commandline /*{{{*/ +APT::VersionSet VersionSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, + APT::VersionSet::Version const &fallback, std::ostream &out) { + VersionSet verset; + for (const char **I = cmdline + 1; *I != 0; I++) { + std::string pkg = *I; + std::string ver; + bool verIsRel = false; + size_t const vertag = pkg.find_last_of("/="); + if (vertag != string::npos) { + ver = pkg.substr(vertag+1); + verIsRel = (pkg[vertag] == '/'); + pkg.erase(vertag); + } + PackageSet pkgset = PackageSet::FromString(Cache, pkg.c_str(), out); + for (PackageSet::const_iterator P = pkgset.begin(); + P != pkgset.end(); ++P) { + if (vertag != string::npos) { + pkgVersionMatch Match(ver, (verIsRel == true ? pkgVersionMatch::Release : + pkgVersionMatch::Version)); + pkgCache::VerIterator V = Match.Find(P); + if (V.end() == true) { + if (verIsRel == true) + _error->Error(_("Release '%s' for '%s' was not found"), + ver.c_str(), P.FullName(true).c_str()); + else + _error->Error(_("Version '%s' for '%s' was not found"), + ver.c_str(), P.FullName(true).c_str()); + continue; + } + if (strcmp(ver.c_str(), V.VerStr()) != 0) + ioprintf(out, _("Selected version %s (%s) for %s\n"), + V.VerStr(), V.RelStr().c_str(), P.FullName(true).c_str()); + verset.insert(V); + } else { + pkgCache::VerIterator V; + switch(fallback) { + case VersionSet::ALL: + for (V = P.VersionList(); V.end() != true; ++V) + verset.insert(V); + break; + case VersionSet::CANDANDINST: + verset.insert(getInstalledVer(Cache, P)); + verset.insert(getCandidateVer(Cache, P)); + break; + case VersionSet::CANDIDATE: + verset.insert(getCandidateVer(Cache, P)); + break; + case VersionSet::INSTALLED: + verset.insert(getInstalledVer(Cache, P)); + break; + case VersionSet::CANDINST: + V = getCandidateVer(Cache, P, true); + if (V.end() == true) + V = getInstalledVer(Cache, P, true); + if (V.end() == false) + verset.insert(V); + else + _error->Error(_("Can't select installed nor candidate version from package %s as it has neither of them"), P.FullName(true).c_str()); + break; + case VersionSet::INSTCAND: + V = getInstalledVer(Cache, P, true); + if (V.end() == true) + V = getCandidateVer(Cache, P, true); + if (V.end() == false) + verset.insert(V); + else + _error->Error(_("Can't select installed nor candidate version from package %s as it has neither of them"), P.FullName(true).c_str()); + break; + case VersionSet::NEWEST: + if (P->VersionList != 0) + verset.insert(P.VersionList()); + else + _error->Error(_("Can't select newest version from package %s as it is purely virtual"), P.FullName(true).c_str()); + break; + } } } - pkgset.insert(Pkg); } - return pkgset; + return verset; +} + /*}}}*/ +// getCandidateVer - Returns the candidate version of the given package /*{{{*/ +pkgCache::VerIterator VersionSet::getCandidateVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg, bool const &AllowError) { + if (unlikely(Cache.BuildDepCache() == false)) + return pkgCache::VerIterator(*Cache); + pkgCache::VerIterator Cand = Cache[Pkg].InstVerIter(Cache); + if (AllowError == false && Cand.end() == true) + _error->Error(_("Can't select candidate version from package %s as it has no candidate"), Pkg.FullName(true).c_str()); + return Cand; +} + /*}}}*/ +// getInstalledVer - Returns the installed version of the given package /*{{{*/ +pkgCache::VerIterator VersionSet::getInstalledVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg, bool const &AllowError) { + if (AllowError == false && Pkg->CurrentVer == 0) + _error->Error(_("Can't select installed version from package %s as it is not installed"), Pkg.FullName(true).c_str()); + return Pkg.CurrentVer(); } /*}}}*/ } diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index f0131bfed..708531b4a 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -14,6 +14,7 @@ #include #include +#include #include /*}}}*/ namespace APT { @@ -68,12 +69,23 @@ public: /*{{{*/ \param Cache the packages are in \param pattern regular expression for package names \param out stream to print the notice to */ - static APT::PackageSet FromRegEx(pkgCache &Cache, std::string pattern, std::ostream &out); - static APT::PackageSet FromRegEx(pkgCache &Cache, std::string const &pattern) { + static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string pattern, std::ostream &out); + static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string const &pattern) { std::ostream out (std::ofstream("/dev/null").rdbuf()); return APT::PackageSet::FromRegEx(Cache, pattern, out); } + /** \brief returns all packages specified by a string + + \param Cache the packages are in + \param string String the package name(s) should be extracted from + \param out stream to print various notices to */ + static APT::PackageSet FromString(pkgCacheFile &Cache, const char * const string, std::ostream &out); + static APT::PackageSet FromString(pkgCacheFile &Cache, const char * const string) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::PackageSet::FromString(Cache, string, out); + } + /** \brief returns all packages specified on the commandline Get all package names from the commandline and executes regex's if needed. @@ -81,8 +93,8 @@ public: /*{{{*/ \param Cache the packages are in \param cmdline Command line the package names should be extracted from \param out stream to print various notices to */ - static APT::PackageSet FromCommandLine(pkgCache &Cache, const char **cmdline, std::ostream &out); - static APT::PackageSet FromCommandLine(pkgCache &Cache, const char **cmdline) { + static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, std::ostream &out); + static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { std::ostream out (std::ofstream("/dev/null").rdbuf()); return APT::PackageSet::FromCommandLine(Cache, cmdline, out); } @@ -133,6 +145,60 @@ public: /*{{{*/ // 103. set::iterator is required to be modifiable, but this allows modification of keys typedef typename APT::VersionSet::const_iterator iterator; + /** \brief specifies which version(s) will be returned if non is given */ + enum Version { + /** All versions */ + ALL, + /** Candidate and installed version */ + CANDANDINST, + /** Candidate version */ + CANDIDATE, + /** Installed version */ + INSTALLED, + /** Candidate or if non installed version */ + CANDINST, + /** Installed or if non candidate version */ + INSTCAND, + /** Newest version */ + NEWEST + }; + + /** \brief returns all versions specified on the commandline + + Get all versions from the commandline, uses given default version if + non specifically requested and executes regex's if needed on names. + \param Cache the packages and versions are in + \param cmdline Command line the versions should be extracted from + \param out stream to print various notices to */ + static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, + APT::VersionSet::Version const &fallback, std::ostream &out); + static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, + APT::VersionSet::Version const &fallback) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::VersionSet::FromCommandLine(Cache, cmdline, fallback, out); + } + static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { + return APT::VersionSet::FromCommandLine(Cache, cmdline, CANDINST); + } + /*}}}*/ +protected: /*{{{*/ + + /** \brief returns the candidate version of the package + + \param Cache to be used to query for information + \param Pkg we want the candidate version from this package + \param AllowError add an error to the stack if not */ + static pkgCache::VerIterator getCandidateVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg, bool const &AllowError = false); + + /** \brief returns the installed version of the package + + \param Cache to be used to query for information + \param Pkg we want the installed version from this package + \param AllowError add an error to the stack if not */ + static pkgCache::VerIterator getInstalledVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg, bool const &AllowError = false); + /*}}}*/ }; /*}}}*/ } -- cgit v1.2.3 From d9eb210edda5515ca467eb234dd58b60d43c4513 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 5 Jun 2010 10:04:48 +0200 Subject: use pkgCacheFile and the new CacheSets all over the place --- cmdline/apt-cache.cc | 399 +++++++++++++++++++++++++-------------------------- debian/changelog | 1 + 2 files changed, 195 insertions(+), 205 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 891b10873..227fda4be 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -46,9 +46,6 @@ using namespace std; -pkgCache *GCache = 0; -pkgSourceList *SrcList = 0; - // LocalitySort - Sort a version list by package file locality /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -86,10 +83,13 @@ void LocalitySort(pkgCache::DescFile **begin, /* */ bool UnMet(CommandLine &CmdL) { - pkgCache &Cache = *GCache; - bool Important = _config->FindB("APT::Cache::Important",false); - - for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++) + bool const Important = _config->FindB("APT::Cache::Important",false); + + pkgCacheFile CacheFile; + if (unlikely(CacheFile.GetPkgCache() == NULL)) + return false; + + for (pkgCache::PkgIterator P = CacheFile.GetPkgCache()->PkgBegin(); P.end() == false; P++) { for (pkgCache::VerIterator V = P.VersionList(); V.end() == false; V++) { @@ -174,9 +174,9 @@ bool UnMet(CommandLine &CmdL) // --------------------------------------------------------------------- /* */ bool DumpPackage(CommandLine &CmdL) -{ - pkgCache &Cache = *GCache; - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(Cache, CmdL.FileList); +{ + pkgCacheFile CacheFile; + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList); for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { @@ -239,18 +239,22 @@ bool DumpPackage(CommandLine &CmdL) /* */ bool Stats(CommandLine &Cmd) { - pkgCache &Cache = *GCache; - cout << _("Total package names: ") << Cache.Head().GroupCount << " (" << - SizeToStr(Cache.Head().GroupCount*Cache.Head().GroupSz) << ')' << endl - << _("Total package structures: ") << Cache.Head().PackageCount << " (" << - SizeToStr(Cache.Head().PackageCount*Cache.Head().PackageSz) << ')' << endl; + pkgCacheFile CacheFile; + pkgCache *Cache = CacheFile.GetPkgCache(); + if (unlikely(Cache == NULL)) + return false; + + cout << _("Total package names: ") << Cache->Head().GroupCount << " (" << + SizeToStr(Cache->Head().GroupCount*Cache->Head().GroupSz) << ')' << endl + << _("Total package structures: ") << Cache->Head().PackageCount << " (" << + SizeToStr(Cache->Head().PackageCount*Cache->Head().PackageSz) << ')' << endl; int Normal = 0; int Virtual = 0; int NVirt = 0; int DVirt = 0; int Missing = 0; - pkgCache::PkgIterator I = Cache.PkgBegin(); + pkgCache::PkgIterator I = Cache->PkgBegin(); for (;I.end() != true; I++) { if (I->VersionList != 0 && I->ProvidesList == 0) @@ -288,33 +292,33 @@ bool Stats(CommandLine &Cmd) cout << _(" Mixed virtual packages: ") << NVirt << endl; cout << _(" Missing: ") << Missing << endl; - cout << _("Total distinct versions: ") << Cache.Head().VersionCount << " (" << - SizeToStr(Cache.Head().VersionCount*Cache.Head().VersionSz) << ')' << endl; - cout << _("Total distinct descriptions: ") << Cache.Head().DescriptionCount << " (" << - SizeToStr(Cache.Head().DescriptionCount*Cache.Head().DescriptionSz) << ')' << endl; - cout << _("Total dependencies: ") << Cache.Head().DependsCount << " (" << - SizeToStr(Cache.Head().DependsCount*Cache.Head().DependencySz) << ')' << endl; + cout << _("Total distinct versions: ") << Cache->Head().VersionCount << " (" << + SizeToStr(Cache->Head().VersionCount*Cache->Head().VersionSz) << ')' << endl; + cout << _("Total distinct descriptions: ") << Cache->Head().DescriptionCount << " (" << + SizeToStr(Cache->Head().DescriptionCount*Cache->Head().DescriptionSz) << ')' << endl; + cout << _("Total dependencies: ") << Cache->Head().DependsCount << " (" << + SizeToStr(Cache->Head().DependsCount*Cache->Head().DependencySz) << ')' << endl; - cout << _("Total ver/file relations: ") << Cache.Head().VerFileCount << " (" << - SizeToStr(Cache.Head().VerFileCount*Cache.Head().VerFileSz) << ')' << endl; - cout << _("Total Desc/File relations: ") << Cache.Head().DescFileCount << " (" << - SizeToStr(Cache.Head().DescFileCount*Cache.Head().DescFileSz) << ')' << endl; - cout << _("Total Provides mappings: ") << Cache.Head().ProvidesCount << " (" << - SizeToStr(Cache.Head().ProvidesCount*Cache.Head().ProvidesSz) << ')' << endl; + cout << _("Total ver/file relations: ") << Cache->Head().VerFileCount << " (" << + SizeToStr(Cache->Head().VerFileCount*Cache->Head().VerFileSz) << ')' << endl; + cout << _("Total Desc/File relations: ") << Cache->Head().DescFileCount << " (" << + SizeToStr(Cache->Head().DescFileCount*Cache->Head().DescFileSz) << ')' << endl; + cout << _("Total Provides mappings: ") << Cache->Head().ProvidesCount << " (" << + SizeToStr(Cache->Head().ProvidesCount*Cache->Head().ProvidesSz) << ')' << endl; // String list stats unsigned long Size = 0; unsigned long Count = 0; - for (pkgCache::StringItem *I = Cache.StringItemP + Cache.Head().StringList; - I!= Cache.StringItemP; I = Cache.StringItemP + I->NextItem) + for (pkgCache::StringItem *I = Cache->StringItemP + Cache->Head().StringList; + I!= Cache->StringItemP; I = Cache->StringItemP + I->NextItem) { Count++; - Size += strlen(Cache.StrP + I->String) + 1; + Size += strlen(Cache->StrP + I->String) + 1; } cout << _("Total globbed strings: ") << Count << " (" << SizeToStr(Size) << ')' << endl; unsigned long DepVerSize = 0; - for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++) + for (pkgCache::PkgIterator P = Cache->PkgBegin(); P.end() == false; P++) { for (pkgCache::VerIterator V = P.VersionList(); V.end() == false; V++) { @@ -329,15 +333,15 @@ bool Stats(CommandLine &Cmd) unsigned long Slack = 0; for (int I = 0; I != 7; I++) - Slack += Cache.Head().Pools[I].ItemSize*Cache.Head().Pools[I].Count; + Slack += Cache->Head().Pools[I].ItemSize*Cache->Head().Pools[I].Count; cout << _("Total slack space: ") << SizeToStr(Slack) << endl; unsigned long Total = 0; - Total = Slack + Size + Cache.Head().DependsCount*Cache.Head().DependencySz + - Cache.Head().VersionCount*Cache.Head().VersionSz + - Cache.Head().PackageCount*Cache.Head().PackageSz + - Cache.Head().VerFileCount*Cache.Head().VerFileSz + - Cache.Head().ProvidesCount*Cache.Head().ProvidesSz; + Total = Slack + Size + Cache->Head().DependsCount*Cache->Head().DependencySz + + Cache->Head().VersionCount*Cache->Head().VersionSz + + Cache->Head().PackageCount*Cache->Head().PackageSz + + Cache->Head().VerFileCount*Cache->Head().VerFileSz + + Cache->Head().ProvidesCount*Cache->Head().ProvidesSz; cout << _("Total space accounted for: ") << SizeToStr(Total) << endl; return true; @@ -348,10 +352,14 @@ bool Stats(CommandLine &Cmd) /* This is worthless except fer debugging things */ bool Dump(CommandLine &Cmd) { - pkgCache &Cache = *GCache; - cout << "Using Versioning System: " << Cache.VS->Label << endl; + pkgCacheFile CacheFile; + pkgCache *Cache = CacheFile.GetPkgCache(); + if (unlikely(Cache == NULL)) + return false; + + cout << "Using Versioning System: " << Cache->VS->Label << endl; - for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++) + for (pkgCache::PkgIterator P = Cache->PkgBegin(); P.end() == false; P++) { cout << "Package: " << P.FullName(true) << endl; for (pkgCache::VerIterator V = P.VersionList(); V.end() == false; V++) @@ -370,7 +378,7 @@ bool Dump(CommandLine &Cmd) } } - for (pkgCache::PkgFileIterator F = Cache.FileBegin(); F.end() == false; F++) + for (pkgCache::PkgFileIterator F = Cache->FileBegin(); F.end() == false; F++) { cout << "File: " << F.FileName() << endl; cout << " Type: " << F.IndexType() << endl; @@ -396,18 +404,17 @@ bool Dump(CommandLine &Cmd) make this run really fast, perhaps I went a little overboard.. */ bool DumpAvail(CommandLine &Cmd) { - pkgCache &Cache = *GCache; - - pkgPolicy Plcy(&Cache); - if (ReadPinFile(Plcy) == false || ReadPinDir(Plcy) == false) + pkgCacheFile CacheFile; + pkgCache *Cache = CacheFile.GetPkgCache(); + if (unlikely(Cache == NULL || CacheFile.BuildPolicy() == false)) return false; - - unsigned long Count = Cache.HeaderP->PackageCount+1; + + unsigned long Count = Cache->HeaderP->PackageCount+1; pkgCache::VerFile **VFList = new pkgCache::VerFile *[Count]; memset(VFList,0,sizeof(*VFList)*Count); // Map versions that we want to write out onto the VerList array. - for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++) + for (pkgCache::PkgIterator P = Cache->PkgBegin(); P.end() == false; P++) { if (P->VersionList == 0) continue; @@ -415,7 +422,7 @@ bool DumpAvail(CommandLine &Cmd) /* Find the proper version to use. If the policy says there are no possible selections we return the installed version, if available.. This prevents dselect from making it obsolete. */ - pkgCache::VerIterator V = Plcy.GetCandidateVer(P); + pkgCache::VerIterator V = CacheFile.GetPolicy()->GetCandidateVer(P); if (V.end() == true) { if (P->CurrentVer == 0) @@ -460,10 +467,10 @@ bool DumpAvail(CommandLine &Cmd) LocalitySort(VFList,Count,sizeof(*VFList)); // Iterate over all the package files and write them out. - char *Buffer = new char[Cache.HeaderP->MaxVerFileSize+10]; + char *Buffer = new char[Cache->HeaderP->MaxVerFileSize+10]; for (pkgCache::VerFile **J = VFList; *J != 0;) { - pkgCache::PkgFileIterator File(Cache,(*J)->File + Cache.PkgFileP); + pkgCache::PkgFileIterator File(*Cache,(*J)->File + Cache->PkgFileP); if (File.IsOk() == false) { _error->Error(_("Package file %s is out of sync."),File.FileName()); @@ -482,7 +489,7 @@ bool DumpAvail(CommandLine &Cmd) unsigned long Pos = 0; for (; *J != 0; J++) { - if ((*J)->File + Cache.PkgFileP != File) + if ((*J)->File + Cache->PkgFileP != File) break; const pkgCache::VerFile &VF = **J; @@ -538,11 +545,15 @@ bool DumpAvail(CommandLine &Cmd) /* */ bool Depends(CommandLine &CmdL) { - pkgCache &Cache = *GCache; - SPtrArray Colours = new unsigned[Cache.Head().PackageCount]; - memset(Colours,0,sizeof(*Colours)*Cache.Head().PackageCount); + pkgCacheFile CacheFile; + pkgCache *Cache = CacheFile.GetPkgCache(); + if (unlikely(Cache == NULL)) + return false; - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(Cache, CmdL.FileList); + SPtrArray Colours = new unsigned[Cache->Head().PackageCount]; + memset(Colours,0,sizeof(*Colours)*Cache->Head().PackageCount); + + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList); for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) Colours[Pkg->ID] = 1; @@ -553,7 +564,7 @@ bool Depends(CommandLine &CmdL) do { DidSomething = false; - for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) + for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) { if (Colours[Pkg->ID] != 1) continue; @@ -600,11 +611,11 @@ bool Depends(CommandLine &CmdL) // Display all solutions SPtrArray List = D.AllTargets(); - pkgPrioSortList(Cache,List); + pkgPrioSortList(*Cache,List); for (pkgCache::Version **I = List; *I != 0; I++) { - pkgCache::VerIterator V(Cache,*I); - if (V != Cache.VerP + V.ParentPkg()->VersionList || + pkgCache::VerIterator V(*Cache,*I); + if (V != Cache->VerP + V.ParentPkg()->VersionList || V->ParentPkg == D->Package) continue; cout << " " << V.ParentPkg().FullName(true) << endl; @@ -625,11 +636,15 @@ bool Depends(CommandLine &CmdL) /* */ bool RDepends(CommandLine &CmdL) { - pkgCache &Cache = *GCache; - SPtrArray Colours = new unsigned[Cache.Head().PackageCount]; - memset(Colours,0,sizeof(*Colours)*Cache.Head().PackageCount); + pkgCacheFile CacheFile; + pkgCache *Cache = CacheFile.GetPkgCache(); + if (unlikely(Cache == NULL)) + return false; - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(Cache, CmdL.FileList); + SPtrArray Colours = new unsigned[Cache->Head().PackageCount]; + memset(Colours,0,sizeof(*Colours)*Cache->Head().PackageCount); + + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList); for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) Colours[Pkg->ID] = 1; @@ -639,7 +654,7 @@ bool RDepends(CommandLine &CmdL) do { DidSomething = false; - for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) + for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) { if (Colours[Pkg->ID] != 1) continue; @@ -681,11 +696,11 @@ bool RDepends(CommandLine &CmdL) // Display all solutions SPtrArray List = D.AllTargets(); - pkgPrioSortList(Cache,List); + pkgPrioSortList(*Cache,List); for (pkgCache::Version **I = List; *I != 0; I++) { - pkgCache::VerIterator V(Cache,*I); - if (V != Cache.VerP + V.ParentPkg()->VersionList || + pkgCache::VerIterator V(*Cache,*I); + if (V != Cache->VerP + V.ParentPkg()->VersionList || V->ParentPkg == D->Package) continue; cout << " " << V.ParentPkg().FullName(true) << endl; @@ -707,7 +722,11 @@ bool RDepends(CommandLine &CmdL) bool XVcg(CommandLine &CmdL) { - pkgCache &Cache = *GCache; + pkgCacheFile CacheFile; + pkgCache *Cache = CacheFile.GetPkgCache(); + if (unlikely(Cache == NULL)) + return false; + bool GivenOnly = _config->FindB("APT::Cache::GivenOnly",false); /* Normal packages are boxes @@ -724,21 +743,21 @@ bool XVcg(CommandLine &CmdL) 0 = None */ enum States {None=0, ToShow, ToShowNR, DoneNR, Done}; enum TheFlags {ForceNR=(1<<0)}; - unsigned char *Show = new unsigned char[Cache.Head().PackageCount]; - unsigned char *Flags = new unsigned char[Cache.Head().PackageCount]; - unsigned char *ShapeMap = new unsigned char[Cache.Head().PackageCount]; + unsigned char *Show = new unsigned char[Cache->Head().PackageCount]; + unsigned char *Flags = new unsigned char[Cache->Head().PackageCount]; + unsigned char *ShapeMap = new unsigned char[Cache->Head().PackageCount]; // Show everything if no arguments given if (CmdL.FileList[1] == 0) - for (unsigned long I = 0; I != Cache.Head().PackageCount; I++) + for (unsigned long I = 0; I != Cache->Head().PackageCount; I++) Show[I] = ToShow; else - for (unsigned long I = 0; I != Cache.Head().PackageCount; I++) + for (unsigned long I = 0; I != Cache->Head().PackageCount; I++) Show[I] = None; - memset(Flags,0,sizeof(*Flags)*Cache.Head().PackageCount); + memset(Flags,0,sizeof(*Flags)*Cache->Head().PackageCount); // Map the shapes - for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) + for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) { if (Pkg->VersionList == 0) { @@ -777,7 +796,7 @@ bool XVcg(CommandLine &CmdL) } // Locate the package - pkgCache::PkgIterator Pkg = Cache.FindPkg(P); + pkgCache::PkgIterator Pkg = Cache->FindPkg(P); if (Pkg.end() == true) { _error->Warning(_("Unable to locate package %s"),*I); @@ -798,7 +817,7 @@ bool XVcg(CommandLine &CmdL) while (Act == true) { Act = false; - for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) + for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) { // See we need to show this package if (Show[Pkg->ID] == None || Show[Pkg->ID] >= DoneNR) @@ -833,7 +852,7 @@ bool XVcg(CommandLine &CmdL) for (pkgCache::VerIterator I = DPkg.VersionList(); I.end() == false && Hit == false; I++) { - if (Cache.VS->CheckDep(I.VerStr(),D->CompareOp,D.TargetVer()) == true) + if (Cache->VS->CheckDep(I.VerStr(),D->CompareOp,D.TargetVer()) == true) Hit = true; } @@ -841,7 +860,7 @@ bool XVcg(CommandLine &CmdL) for (pkgCache::PrvIterator I = DPkg.ProvidesList(); I.end() == false && Hit == false; I++) { - if (Cache.VS->CheckDep(I.ProvideVersion(),D->CompareOp,D.TargetVer()) == false) + if (Cache->VS->CheckDep(I.ProvideVersion(),D->CompareOp,D.TargetVer()) == false) Hit = true; } @@ -902,7 +921,7 @@ bool XVcg(CommandLine &CmdL) /* Draw the box colours after the fact since we can not tell what colour they should be until everything is finished drawing */ - for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) + for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) { if (Show[Pkg->ID] < DoneNR) continue; @@ -931,7 +950,11 @@ bool XVcg(CommandLine &CmdL) http://www.research.att.com/sw/tools/graphviz/ */ bool Dotty(CommandLine &CmdL) { - pkgCache &Cache = *GCache; + pkgCacheFile CacheFile; + pkgCache *Cache = CacheFile.GetPkgCache(); + if (unlikely(Cache == NULL)) + return false; + bool GivenOnly = _config->FindB("APT::Cache::GivenOnly",false); /* Normal packages are boxes @@ -948,21 +971,21 @@ bool Dotty(CommandLine &CmdL) 0 = None */ enum States {None=0, ToShow, ToShowNR, DoneNR, Done}; enum TheFlags {ForceNR=(1<<0)}; - unsigned char *Show = new unsigned char[Cache.Head().PackageCount]; - unsigned char *Flags = new unsigned char[Cache.Head().PackageCount]; - unsigned char *ShapeMap = new unsigned char[Cache.Head().PackageCount]; + unsigned char *Show = new unsigned char[Cache->Head().PackageCount]; + unsigned char *Flags = new unsigned char[Cache->Head().PackageCount]; + unsigned char *ShapeMap = new unsigned char[Cache->Head().PackageCount]; // Show everything if no arguments given if (CmdL.FileList[1] == 0) - for (unsigned long I = 0; I != Cache.Head().PackageCount; I++) + for (unsigned long I = 0; I != Cache->Head().PackageCount; I++) Show[I] = ToShow; else - for (unsigned long I = 0; I != Cache.Head().PackageCount; I++) + for (unsigned long I = 0; I != Cache->Head().PackageCount; I++) Show[I] = None; - memset(Flags,0,sizeof(*Flags)*Cache.Head().PackageCount); + memset(Flags,0,sizeof(*Flags)*Cache->Head().PackageCount); // Map the shapes - for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) + for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) { if (Pkg->VersionList == 0) { @@ -1001,7 +1024,7 @@ bool Dotty(CommandLine &CmdL) } // Locate the package - pkgCache::PkgIterator Pkg = Cache.FindPkg(P); + pkgCache::PkgIterator Pkg = Cache->FindPkg(P); if (Pkg.end() == true) { _error->Warning(_("Unable to locate package %s"),*I); @@ -1022,7 +1045,7 @@ bool Dotty(CommandLine &CmdL) while (Act == true) { Act = false; - for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) + for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) { // See we need to show this package if (Show[Pkg->ID] == None || Show[Pkg->ID] >= DoneNR) @@ -1055,7 +1078,7 @@ bool Dotty(CommandLine &CmdL) for (pkgCache::VerIterator I = DPkg.VersionList(); I.end() == false && Hit == false; I++) { - if (Cache.VS->CheckDep(I.VerStr(),D->CompareOp,D.TargetVer()) == true) + if (Cache->VS->CheckDep(I.VerStr(),D->CompareOp,D.TargetVer()) == true) Hit = true; } @@ -1063,7 +1086,7 @@ bool Dotty(CommandLine &CmdL) for (pkgCache::PrvIterator I = DPkg.ProvidesList(); I.end() == false && Hit == false; I++) { - if (Cache.VS->CheckDep(I.ProvideVersion(),D->CompareOp,D.TargetVer()) == false) + if (Cache->VS->CheckDep(I.ProvideVersion(),D->CompareOp,D.TargetVer()) == false) Hit = true; } @@ -1117,7 +1140,7 @@ bool Dotty(CommandLine &CmdL) /* Draw the box colours after the fact since we can not tell what colour they should be until everything is finished drawing */ - for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) + for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) { if (Show[Pkg->ID] < DoneNR) continue; @@ -1191,8 +1214,12 @@ bool DoAdd(CommandLine &CmdL) // --------------------------------------------------------------------- /* This displays the package record from the proper package index file. It is not used by DumpAvail for performance reasons. */ -bool DisplayRecord(pkgCache::VerIterator V) +bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V) { + pkgCache *Cache = CacheFile.GetPkgCache(); + if (unlikely(Cache == NULL)) + return false; + // Find an appropriate file pkgCache::VerFileIterator Vf = V.FileList(); for (; Vf.end() == false; Vf++) @@ -1211,7 +1238,7 @@ bool DisplayRecord(pkgCache::VerIterator V) return false; // Read the record - unsigned char *Buffer = new unsigned char[GCache->HeaderP->MaxVerFileSize+1]; + unsigned char *Buffer = new unsigned char[Cache->HeaderP->MaxVerFileSize+1]; Buffer[V.FileList()->Size] = '\n'; if (PkgF.Seek(V.FileList()->Offset) == false || PkgF.Read(Buffer,V.FileList()->Size) == false) @@ -1231,7 +1258,7 @@ bool DisplayRecord(pkgCache::VerIterator V) } // Show the right description - pkgRecords Recs(*GCache); + pkgRecords Recs(*Cache); pkgCache::DescIterator Desc = V.TranslatedDescription(); pkgRecords::Parser &P = Recs.Lookup(Desc.FileList()); cout << "Description" << ( (strcmp(Desc.LanguageCode(),"") != 0) ? "-" : "" ) << Desc.LanguageCode() << ": " << P.LongDesc(); @@ -1271,13 +1298,16 @@ struct ExDescFile /* This searches the package names and package descriptions for a pattern */ bool Search(CommandLine &CmdL) { - pkgCache &Cache = *GCache; bool const ShowFull = _config->FindB("APT::Cache::ShowFull",false); bool const NamesOnly = _config->FindB("APT::Cache::NamesOnly",false); unsigned int const NumPatterns = CmdL.FileSize() -1; - pkgDepCache::Policy Plcy; - + pkgCacheFile CacheFile; + pkgCache *Cache = CacheFile.GetPkgCache(); + pkgDepCache::Policy *Plcy = CacheFile.GetPolicy(); + if (unlikely(Cache == NULL || Plcy == NULL)) + return false; + // Make sure there is at least one argument if (NumPatterns < 1) return _error->Error(_("You must give at least one search pattern")); @@ -1303,11 +1333,11 @@ bool Search(CommandLine &CmdL) return false; } - ExDescFile *DFList = new ExDescFile[Cache.HeaderP->GroupCount+1]; - memset(DFList,0,sizeof(*DFList)*Cache.HeaderP->GroupCount+1); + ExDescFile *DFList = new ExDescFile[Cache->HeaderP->GroupCount+1]; + memset(DFList,0,sizeof(*DFList)*Cache->HeaderP->GroupCount+1); // Map versions that we want to write out onto the VerList array. - for (pkgCache::GrpIterator G = Cache.GrpBegin(); G.end() == false; ++G) + for (pkgCache::GrpIterator G = Cache->GrpBegin(); G.end() == false; ++G) { if (DFList[G->ID].NameMatch == true) continue; @@ -1329,7 +1359,7 @@ bool Search(CommandLine &CmdL) pkgCache::PkgIterator P = G.FindPreferredPkg(); if (P.end() == true) continue; - pkgCache::VerIterator V = Plcy.GetCandidateVer(P); + pkgCache::VerIterator V = Plcy->GetCandidateVer(P); if (V.end() == false) DFList[G->ID].Df = V.DescriptionList().FileList(); @@ -1339,7 +1369,7 @@ bool Search(CommandLine &CmdL) // Include all the packages that provide matching names too for (pkgCache::PrvIterator Prv = P.ProvidesList() ; Prv.end() == false; Prv++) { - pkgCache::VerIterator V = Plcy.GetCandidateVer(Prv.OwnerPkg()); + pkgCache::VerIterator V = Plcy->GetCandidateVer(Prv.OwnerPkg()); if (V.end() == true) continue; @@ -1349,14 +1379,14 @@ bool Search(CommandLine &CmdL) } } - LocalitySort(&DFList->Df,Cache.HeaderP->GroupCount,sizeof(*DFList)); + LocalitySort(&DFList->Df,Cache->HeaderP->GroupCount,sizeof(*DFList)); // Create the text record parser - pkgRecords Recs(Cache); + pkgRecords Recs(*Cache); // Iterate over all the version records and check them for (ExDescFile *J = DFList; J->Df != 0; J++) { - pkgRecords::Parser &P = Recs.Lookup(pkgCache::DescFileIterator(Cache,J->Df)); + pkgRecords::Parser &P = Recs.Lookup(pkgCache::DescFileIterator(*Cache,J->Df)); if (J->NameMatch == false && NamesOnly == false) { @@ -1398,15 +1428,17 @@ bool Search(CommandLine &CmdL) /* show automatically installed packages (sorted) */ bool ShowAuto(CommandLine &CmdL) { - OpProgress op; - pkgDepCache DepCache(GCache); - DepCache.Init(&op); + pkgCacheFile CacheFile; + pkgCache *Cache = CacheFile.GetPkgCache(); + pkgDepCache *DepCache = CacheFile.GetDepCache(); + if (unlikely(Cache == NULL || DepCache == NULL)) + return false; std::vector packages; - packages.reserve(GCache->HeaderP->PackageCount / 3); + packages.reserve(Cache->HeaderP->PackageCount / 3); - for (pkgCache::PkgIterator P = GCache->PkgBegin(); P.end() == false; P++) - if (DepCache[P].Flags & pkgCache::Flag::Auto) + for (pkgCache::PkgIterator P = Cache->PkgBegin(); P.end() == false; P++) + if ((*DepCache)[P].Flags & pkgCache::Flag::Auto) packages.push_back(P.Name()); std::sort(packages.begin(), packages.end()); @@ -1421,34 +1453,16 @@ bool ShowAuto(CommandLine &CmdL) // --------------------------------------------------------------------- /* */ bool ShowPackage(CommandLine &CmdL) -{ - pkgCache &Cache = *GCache; - pkgDepCache::Policy Plcy; - - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(Cache, CmdL.FileList); - for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) - { - // Find the proper version to use. - if (_config->FindB("APT::Cache::AllVersions","true") == true) - { - pkgCache::VerIterator V; - for (V = Pkg.VersionList(); V.end() == false; V++) - { - if (DisplayRecord(V) == false) - return false; - } - } - else - { - pkgCache::VerIterator V = Plcy.GetCandidateVer(Pkg); - if (V.end() == true || V.FileList().end() == true) - continue; - if (DisplayRecord(V) == false) - return false; - } - } - - if (pkgset.empty() == false) +{ + pkgCacheFile CacheFile; + APT::VersionSet::Version const select = _config->FindB("APT::Cache::AllVersions", true) ? + APT::VersionSet::ALL : APT::VersionSet::INSTALLED; + APT::VersionSet const verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList, select); + for (APT::VersionSet::const_iterator Ver = verset.begin(); Ver != verset.end(); ++Ver) + if (DisplayRecord(CacheFile, Ver) == false) + return false; + + if (verset.empty() == false) return true; return _error->Error(_("No packages found")); } @@ -1458,8 +1472,10 @@ bool ShowPackage(CommandLine &CmdL) /* This does a prefix match on the first argument */ bool ShowPkgNames(CommandLine &CmdL) { - pkgCache &Cache = *GCache; - pkgCache::GrpIterator I = Cache.GrpBegin(); + pkgCacheFile CacheFile; + if (unlikely(CacheFile.BuildCaches(NULL, false) == false)) + return false; + pkgCache::GrpIterator I = CacheFile.GetPkgCache()->GrpBegin(); bool const All = _config->FindB("APT::Cache::AllNames","false"); if (CmdL.FileList[1] != 0) @@ -1495,11 +1511,13 @@ bool ShowPkgNames(CommandLine &CmdL) /* */ bool ShowSrcPackage(CommandLine &CmdL) { - pkgSourceList List; - List.ReadMainList(); - + pkgCacheFile CacheFile; + pkgSourceList *List = CacheFile.GetSourceList(); + if (unlikely(List == NULL)) + return false; + // Create the text record parsers - pkgSrcRecords SrcRecs(List); + pkgSrcRecords SrcRecs(*List); if (_error->PendingError() == true) return false; @@ -1530,19 +1548,18 @@ bool ShowSrcPackage(CommandLine &CmdL) /* */ bool Policy(CommandLine &CmdL) { - if (SrcList == 0) - return _error->Error("Generate must be enabled for this function"); - - pkgCache &Cache = *GCache; - pkgPolicy Plcy(&Cache); - if (ReadPinFile(Plcy) == false || ReadPinDir(Plcy) == false) + pkgCacheFile CacheFile; + pkgCache *Cache = CacheFile.GetPkgCache(); + pkgPolicy *Plcy = CacheFile.GetPolicy(); + pkgSourceList *SrcList = CacheFile.GetSourceList(); + if (unlikely(Cache == NULL || Plcy == NULL || SrcList == NULL)) return false; - + // Print out all of the package files if (CmdL.FileList[1] == 0) { cout << _("Package files:") << endl; - for (pkgCache::PkgFileIterator F = Cache.FileBegin(); F.end() == false; F++) + for (pkgCache::PkgFileIterator F = Cache->FileBegin(); F.end() == false; F++) { // Locate the associated index files so we can derive a description pkgIndexFile *Indx; @@ -1551,7 +1568,7 @@ bool Policy(CommandLine &CmdL) return _error->Error(_("Cache is out of sync, can't x-ref a package file")); printf("%4i %s\n", - Plcy.GetPriority(F),Indx->Describe(true).c_str()); + Plcy->GetPriority(F),Indx->Describe(true).c_str()); // Print the reference information for the package string Str = F.RelStr(); @@ -1563,16 +1580,16 @@ bool Policy(CommandLine &CmdL) // Show any packages have explicit pins cout << _("Pinned packages:") << endl; - pkgCache::PkgIterator I = Cache.PkgBegin(); + pkgCache::PkgIterator I = Cache->PkgBegin(); for (;I.end() != true; I++) { - if (Plcy.GetPriority(I) == 0) + if (Plcy->GetPriority(I) == 0) continue; // Print the package name and the version we are forcing to cout << " " << I.FullName(true) << " -> "; - pkgCache::VerIterator V = Plcy.GetMatch(I); + pkgCache::VerIterator V = Plcy->GetMatch(I); if (V.end() == true) cout << _("(not found)") << endl; else @@ -1593,7 +1610,7 @@ bool Policy(CommandLine &CmdL) (InstalledLessCandidate > 0 ? (InstalledLessCandidate) : 0) - 1; // Print out detailed information for each package - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(Cache, CmdL.FileList); + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList); for (APT::PackageSet::const_iterator I = pkgset.begin(); I != pkgset.end(); ++I) { pkgCache::PkgIterator Pkg = I.Group().FindPkg("any"); @@ -1613,17 +1630,17 @@ bool Policy(CommandLine &CmdL) // Candidate Version cout << msgCandidate << OutputInDepth(deepCandidate, " "); - pkgCache::VerIterator V = Plcy.GetCandidateVer(Pkg); + pkgCache::VerIterator V = Plcy->GetCandidateVer(Pkg); if (V.end() == true) cout << _("(none)") << endl; else cout << V.VerStr() << endl; // Pinned version - if (Plcy.GetPriority(Pkg) != 0) + if (Plcy->GetPriority(Pkg) != 0) { cout << _(" Package pin: "); - V = Plcy.GetMatch(Pkg); + V = Plcy->GetMatch(Pkg); if (V.end() == true) cout << _("(not found)") << endl; else @@ -1638,7 +1655,7 @@ bool Policy(CommandLine &CmdL) cout << " *** " << V.VerStr(); else cout << " " << V.VerStr(); - cout << " " << Plcy.GetPriority(Pkg) << endl; + cout << " " << Plcy->GetPriority(Pkg) << endl; for (pkgCache::VerFileIterator VF = V.FileList(); VF.end() == false; VF++) { // Locate the associated index files so we can derive a description @@ -1646,7 +1663,7 @@ bool Policy(CommandLine &CmdL) if (SrcList->FindIndex(VF.File(),Indx) == false && _system->FindIndex(VF.File(),Indx) == false) return _error->Error(_("Cache is out of sync, can't x-ref a package file")); - printf(" %4i %s\n",Plcy.GetPriority(VF.File()), + printf(" %4i %s\n",Plcy->GetPriority(VF.File()), Indx->Describe(true).c_str()); } } @@ -1661,12 +1678,11 @@ bool Policy(CommandLine &CmdL) /* */ bool Madison(CommandLine &CmdL) { - if (SrcList == 0) - return _error->Error("Generate must be enabled for this function"); - - SrcList->ReadMainList(); + pkgCacheFile CacheFile; + pkgSourceList *SrcList = CacheFile.GetSourceList(); - pkgCache &Cache = *GCache; + if (SrcList == 0) + return false; // Create the src text record parsers and ignore errors about missing // deb-src lines that are generated from pkgSrcRecords::pkgSrcRecords @@ -1674,7 +1690,7 @@ bool Madison(CommandLine &CmdL) if (_error->PendingError() == true) _error->Discard(); - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(Cache, CmdL.FileList); + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList); for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { if (Pkg.end() == false) @@ -1729,11 +1745,9 @@ bool Madison(CommandLine &CmdL) bool GenCaches(CommandLine &Cmd) { OpTextProgress Progress(*_config); - - pkgSourceList List; - if (List.ReadMainList() == false) - return false; - return pkgMakeStatusCache(List,Progress); + + pkgCacheFile CacheFile; + return CacheFile.BuildCaches(&Progress, true); } /*}}}*/ // ShowHelp - Show a help screen /*{{{*/ @@ -1865,35 +1879,10 @@ int main(int argc,const char *argv[]) /*{{{*/ if (isatty(STDOUT_FILENO) && _config->FindI("quiet",0) < 1) _config->Set("quiet","1"); +// if (_config->FindB("APT::Cache::Generate",true) == false) if (CmdL.DispatchArg(CmdsA,false) == false && _error->PendingError() == false) - { - MMap *Map = 0; - if (_config->FindB("APT::Cache::Generate",true) == false) - { - Map = new MMap(*new FileFd(_config->FindFile("Dir::Cache::pkgcache"), - FileFd::ReadOnly),MMap::Public|MMap::ReadOnly); - } - else - { - // Open the cache file - SrcList = new pkgSourceList; - SrcList->ReadMainList(); + CmdL.DispatchArg(CmdsB); - // Generate it and map it - OpProgress Prog; - pkgMakeStatusCache(*SrcList,Prog,&Map,true); - } - - if (_error->PendingError() == false) - { - pkgCache Cache(Map); - GCache = &Cache; - if (_error->PendingError() == false) - CmdL.DispatchArg(CmdsB); - } - delete Map; - } - // Print any errors or warnings found during parsing if (_error->empty() == false) { diff --git a/debian/changelog b/debian/changelog index 9001e91a7..d935d06d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - get the best matching arch package from a group with FindPreferredPkg * cmdline/apt-cache.cc: - make the search multiarch compatible by using GrpIterator instead + - use pkgCacheFile and the new CacheSets all over the place * apt-pkg/cachefile.{cc,h}: - split Open() into submethods to be able to build only parts - make the OpProgress optional in the Cache buildprocess -- cgit v1.2.3 From 0588779fb2139b70f369ccac20fcc0f3a3e9ed47 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 5 Jun 2010 10:17:10 +0200 Subject: Add a option to apt-cache policy to additionally init the DepCache before starting to get the package informations. This is useful e.g. for debugging the MultiArchKiller. --- cmdline/apt-cache.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 227fda4be..b0e705108 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1555,6 +1555,12 @@ bool Policy(CommandLine &CmdL) if (unlikely(Cache == NULL || Plcy == NULL || SrcList == NULL)) return false; + /* Should the MultiArchKiller be run to see which pseudo packages for an + arch all package are currently installed? Activating it gives a speed + penality for no real gain beside enhanced debugging, so in general no. */ + if (_config->FindB("APT::Cache::Policy::DepCache", false) == true) + CacheFile.GetDepCache(); + // Print out all of the package files if (CmdL.FileList[1] == 0) { -- cgit v1.2.3 From f44a05ff641523ab8eae84166e9b1a9dcf1b366f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 5 Jun 2010 12:54:30 +0200 Subject: add --target-release option (Closes: #115520) --- cmdline/apt-cache.cc | 2 ++ debian/changelog | 1 + 2 files changed, 3 insertions(+) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index b0e705108..005721ddf 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1831,6 +1831,8 @@ int main(int argc,const char *argv[]) /*{{{*/ {'n',"names-only","APT::Cache::NamesOnly",0}, {0,"all-names","APT::Cache::AllNames",0}, {0,"recurse","APT::Cache::RecurseDepends",0}, + {'t',"target-release","APT::Default-Release",CommandLine::HasArg}, + {'t',"default-release","APT::Default-Release",CommandLine::HasArg}, {'c',"config-file",0,CommandLine::ConfigFile}, {'o',"option",0,CommandLine::ArbItem}, {0,"installed","APT::Cache::Installed",0}, diff --git a/debian/changelog b/debian/changelog index d935d06d7..acdc1795f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low * cmdline/apt-cache.cc: - make the search multiarch compatible by using GrpIterator instead - use pkgCacheFile and the new CacheSets all over the place + - add --target-release option (Closes: #115520) * apt-pkg/cachefile.{cc,h}: - split Open() into submethods to be able to build only parts - make the OpProgress optional in the Cache buildprocess -- cgit v1.2.3 From 9f1f17ccd4f84c23410ae62911c85f5836c3b503 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 5 Jun 2010 13:09:18 +0200 Subject: Don't increase the commandline parameter in the library but in the application to be really generic. --- apt-pkg/cacheset.cc | 4 ++-- cmdline/apt-cache.cc | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index 7372c909e..5dbd1a4df 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -79,7 +79,7 @@ PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, std:: // FromCommandLine - Return all packages specified on commandline /*{{{*/ PackageSet PackageSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, std::ostream &out) { PackageSet pkgset; - for (const char **I = cmdline + 1; *I != 0; I++) { + for (const char **I = cmdline; *I != 0; ++I) { PackageSet pset = FromString(Cache, *I, out); pkgset.insert(pset.begin(), pset.end()); } @@ -105,7 +105,7 @@ PackageSet PackageSet::FromString(pkgCacheFile &Cache, const char * const str, s APT::VersionSet VersionSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, APT::VersionSet::Version const &fallback, std::ostream &out) { VersionSet verset; - for (const char **I = cmdline + 1; *I != 0; I++) { + for (const char **I = cmdline; *I != 0; ++I) { std::string pkg = *I; std::string ver; bool verIsRel = false; diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 005721ddf..e3876d5e0 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -176,7 +176,7 @@ bool UnMet(CommandLine &CmdL) bool DumpPackage(CommandLine &CmdL) { pkgCacheFile CacheFile; - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList); + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1); for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { @@ -553,7 +553,7 @@ bool Depends(CommandLine &CmdL) SPtrArray Colours = new unsigned[Cache->Head().PackageCount]; memset(Colours,0,sizeof(*Colours)*Cache->Head().PackageCount); - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList); + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1); for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) Colours[Pkg->ID] = 1; @@ -644,7 +644,7 @@ bool RDepends(CommandLine &CmdL) SPtrArray Colours = new unsigned[Cache->Head().PackageCount]; memset(Colours,0,sizeof(*Colours)*Cache->Head().PackageCount); - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList); + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1); for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) Colours[Pkg->ID] = 1; @@ -1457,7 +1457,7 @@ bool ShowPackage(CommandLine &CmdL) pkgCacheFile CacheFile; APT::VersionSet::Version const select = _config->FindB("APT::Cache::AllVersions", true) ? APT::VersionSet::ALL : APT::VersionSet::INSTALLED; - APT::VersionSet const verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList, select); + APT::VersionSet const verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1, select); for (APT::VersionSet::const_iterator Ver = verset.begin(); Ver != verset.end(); ++Ver) if (DisplayRecord(CacheFile, Ver) == false) return false; @@ -1616,7 +1616,7 @@ bool Policy(CommandLine &CmdL) (InstalledLessCandidate > 0 ? (InstalledLessCandidate) : 0) - 1; // Print out detailed information for each package - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList); + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1); for (APT::PackageSet::const_iterator I = pkgset.begin(); I != pkgset.end(); ++I) { pkgCache::PkgIterator Pkg = I.Group().FindPkg("any"); @@ -1696,7 +1696,7 @@ bool Madison(CommandLine &CmdL) if (_error->PendingError() == true) _error->Discard(); - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList); + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1); for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { if (Pkg.end() == false) -- cgit v1.2.3 From c45f2d1995a58c7a5a8616c6fbf9f95ee4ccfd49 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 5 Jun 2010 13:38:17 +0200 Subject: do not insert end() Iterators into the CacheSet even if requested --- apt-pkg/cacheset.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index 708531b4a..b65e053e6 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -61,6 +61,9 @@ public: /*{{{*/ // 103. set::iterator is required to be modifiable, but this allows modification of keys typedef typename APT::PackageSet::const_iterator iterator; + using std::set::insert; + inline void insert(pkgCache::PkgIterator const &P) { if (P.end() == false) std::set::insert(P); }; + /** \brief returns all packages in the cache whose name matchs a given pattern A simple helper responsible for executing a regular expression on all @@ -145,6 +148,9 @@ public: /*{{{*/ // 103. set::iterator is required to be modifiable, but this allows modification of keys typedef typename APT::VersionSet::const_iterator iterator; + using std::set::insert; + inline void insert(pkgCache::VerIterator const &V) { if (V.end() == false) std::set::insert(V); }; + /** \brief specifies which version(s) will be returned if non is given */ enum Version { /** All versions */ -- cgit v1.2.3 From 292f5b8770a0f10d8a19204dc4a914437d861662 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 5 Jun 2010 13:42:04 +0200 Subject: apt-cache show --no-all-versions should issues the Candidate --- cmdline/apt-cache.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index e3876d5e0..b782c70af 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1456,7 +1456,7 @@ bool ShowPackage(CommandLine &CmdL) { pkgCacheFile CacheFile; APT::VersionSet::Version const select = _config->FindB("APT::Cache::AllVersions", true) ? - APT::VersionSet::ALL : APT::VersionSet::INSTALLED; + APT::VersionSet::ALL : APT::VersionSet::CANDIDATE; APT::VersionSet const verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1, select); for (APT::VersionSet::const_iterator Ver = verset.begin(); Ver != verset.end(); ++Ver) if (DisplayRecord(CacheFile, Ver) == false) -- cgit v1.2.3 From fe870febbfc1145d4a2a6b86985b0253419d52a8 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 5 Jun 2010 15:47:16 +0200 Subject: handle :arch modifier in PackageSet::FromString correctly --- apt-pkg/cacheset.cc | 26 ++++++++++++++++++++------ apt-pkg/cacheset.h | 4 ++-- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index 5dbd1a4df..8fcffaf9a 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -87,17 +87,31 @@ PackageSet PackageSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline } /*}}}*/ // FromString - Return all packages matching a specific string /*{{{*/ -PackageSet PackageSet::FromString(pkgCacheFile &Cache, const char * const str, std::ostream &out) { - pkgCache::GrpIterator Grp = Cache.GetPkgCache()->FindGrp(str); - if (Grp.end() == false) { - pkgCache::PkgIterator Pkg = Grp.FindPreferredPkg(); +PackageSet PackageSet::FromString(pkgCacheFile &Cache, std::string const &str, std::ostream &out) { + std::string pkg = str; + size_t archfound = pkg.find_last_of(':'); + std::string arch; + if (archfound != std::string::npos) { + arch = pkg.substr(archfound+1); + pkg.erase(archfound); + } + + pkgCache::PkgIterator Pkg; + if (arch.empty() == true) { + pkgCache::GrpIterator Grp = Cache.GetPkgCache()->FindGrp(pkg); + if (Grp.end() == false) + Pkg = Grp.FindPreferredPkg(); + } else + Pkg = Cache.GetPkgCache()->FindPkg(pkg, arch); + + if (Pkg.end() == false) { PackageSet pkgset; pkgset.insert(Pkg); return pkgset; } PackageSet regex = FromRegEx(Cache, str, out); if (regex.empty() == true) - _error->Warning(_("Unable to locate package %s"), str); + _error->Warning(_("Unable to locate package %s"), str.c_str()); return regex; } /*}}}*/ @@ -188,7 +202,7 @@ pkgCache::VerIterator VersionSet::getCandidateVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg, bool const &AllowError) { if (unlikely(Cache.BuildDepCache() == false)) return pkgCache::VerIterator(*Cache); - pkgCache::VerIterator Cand = Cache[Pkg].InstVerIter(Cache); + pkgCache::VerIterator Cand = Cache[Pkg].CandidateVerIter(Cache); if (AllowError == false && Cand.end() == true) _error->Error(_("Can't select candidate version from package %s as it has no candidate"), Pkg.FullName(true).c_str()); return Cand; diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index b65e053e6..4f7be4caa 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -83,8 +83,8 @@ public: /*{{{*/ \param Cache the packages are in \param string String the package name(s) should be extracted from \param out stream to print various notices to */ - static APT::PackageSet FromString(pkgCacheFile &Cache, const char * const string, std::ostream &out); - static APT::PackageSet FromString(pkgCacheFile &Cache, const char * const string) { + static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string, std::ostream &out); + static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string) { std::ostream out (std::ofstream("/dev/null").rdbuf()); return APT::PackageSet::FromString(Cache, string, out); } -- cgit v1.2.3 From 88edd59bb5ff29d1f55612b2ab216a72b9a9898e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 5 Jun 2010 16:45:19 +0200 Subject: enhance the changelog a bit --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index acdc1795f..5590f20ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - do the autoremove mark process also for required packages to handle these illegally depending on lower priority packages (Closes: #583517) - try harder to find the other pseudo versions for autoremove multiarch + - correct "Dangerous iterator usage" pointed out by cppcheck * apt-pkg/aptconfiguration.cc: - remove duplicate architectures in getArchitectures() * apt-pkg/indexrecords.{cc,h}: @@ -18,8 +19,6 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - do not try PDiff if it is not listed in the Meta file * apt-pkg/cacheiterator.h: - let pkgCache::Iterator inherent std::iterator - * apt-pkg/depcache.cc: - - correct "Dangerous iterator usage." pointed out by cppcheck * ftparchive/writer.h: - add a virtual destructor to FTWScanner class (for cppcheck) * apt-pkg/cacheset.{cc,h}: @@ -34,12 +33,13 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - make the search multiarch compatible by using GrpIterator instead - use pkgCacheFile and the new CacheSets all over the place - add --target-release option (Closes: #115520) + - accept pkg/release and pkg=version in show and co. (Closes: #236270) * apt-pkg/cachefile.{cc,h}: - split Open() into submethods to be able to build only parts - make the OpProgress optional in the Cache buildprocess - store also the SourceList we use internally for export - -- David Kalnischkies Mon, 31 May 2010 22:36:35 +0200 + -- David Kalnischkies Sat, 05 Jun 2010 14:39:58 +0200 apt (0.7.26~exp5) experimental; urgency=low -- cgit v1.2.3 From 6ebaae9a5d794ce69d17e419c109fc185925541c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 5 Jun 2010 16:59:45 +0200 Subject: accept package versions in the unmet command --- cmdline/apt-cache.cc | 57 +++++++++++++++++++++++++++++++--------------------- debian/changelog | 1 + 2 files changed, 35 insertions(+), 23 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index b782c70af..ef074280e 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -81,18 +81,8 @@ void LocalitySort(pkgCache::DescFile **begin, // UnMet - Show unmet dependencies /*{{{*/ // --------------------------------------------------------------------- /* */ -bool UnMet(CommandLine &CmdL) +bool ShowUnMet(pkgCache::VerIterator const &V, bool const &Important) { - bool const Important = _config->FindB("APT::Cache::Important",false); - - pkgCacheFile CacheFile; - if (unlikely(CacheFile.GetPkgCache() == NULL)) - return false; - - for (pkgCache::PkgIterator P = CacheFile.GetPkgCache()->PkgBegin(); P.end() == false; P++) - { - for (pkgCache::VerIterator V = P.VersionList(); V.end() == false; V++) - { bool Header = false; for (pkgCache::DepIterator D = V.DependsList(); D.end() == false;) { @@ -100,20 +90,19 @@ bool UnMet(CommandLine &CmdL) pkgCache::DepIterator Start; pkgCache::DepIterator End; D.GlobOr(Start,End); - - // Skip conflicts and replaces - if (End->Type != pkgCache::Dep::PreDepends && - End->Type != pkgCache::Dep::Depends && - End->Type != pkgCache::Dep::Suggests && - End->Type != pkgCache::Dep::Recommends) - continue; // Important deps only if (Important == true) if (End->Type != pkgCache::Dep::PreDepends && End->Type != pkgCache::Dep::Depends) continue; - + + // Skip conflicts and replaces + if (End->Type == pkgCache::Dep::DpkgBreaks || + End->Type == pkgCache::Dep::Replaces || + End->Type == pkgCache::Dep::Conflicts) + continue; + // Verify the or group bool OK = false; pkgCache::DepIterator RealStart = Start; @@ -142,7 +131,7 @@ bool UnMet(CommandLine &CmdL) // Oops, it failed.. if (Header == false) ioprintf(cout,_("Package %s version %s has an unmet dep:\n"), - P.FullName(true).c_str(),V.VerStr()); + V.ParentPkg().FullName(true).c_str(),V.VerStr()); Header = true; // Print out the dep type @@ -164,9 +153,31 @@ bool UnMet(CommandLine &CmdL) while (1); cout << endl; - } - } - } + } + return true; +} +bool UnMet(CommandLine &CmdL) +{ + bool const Important = _config->FindB("APT::Cache::Important",false); + + pkgCacheFile CacheFile; + if (unlikely(CacheFile.GetPkgCache() == NULL)) + return false; + + if (CmdL.FileSize() <= 1) + { + for (pkgCache::PkgIterator P = CacheFile.GetPkgCache()->PkgBegin(); P.end() == false; P++) + for (pkgCache::VerIterator V = P.VersionList(); V.end() == false; ++V) + if (ShowUnMet(V, Important) == false) + return false; + } + else + { + APT::VersionSet verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1); + for (APT::VersionSet::iterator V = verset.begin(); V != verset.end(); ++V) + if (ShowUnMet(V, Important) == false) + return false; + } return true; } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 5590f20ff..6c9faf119 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - use pkgCacheFile and the new CacheSets all over the place - add --target-release option (Closes: #115520) - accept pkg/release and pkg=version in show and co. (Closes: #236270) + - accept package versions in the unmet command * apt-pkg/cachefile.{cc,h}: - split Open() into submethods to be able to build only parts - make the OpProgress optional in the Cache buildprocess -- cgit v1.2.3 From 84910ad5090b8cffc81d7942497ca09cc5d93244 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 5 Jun 2010 18:00:00 +0200 Subject: support special release-modifier 'installed' and 'candidate' --- apt-pkg/cacheset.cc | 126 ++++++++++++++++++++++++++++++++-------------------- apt-pkg/cacheset.h | 5 +++ debian/changelog | 1 + 3 files changed, 83 insertions(+), 49 deletions(-) diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index 8fcffaf9a..c0b06ba32 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -132,10 +132,19 @@ APT::VersionSet VersionSet::FromCommandLine(pkgCacheFile &Cache, const char **cm PackageSet pkgset = PackageSet::FromString(Cache, pkg.c_str(), out); for (PackageSet::const_iterator P = pkgset.begin(); P != pkgset.end(); ++P) { - if (vertag != string::npos) { + if (vertag == string::npos) { + AddSelectedVersion(Cache, verset, P, fallback); + continue; + } + pkgCache::VerIterator V; + if (ver == "installed") + V = getInstalledVer(Cache, P); + else if (ver == "candidate") + V = getCandidateVer(Cache, P); + else { pkgVersionMatch Match(ver, (verIsRel == true ? pkgVersionMatch::Release : - pkgVersionMatch::Version)); - pkgCache::VerIterator V = Match.Find(P); + pkgVersionMatch::Version)); + V = Match.Find(P); if (V.end() == true) { if (verIsRel == true) _error->Error(_("Release '%s' for '%s' was not found"), @@ -145,58 +154,77 @@ APT::VersionSet VersionSet::FromCommandLine(pkgCacheFile &Cache, const char **cm ver.c_str(), P.FullName(true).c_str()); continue; } - if (strcmp(ver.c_str(), V.VerStr()) != 0) - ioprintf(out, _("Selected version %s (%s) for %s\n"), - V.VerStr(), V.RelStr().c_str(), P.FullName(true).c_str()); - verset.insert(V); - } else { - pkgCache::VerIterator V; - switch(fallback) { - case VersionSet::ALL: - for (V = P.VersionList(); V.end() != true; ++V) - verset.insert(V); - break; - case VersionSet::CANDANDINST: - verset.insert(getInstalledVer(Cache, P)); - verset.insert(getCandidateVer(Cache, P)); - break; - case VersionSet::CANDIDATE: - verset.insert(getCandidateVer(Cache, P)); - break; - case VersionSet::INSTALLED: - verset.insert(getInstalledVer(Cache, P)); - break; - case VersionSet::CANDINST: - V = getCandidateVer(Cache, P, true); - if (V.end() == true) - V = getInstalledVer(Cache, P, true); - if (V.end() == false) - verset.insert(V); - else - _error->Error(_("Can't select installed nor candidate version from package %s as it has neither of them"), P.FullName(true).c_str()); - break; - case VersionSet::INSTCAND: - V = getInstalledVer(Cache, P, true); - if (V.end() == true) - V = getCandidateVer(Cache, P, true); - if (V.end() == false) - verset.insert(V); - else - _error->Error(_("Can't select installed nor candidate version from package %s as it has neither of them"), P.FullName(true).c_str()); - break; - case VersionSet::NEWEST: - if (P->VersionList != 0) - verset.insert(P.VersionList()); - else - _error->Error(_("Can't select newest version from package %s as it is purely virtual"), P.FullName(true).c_str()); - break; - } } + if (V.end() == true) + continue; + if (ver == V.VerStr()) + ioprintf(out, _("Selected version '%s' (%s) for '%s'\n"), + V.VerStr(), V.RelStr().c_str(), P.FullName(true).c_str()); + verset.insert(V); } } return verset; } /*}}}*/ +// AddSelectedVersion - add version from package based on fallback /*{{{*/ +bool VersionSet::AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset, + pkgCache::PkgIterator const &P, VersionSet::Version const &fallback, + bool const &AllowError) { + pkgCache::VerIterator V; + switch(fallback) { + case VersionSet::ALL: + if (P->VersionList != 0) + for (V = P.VersionList(); V.end() != true; ++V) + verset.insert(V); + else if (AllowError == false) + return _error->Error(_("Can't select versions from package '%s' as it purely virtual"), P.FullName(true).c_str()); + else + return false; + break; + case VersionSet::CANDANDINST: + verset.insert(getInstalledVer(Cache, P, AllowError)); + verset.insert(getCandidateVer(Cache, P, AllowError)); + break; + case VersionSet::CANDIDATE: + verset.insert(getCandidateVer(Cache, P, AllowError)); + break; + case VersionSet::INSTALLED: + verset.insert(getInstalledVer(Cache, P, AllowError)); + break; + case VersionSet::CANDINST: + V = getCandidateVer(Cache, P, true); + if (V.end() == true) + V = getInstalledVer(Cache, P, true); + if (V.end() == false) + verset.insert(V); + else if (AllowError == false) + return _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), P.FullName(true).c_str()); + else + return false; + break; + case VersionSet::INSTCAND: + V = getInstalledVer(Cache, P, true); + if (V.end() == true) + V = getCandidateVer(Cache, P, true); + if (V.end() == false) + verset.insert(V); + else if (AllowError == false) + return _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), P.FullName(true).c_str()); + else + return false; + break; + case VersionSet::NEWEST: + if (P->VersionList != 0) + verset.insert(P.VersionList()); + else if (AllowError == false) + return _error->Error(_("Can't select newest version from package '%s' as it is purely virtual"), P.FullName(true).c_str()); + else + return false; + break; + } + return true; +} + /*}}}*/ // getCandidateVer - Returns the candidate version of the given package /*{{{*/ pkgCache::VerIterator VersionSet::getCandidateVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg, bool const &AllowError) { diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index 4f7be4caa..0f3a87a3d 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -205,6 +205,11 @@ protected: /*{{{*/ static pkgCache::VerIterator getInstalledVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg, bool const &AllowError = false); + + static bool AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset, + pkgCache::PkgIterator const &P, VersionSet::Version const &fallback, + bool const &AllowError = false); + /*}}}*/ }; /*}}}*/ } diff --git a/debian/changelog b/debian/changelog index 6c9faf119..21093b056 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - add simple wrapper around std::set for cache structures - move regex magic from apt-get to new FromRegEx method - move cmdline parsing from apt-cache to new FromCommandLine method + - support special release-modifier 'installed' and 'candidate' * apt-pkg/contrib/cmdline.cc: - fix segfault in SaveInConfig caused by writing over char[] sizes * apt-pkg/pkgcache.cc: -- cgit v1.2.3 From 07c279d93f0b61e96c9caf8139accd0289feab56 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 5 Jun 2010 19:14:32 +0200 Subject: do not fail if an unrelated error is pending in DisplayRecord() --- cmdline/apt-cache.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index ef074280e..de4288c5a 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1243,11 +1243,11 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V) pkgCache::PkgFileIterator I = Vf.File(); if (I.IsOk() == false) return _error->Error(_("Package file %s is out of sync."),I.FileName()); - - FileFd PkgF(I.FileName(),FileFd::ReadOnly); - if (_error->PendingError() == true) + + FileFd PkgF; + if (PkgF.Open(I.FileName(), FileFd::ReadOnly) == false) return false; - + // Read the record unsigned char *Buffer = new unsigned char[Cache->HeaderP->MaxVerFileSize+1]; Buffer[V.FileList()->Size] = '\n'; -- cgit v1.2.3 From 9cc83a6fbc089ccf9cb8d52ee9f380cf5df62d5c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 6 Jun 2010 21:41:27 +0200 Subject: add a GroupedFromCommandLine method to the PackageSet to split the packages on the commandline into groups based on modifiers --- apt-pkg/cacheset.cc | 33 +++++++++++++++++++++++++++++++++ apt-pkg/cacheset.h | 23 +++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index c0b06ba32..43ade4b4e 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -76,6 +76,39 @@ PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, std:: return pkgset; } /*}}}*/ +// GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ +std::map PackageSet::GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list const &mods, + unsigned short const &fallback, std::ostream &out) { + std::map pkgsets; + for (const char **I = cmdline; *I != 0; ++I) { + unsigned short modID = fallback; + std::string str = *I; + for (std::list::const_iterator mod = mods.begin(); + mod != mods.end(); ++mod) { + size_t const alength = strlen(mod->Alias); + switch(mod->Pos) { + case PackageSet::Modifier::POSTFIX: + if (str.compare(str.length() - alength, alength, + mod->Alias, 0, alength) != 0) + continue; + str.erase(str.length() - alength); + modID = mod->ID; + break; + case PackageSet::Modifier::PREFIX: + continue; + case PackageSet::Modifier::NONE: + continue; + } + break; + } + PackageSet pset = PackageSet::FromString(Cache, str, out); + pkgsets[modID].insert(pset.begin(), pset.end()); + } + return pkgsets; +} + /*}}}*/ // FromCommandLine - Return all packages specified on commandline /*{{{*/ PackageSet PackageSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, std::ostream &out) { PackageSet pkgset; diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index 0f3a87a3d..c9d121083 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -11,6 +11,8 @@ // Include Files /*{{{*/ #include #include +#include +#include #include #include @@ -101,6 +103,27 @@ public: /*{{{*/ std::ostream out (std::ofstream("/dev/null").rdbuf()); return APT::PackageSet::FromCommandLine(Cache, cmdline, out); } + + struct Modifier { + enum Position { NONE, PREFIX, POSTFIX }; + unsigned short ID; + const char * const Alias; + Position Pos; + Modifier (unsigned short const &id, const char * const alias, Position const &pos) : ID(id), Alias(alias), Pos(pos) {}; + }; + + static std::map GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list const &mods, + unsigned short const &fallback, std::ostream &out); + static std::map GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list const &mods, + unsigned short const &fallback) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::PackageSet::GroupedFromCommandLine(Cache, cmdline, + mods, fallback, out); + } /*}}}*/ }; /*}}}*/ class VersionSet : public std::set { /*{{{*/ -- cgit v1.2.3 From 3c9772456931842dee211444086c15dd2e5f9a29 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 6 Jun 2010 21:49:28 +0200 Subject: use the GroupedFromCommandLine() method in the dotty and xvcg command to get all the funky features in less lines --- cmdline/apt-cache.cc | 84 ++++++++++++++++++---------------------------------- 1 file changed, 28 insertions(+), 56 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index de4288c5a..7cb95b3f8 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -787,38 +787,24 @@ bool XVcg(CommandLine &CmdL) ShapeMap[Pkg->ID] = 3; } } - + // Load the list of packages from the command line into the show list - for (const char **I = CmdL.FileList + 1; *I != 0; I++) + std::list mods; + mods.push_back(APT::PackageSet::Modifier(0, ",", APT::PackageSet::Modifier::POSTFIX)); + mods.push_back(APT::PackageSet::Modifier(1, "^", APT::PackageSet::Modifier::POSTFIX)); + std::map pkgsets = + APT::PackageSet::GroupedFromCommandLine(CacheFile, CmdL.FileList + 1, mods, 0); + + for (APT::PackageSet::const_iterator Pkg = pkgsets[0].begin(); + Pkg != pkgsets[0].end(); ++Pkg) + Show[Pkg->ID] = ToShow; + for (APT::PackageSet::const_iterator Pkg = pkgsets[1].begin(); + Pkg != pkgsets[1].end(); ++Pkg) { - // Process per-package flags - string P = *I; - bool Force = false; - if (P.length() > 3) - { - if (P.end()[-1] == '^') - { - Force = true; - P.erase(P.end()-1); - } - - if (P.end()[-1] == ',') - P.erase(P.end()-1); - } - - // Locate the package - pkgCache::PkgIterator Pkg = Cache->FindPkg(P); - if (Pkg.end() == true) - { - _error->Warning(_("Unable to locate package %s"),*I); - continue; - } Show[Pkg->ID] = ToShow; - - if (Force == true) - Flags[Pkg->ID] |= ForceNR; + Flags[Pkg->ID] |= ForceNR; } - + // Little header cout << "graph: { title: \"packages\"" << endl << "xmax: 700 ymax: 700 x: 30 y: 30" << endl << @@ -1015,38 +1001,24 @@ bool Dotty(CommandLine &CmdL) ShapeMap[Pkg->ID] = 3; } } - + // Load the list of packages from the command line into the show list - for (const char **I = CmdL.FileList + 1; *I != 0; I++) + std::list mods; + mods.push_back(APT::PackageSet::Modifier(0, ",", APT::PackageSet::Modifier::POSTFIX)); + mods.push_back(APT::PackageSet::Modifier(1, "^", APT::PackageSet::Modifier::POSTFIX)); + std::map pkgsets = + APT::PackageSet::GroupedFromCommandLine(CacheFile, CmdL.FileList + 1, mods, 0); + + for (APT::PackageSet::const_iterator Pkg = pkgsets[0].begin(); + Pkg != pkgsets[0].end(); ++Pkg) + Show[Pkg->ID] = ToShow; + for (APT::PackageSet::const_iterator Pkg = pkgsets[1].begin(); + Pkg != pkgsets[1].end(); ++Pkg) { - // Process per-package flags - string P = *I; - bool Force = false; - if (P.length() > 3) - { - if (P.end()[-1] == '^') - { - Force = true; - P.erase(P.end()-1); - } - - if (P.end()[-1] == ',') - P.erase(P.end()-1); - } - - // Locate the package - pkgCache::PkgIterator Pkg = Cache->FindPkg(P); - if (Pkg.end() == true) - { - _error->Warning(_("Unable to locate package %s"),*I); - continue; - } Show[Pkg->ID] = ToShow; - - if (Force == true) - Flags[Pkg->ID] |= ForceNR; + Flags[Pkg->ID] |= ForceNR; } - + // Little header printf("digraph packages {\n"); printf("concentrate=true;\n"); -- cgit v1.2.3 From 1ddb859611d2e0f3d9ea12085001810f689e8c99 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 8 Jun 2010 19:27:49 +0200 Subject: * apt-pkg/indexrecords.cc: - backport forgotten Valid-Until patch from the obsolete experimental branch to prevent replay attacks better, thanks to Thomas Viehmann for the initial patch! (Closes: #499897) --- apt-pkg/acquire-item.cc | 12 ++++++- apt-pkg/indexrecords.cc | 38 ++++++++++++++++++++-- apt-pkg/indexrecords.h | 4 +++ debian/changelog | 4 +++ test/pre-upload-check.py | 14 ++++++++ .../sources.list.all-validuntil-broken | 1 + 6 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 test/testsources.list/sources.list.all-validuntil-broken diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index c035b9163..4a846804e 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -33,6 +33,7 @@ #include #include #include +#include /*}}}*/ using namespace std; @@ -1177,6 +1178,15 @@ bool pkgAcqMetaIndex::VerifyVendor(string Message) /*{{{*/ Transformed = ""; } + if (_config->FindB("Acquire::Check-Valid-Until", true)) { + if (MetaIndexParser->GetValidUntil() > 0 && + time(NULL) > MetaIndexParser->GetValidUntil()) { + return _error->Error(_("Release file expired, ignoring %s (valid until %s)"), + RealURI.c_str(), + TimeRFC1123(MetaIndexParser->GetValidUntil()).c_str()); + } + } + if (_config->FindB("Debug::pkgAcquire::Auth", false)) { std::cerr << "Got Codename: " << MetaIndexParser->GetDist() << std::endl; @@ -1194,7 +1204,7 @@ bool pkgAcqMetaIndex::VerifyVendor(string Message) /*{{{*/ // return false; if (!Transformed.empty()) { - _error->Warning("Conflicting distribution: %s (expected %s but got %s)", + _error->Warning(_("Conflicting distribution: %s (expected %s but got %s)"), Desc.Description.c_str(), Transformed.c_str(), MetaIndexParser->GetDist().c_str()); diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc index 1fc27b1a1..24ed02ba5 100644 --- a/apt-pkg/indexrecords.cc +++ b/apt-pkg/indexrecords.cc @@ -7,8 +7,11 @@ #include #include #include +#include #include #include +#include + /*}}}*/ string indexRecords::GetDist() const { @@ -26,6 +29,11 @@ string indexRecords::GetExpectedDist() const return this->ExpectedDist; } +time_t indexRecords::GetValidUntil() const +{ + return this->ValidUntil; +} + const indexRecords::checkSum *indexRecords::Lookup(const string MetaKey) { return Entries[MetaKey]; @@ -82,7 +90,33 @@ bool indexRecords::Load(const string Filename) /*{{{*/ return false; } - string Strdate = Section.FindS("Date"); // FIXME: verify this somehow? + string Label = Section.FindS("Label"); + string StrDate = Section.FindS("Date"); + string StrValidUntil = Section.FindS("Valid-Until"); + + // if we have a Valid-Until header, use it + if (!StrValidUntil.empty()) + { + // set ValidUntil based on the information in the Release file + if(!StrToTime(StrValidUntil, ValidUntil)) + { + ErrorText = _(("Invalid 'Valid-Until' entry in Release file " + Filename).c_str()); + return false; + } + } else { + // if we don't have a valid-until string, check if we have a default + if (!Label.empty()) + { + int MaxAge = _config->FindI(string("apt::acquire::max-default-age::"+Label).c_str(),0); + if(MaxAge > 0 && !StrToTime(StrDate, ValidUntil)) + { + ErrorText = _(("Invalid 'Date' entry in Release file " + Filename).c_str()); + return false; + } + ValidUntil += 24*60*60*MaxAge; + } + } + return true; } /*}}}*/ @@ -160,6 +194,6 @@ indexRecords::indexRecords() } indexRecords::indexRecords(const string ExpectedDist) : - ExpectedDist(ExpectedDist) + ExpectedDist(ExpectedDist), ValidUntil(0) { } diff --git a/apt-pkg/indexrecords.h b/apt-pkg/indexrecords.h index 468d2bd0f..500cf23c4 100644 --- a/apt-pkg/indexrecords.h +++ b/apt-pkg/indexrecords.h @@ -12,6 +12,7 @@ #include #include +#include class indexRecords { @@ -25,6 +26,8 @@ class indexRecords string Dist; string Suite; string ExpectedDist; + time_t ValidUntil; + std::map Entries; public: @@ -38,6 +41,7 @@ class indexRecords virtual bool Load(string Filename); string GetDist() const; + time_t GetValidUntil() const; virtual bool CheckDist(const string MaybeDist) const; string GetExpectedDist() const; virtual ~indexRecords(){}; diff --git a/debian/changelog b/debian/changelog index 3771ca415..d8fb57757 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ apt (0.7.26~exp5) experimental; urgency=low [ David Kalnischkies ] + * apt-pkg/indexrecords.cc: + - backport forgotten Valid-Until patch from the obsolete experimental + branch to prevent replay attacks better, thanks to Thomas Viehmann + for the initial patch! (Closes: #499897) * cmdline/apt-get.cc: - rerun dpkg-source in source if --fix-broken is given (Closes: #576752) - don't suggest held packages as they are installed (Closes: #578135) diff --git a/test/pre-upload-check.py b/test/pre-upload-check.py index 268b3d672..e2dfecbd3 100755 --- a/test/pre-upload-check.py +++ b/test/pre-upload-check.py @@ -95,6 +95,20 @@ class testAuthentication(unittest.TestCase): self.assert_(len(glob.glob("/var/lib/apt/lists/partial/*")) == 0, "partial/ dir has leftover files: %s" % glob.glob("/var/lib/apt/lists/partial/*")) + def testValid(self): + for f in glob.glob("testsources.list/sources.list*validuntil*"): + self._cleanup() + (prefix, testtype, result) = f.split("-") + expected_res = self._expectedRes(result) + cmd = ["update"] + res = call([self.apt,"-o","Dir::Etc::sourcelist=./%s" % f]+cmd+apt_args, + stdout=stdout, stderr=stderr) + self.assert_(res == expected_res, + "test '%s' failed (got %s expected %s" % (f,res,expected_res)) + if expected_res == 0: + self.assert_(len(glob.glob("/var/lib/apt/lists/partial/*")) == 0, + "partial/ dir has leftover files: %s" % glob.glob("/var/lib/apt/lists/partial/*")) + class testLocalRepositories(unittest.TestCase): " test local repository regressions " diff --git a/test/testsources.list/sources.list.all-validuntil-broken b/test/testsources.list/sources.list.all-validuntil-broken new file mode 100644 index 000000000..bab59bb81 --- /dev/null +++ b/test/testsources.list/sources.list.all-validuntil-broken @@ -0,0 +1 @@ +deb http://people.ubuntu.com/~mvo/apt/auth-test-suit/all-validuntil-broken/ / -- cgit v1.2.3 From cd8cf88f0e64e222e9fdcbf86e6cbbe09306040e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 8 Jun 2010 22:46:42 +0200 Subject: * apt-pkg/contrib/strutl.cc: - split StrToTime() into HTTP1.1 and FTP date parser methods and use strptime() instead of some selfmade scanf mangling --- apt-pkg/contrib/strutl.cc | 36 ++++++++++++++++++++++++++++++++++++ apt-pkg/contrib/strutl.h | 4 +++- debian/changelog | 3 +++ 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index c7d63ce8a..96e8143ec 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -855,6 +855,42 @@ static time_t timegm(struct tm *t) } #endif /*}}}*/ +// FullDateToTime - Converts a HTTP1.1 full date strings into a time_t /*{{{*/ +// --------------------------------------------------------------------- +/* tries to parses a full date as specified in RFC2616 Section 3.3.1 + with one exception: All timezones (%Z) are accepted but the protocol + says that it MUST be GMT, but this one is equal to UTC which we will + encounter from time to time (e.g. in Release files) so we accept all + here and just assume it is GMT (or UTC) later on */ +bool RFC1123StrToTime(const char* const str,time_t &time) +{ + struct tm Tm; + // Sun, 06 Nov 1994 08:49:37 GMT ; RFC 822, updated by RFC 1123 + if (strptime(str, "%a, %d %b %Y %H:%M:%S %Z", &Tm) == NULL && + // Sunday, 06-Nov-94 08:49:37 GMT ; RFC 850, obsoleted by RFC 1036 + strptime(str, "%A, %d-%b-%y %H:%M:%S %Z", &Tm) == NULL && + // Sun Nov 6 08:49:37 1994 ; ANSI C's asctime() format + strptime(str, "%a %b %d %H:%M:%S %Y", &Tm) == NULL) + return false; + + time = timegm(&Tm); + return true; +} + /*}}}*/ +// FTPMDTMStrToTime - Converts a ftp modification date into a time_t /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool FTPMDTMStrToTime(const char* const str,time_t &time) +{ + struct tm Tm; + // MDTM includes no whitespaces but recommend and ignored by strptime + if (strptime(str, "%Y %m %d %H %M %S", &Tm) == NULL) + return false; + + time = timegm(&Tm); + return true; +} + /*}}}*/ // StrToTime - Converts a string into a time_t /*{{{*/ // --------------------------------------------------------------------- /* This handles all 3 populare time formats including RFC 1123, RFC 1036 diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index e509145f9..b5de0802e 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -45,7 +45,9 @@ string Base64Encode(const string &Str); string OutputInDepth(const unsigned long Depth, const char* Separator=" "); string URItoFileName(const string &URI); string TimeRFC1123(time_t Date); -bool StrToTime(const string &Val,time_t &Result); +bool RFC1123StrToTime(const char* const str,time_t &time) __attrib_const; +bool FTPMDTMStrToTime(const char* const str,time_t &time) __attrib_const; +__deprecated bool StrToTime(const string &Val,time_t &Result); string LookupTag(const string &Message,const char *Tag,const char *Default = 0); int StringToBool(const string &Text,int Default = -1); bool ReadMessages(int Fd, vector &List); diff --git a/debian/changelog b/debian/changelog index d8fb57757..2a40d084e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -44,6 +44,9 @@ apt (0.7.26~exp5) experimental; urgency=low - add 'disappear' to the known processing states, thanks Jonathan Nieder * apt-pkg/packagemanager.h: - export info about disappeared packages with GetDisappearedPackages() + * apt-pkg/contrib/strutl.cc: + - split StrToTime() into HTTP1.1 and FTP date parser methods and + use strptime() instead of some selfmade scanf mangling [ Michael Vogt ] * methods/http.{cc,h}: -- cgit v1.2.3 From 0323317c08c0b08bf0ba1ac37a37a8de333cdb40 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 8 Jun 2010 22:55:42 +0200 Subject: enhance the Valid-Until code a bit by using the correct RFC1123StrToTime method and allow for better translations of the error messages --- apt-pkg/acquire-item.cc | 16 +++++++++------- apt-pkg/indexrecords.cc | 24 ++++++++++++------------ 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 4a846804e..ac84c2e5e 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1178,13 +1178,15 @@ bool pkgAcqMetaIndex::VerifyVendor(string Message) /*{{{*/ Transformed = ""; } - if (_config->FindB("Acquire::Check-Valid-Until", true)) { - if (MetaIndexParser->GetValidUntil() > 0 && - time(NULL) > MetaIndexParser->GetValidUntil()) { - return _error->Error(_("Release file expired, ignoring %s (valid until %s)"), - RealURI.c_str(), - TimeRFC1123(MetaIndexParser->GetValidUntil()).c_str()); - } + if (_config->FindB("Acquire::Check-Valid-Until", true) == true && + MetaIndexParser->GetValidUntil() > 0) { + time_t const invalid_since = time(NULL) - MetaIndexParser->GetValidUntil(); + if (invalid_since > 0) + // TRANSLATOR: The first %s is the URL of the bad Release file, the second is + // the time since then the file is invalid - formated in the same way as in + // the download progress display (e.g. 7d 3h 42min 1s) + return _error->Error(_("Release file expired, ignoring %s (invalid since %s)"), + RealURI.c_str(), TimeToStr(invalid_since).c_str()); } if (_config->FindB("Debug::pkgAcquire::Auth", false)) diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc index 24ed02ba5..1312e6818 100644 --- a/apt-pkg/indexrecords.cc +++ b/apt-pkg/indexrecords.cc @@ -91,30 +91,30 @@ bool indexRecords::Load(const string Filename) /*{{{*/ } string Label = Section.FindS("Label"); - string StrDate = Section.FindS("Date"); + string StrDate = Section.FindS("Date"); string StrValidUntil = Section.FindS("Valid-Until"); // if we have a Valid-Until header, use it - if (!StrValidUntil.empty()) + if (StrValidUntil.empty() == false) { // set ValidUntil based on the information in the Release file - if(!StrToTime(StrValidUntil, ValidUntil)) + if(RFC1123StrToTime(StrValidUntil.c_str(), ValidUntil) == false) { - ErrorText = _(("Invalid 'Valid-Until' entry in Release file " + Filename).c_str()); + strprintf(ErrorText, _("Invalid 'Valid-Until' entry in Release file %s"), Filename.c_str()); return false; } } else { // if we don't have a valid-until string, check if we have a default - if (!Label.empty()) + int MaxAge = _config->FindI("APT::Acquire::Max-Default-Age", 0); + if (Label.empty() == true) + MaxAge = _config->FindI(string("APT::Acquire::Max-Default-Age::"+Label).c_str(), MaxAge); + + if(MaxAge > 0 && RFC1123StrToTime(StrDate.c_str(), ValidUntil) == false) { - int MaxAge = _config->FindI(string("apt::acquire::max-default-age::"+Label).c_str(),0); - if(MaxAge > 0 && !StrToTime(StrDate, ValidUntil)) - { - ErrorText = _(("Invalid 'Date' entry in Release file " + Filename).c_str()); - return false; - } - ValidUntil += 24*60*60*MaxAge; + strprintf(ErrorText, _("Invalid 'Date' entry in Release file %s"), Filename.c_str()); + return false; } + ValidUntil += 24*60*60*MaxAge; } return true; -- cgit v1.2.3 From bbde96a611f39f5040b332dae1515207db341743 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 8 Jun 2010 23:38:34 +0200 Subject: use the Valid-Until header from the Release file but if the user provides a setting in the configuration prefer the date which is earlier. --- apt-pkg/indexrecords.cc | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc index 1312e6818..cdc2897bf 100644 --- a/apt-pkg/indexrecords.cc +++ b/apt-pkg/indexrecords.cc @@ -88,34 +88,39 @@ bool indexRecords::Load(const string Filename) /*{{{*/ { strprintf(ErrorText, _("No Hash entry in Release file %s"), Filename.c_str()); return false; - } + } string Label = Section.FindS("Label"); string StrDate = Section.FindS("Date"); string StrValidUntil = Section.FindS("Valid-Until"); - // if we have a Valid-Until header, use it + // if we have a Valid-Until header in the Release file, use it as default if (StrValidUntil.empty() == false) { - // set ValidUntil based on the information in the Release file if(RFC1123StrToTime(StrValidUntil.c_str(), ValidUntil) == false) { strprintf(ErrorText, _("Invalid 'Valid-Until' entry in Release file %s"), Filename.c_str()); return false; } - } else { - // if we don't have a valid-until string, check if we have a default - int MaxAge = _config->FindI("APT::Acquire::Max-Default-Age", 0); - if (Label.empty() == true) - MaxAge = _config->FindI(string("APT::Acquire::Max-Default-Age::"+Label).c_str(), MaxAge); + } + // get the user settings for this archive and use what expires earlier + int MaxAge = _config->FindI("APT::Acquire::Max-Default-Age", 0); + if (Label.empty() == true) + MaxAge = _config->FindI(string("APT::Acquire::Max-Default-Age::" + Label).c_str(), MaxAge); - if(MaxAge > 0 && RFC1123StrToTime(StrDate.c_str(), ValidUntil) == false) - { - strprintf(ErrorText, _("Invalid 'Date' entry in Release file %s"), Filename.c_str()); - return false; - } - ValidUntil += 24*60*60*MaxAge; + if(MaxAge == 0) // No user settings, use the one from the Release file + return true; + + time_t date; + if (RFC1123StrToTime(StrDate.c_str(), date) == false) + { + strprintf(ErrorText, _("Invalid 'Date' entry in Release file %s"), Filename.c_str()); + return false; } + date += 24*60*60*MaxAge; + + if (ValidUntil == 0 || ValidUntil > date) + ValidUntil = date; return true; } -- cgit v1.2.3 From c99e48ec26e693d9aa4a2a9f868284f7aa49784d Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Jun 2010 00:12:14 +0200 Subject: * ftparchive/writer.cc: - add ValidTime option to generate a Valid-Until header in Release file --- debian/changelog | 2 ++ doc/apt-ftparchive.1.xml | 3 ++- ftparchive/writer.cc | 10 ++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2a40d084e..fa0e667e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,8 @@ apt (0.7.26~exp5) experimental; urgency=low * apt-pkg/contrib/strutl.cc: - split StrToTime() into HTTP1.1 and FTP date parser methods and use strptime() instead of some selfmade scanf mangling + * ftparchive/writer.cc: + - add ValidTime option to generate a Valid-Until header in Release file [ Michael Vogt ] * methods/http.{cc,h}: diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index a3ac45bd3..549aa6a34 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -122,7 +122,8 @@ e.g. APT::FTPArchive::Release::Origin. The supported fields are: Origin, Label, Suite, Version, Codename, Date, - Architectures, Components, Description. + Valid-Until, Architectures, + Components, Description. diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index 6cda29b21..650eec57c 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -924,6 +924,15 @@ ReleaseWriter::ReleaseWriter(string const &DB) datestr[0] = '\0'; } + time_t const validuntil = now + _config->FindI("APT::FTPArchive::Release::ValidTime", 0); + char validstr[128]; + if (now == validuntil || + strftime(validstr, sizeof(validstr), "%a, %d %b %Y %H:%M:%S UTC", + gmtime(&validuntil)) == 0) + { + datestr[0] = '\0'; + } + map Fields; Fields["Origin"] = ""; Fields["Label"] = ""; @@ -931,6 +940,7 @@ ReleaseWriter::ReleaseWriter(string const &DB) Fields["Version"] = ""; Fields["Codename"] = ""; Fields["Date"] = datestr; + Fields["Valid-Until"] = validstr; Fields["Architectures"] = ""; Fields["Components"] = ""; Fields["Description"] = ""; -- cgit v1.2.3 From 550891457ff63db01b57d9057a5fe447a165e10c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Jun 2010 00:27:22 +0200 Subject: use the portable timegm shown in his manpage instead of a strange looking code copycat from wget --- apt-pkg/contrib/strutl.cc | 36 ++++++++++++++++-------------------- debian/changelog | 2 ++ 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 96e8143ec..160450366 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -827,31 +827,27 @@ static int MonthConv(char *Month) } } /*}}}*/ -// timegm - Internal timegm function if gnu is not available /*{{{*/ +// timegm - Internal timegm if the gnu version is not available /*{{{*/ // --------------------------------------------------------------------- -/* Ripped this evil little function from wget - I prefer the use of - GNU timegm if possible as this technique will have interesting problems - with leap seconds, timezones and other. - - Converts struct tm to time_t, assuming the data in tm is UTC rather +/* Converts struct tm to time_t, assuming the data in tm is UTC rather than local timezone (mktime assumes the latter). - - Contributed by Roger Beeman , with the help of - Mark Baushke and the rest of the Gurus at CISCO. */ - -/* Turned it into an autoconf check, because GNU is not the only thing which - can provide timegm. -- 2002-09-22, Joel Baker */ -#ifndef HAVE_TIMEGM // Now with autoconf! + This function is a nonstandard GNU extension that is also present on + the BSDs and maybe other systems. For others we follow the advice of + the manpage of timegm and use his portable replacement. */ +#ifndef HAVE_TIMEGM static time_t timegm(struct tm *t) { - time_t tl, tb; - - tl = mktime (t); - if (tl == -1) - return -1; - tb = mktime (gmtime (&tl)); - return (tl <= tb ? (tl + (tl - tb)) : (tl - (tb - tl))); + char *tz = getenv("TZ"); + setenv("TZ", "", 1); + tzset(); + time_t ret = mktime(t); + if (tz) + setenv("TZ", tz, 1); + else + unsetenv("TZ"); + tzset(); + return ret; } #endif /*}}}*/ diff --git a/debian/changelog b/debian/changelog index fa0e667e7..049999230 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,8 @@ apt (0.7.26~exp5) experimental; urgency=low * apt-pkg/contrib/strutl.cc: - split StrToTime() into HTTP1.1 and FTP date parser methods and use strptime() instead of some selfmade scanf mangling + - use the portable timegm shown in his manpage instead of a strange + looking code copycat from wget * ftparchive/writer.cc: - add ValidTime option to generate a Valid-Until header in Release file -- cgit v1.2.3 From 96cc64a521957d63704de72ed95f1c839698c53c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Jun 2010 00:53:44 +0200 Subject: move the users away from the deprecated StrToTime() method --- apt-pkg/acquire-method.cc | 2 +- apt-pkg/contrib/strutl.h | 4 ++-- methods/ftp.cc | 3 +-- methods/http.cc | 2 +- methods/rsh.cc | 3 +-- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc index fe066741c..b82dceecb 100644 --- a/apt-pkg/acquire-method.cc +++ b/apt-pkg/acquire-method.cc @@ -373,7 +373,7 @@ int pkgAcqMethod::Run(bool Single) Tmp->Uri = LookupTag(Message,"URI"); Tmp->DestFile = LookupTag(Message,"FileName"); - if (StrToTime(LookupTag(Message,"Last-Modified"),Tmp->LastModified) == false) + if (RFC1123StrToTime(LookupTag(Message,"Last-Modified").c_str(),Tmp->LastModified) == false) Tmp->LastModified = 0; Tmp->IndexFile = StringToBool(LookupTag(Message,"Index-File"),false); Tmp->Next = 0; diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index b5de0802e..a457ff047 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -45,8 +45,8 @@ string Base64Encode(const string &Str); string OutputInDepth(const unsigned long Depth, const char* Separator=" "); string URItoFileName(const string &URI); string TimeRFC1123(time_t Date); -bool RFC1123StrToTime(const char* const str,time_t &time) __attrib_const; -bool FTPMDTMStrToTime(const char* const str,time_t &time) __attrib_const; +bool RFC1123StrToTime(const char* const str,time_t &time) __must_check; +bool FTPMDTMStrToTime(const char* const str,time_t &time) __must_check; __deprecated bool StrToTime(const string &Val,time_t &Result); string LookupTag(const string &Message,const char *Tag,const char *Default = 0); int StringToBool(const string &Text,int Default = -1); diff --git a/methods/ftp.cc b/methods/ftp.cc index 3e1725823..97248f900 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -661,8 +661,7 @@ bool FTPConn::ModTime(const char *Path, time_t &Time) return true; // Parse it - StrToTime(Msg,Time); - return true; + return FTPMDTMStrToTime(Msg.c_str(), Time); } /*}}}*/ // FTPConn::CreateDataFd - Get a data connection /*{{{*/ diff --git a/methods/http.cc b/methods/http.cc index d43dd14c8..5fdc62696 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -631,7 +631,7 @@ bool ServerState::HeaderLine(string Line) if (stringcasecmp(Tag,"Last-Modified:") == 0) { - if (StrToTime(Val,Date) == false) + if (RFC1123StrToTime(Val.c_str(), Date) == false) return _error->Error(_("Unknown date format")); return true; } diff --git a/methods/rsh.cc b/methods/rsh.cc index f0ccfc42d..97b4ef151 100644 --- a/methods/rsh.cc +++ b/methods/rsh.cc @@ -278,8 +278,7 @@ bool RSHConn::ModTime(const char *Path, time_t &Time) return false; // Parse it - StrToTime(Msg,Time); - return true; + return FTPMDTMStrToTime(Msg.c_str(), Time); } /*}}}*/ // RSHConn::Get - Get a file /*{{{*/ -- cgit v1.2.3 From b02fffa64833e1f8e2617669d89de0a6d0882747 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Jun 2010 10:46:35 +0200 Subject: rename the options, document them and reorder the changelog a bit --- apt-pkg/indexrecords.cc | 4 ++-- debian/changelog | 24 ++++++++++++++++-------- doc/apt.conf.5.xml | 24 ++++++++++++++++++++++++ doc/examples/configure-index | 4 ++++ 4 files changed, 46 insertions(+), 10 deletions(-) diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc index cdc2897bf..3bde7437d 100644 --- a/apt-pkg/indexrecords.cc +++ b/apt-pkg/indexrecords.cc @@ -104,9 +104,9 @@ bool indexRecords::Load(const string Filename) /*{{{*/ } } // get the user settings for this archive and use what expires earlier - int MaxAge = _config->FindI("APT::Acquire::Max-Default-Age", 0); + int MaxAge = _config->FindI("Acquire::Max-ValidTime", 0); if (Label.empty() == true) - MaxAge = _config->FindI(string("APT::Acquire::Max-Default-Age::" + Label).c_str(), MaxAge); + MaxAge = _config->FindI(string("Acquire::Max-ValidTime::" + Label).c_str(), MaxAge); if(MaxAge == 0) // No user settings, use the one from the Release file return true; diff --git a/debian/changelog b/debian/changelog index 049999230..c3f7a3e25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,25 @@ -apt (0.7.26~exp5) experimental; urgency=low +apt (0.7.26~exp6) UNRELEASED; urgency=low [ David Kalnischkies ] + * doc/apt.conf.5.xml: + - document the new Valid-Until related options * apt-pkg/indexrecords.cc: - backport forgotten Valid-Until patch from the obsolete experimental branch to prevent replay attacks better, thanks to Thomas Viehmann for the initial patch! (Closes: #499897) + * apt-pkg/contrib/strutl.cc: + - split StrToTime() into HTTP1.1 and FTP date parser methods and + use strptime() instead of some self-made scanf mangling + - use the portable timegm shown in his manpage instead of a strange + looking code copycat from wget + * ftparchive/writer.cc: + - add ValidTime option to generate a Valid-Until header in Release file + + -- David Kalnischkies Wed, 09 Jun 2010 10:43:58 +0200 + +apt (0.7.26~exp5) experimental; urgency=low + + [ David Kalnischkies ] * cmdline/apt-get.cc: - rerun dpkg-source in source if --fix-broken is given (Closes: #576752) - don't suggest held packages as they are installed (Closes: #578135) @@ -44,13 +59,6 @@ apt (0.7.26~exp5) experimental; urgency=low - add 'disappear' to the known processing states, thanks Jonathan Nieder * apt-pkg/packagemanager.h: - export info about disappeared packages with GetDisappearedPackages() - * apt-pkg/contrib/strutl.cc: - - split StrToTime() into HTTP1.1 and FTP date parser methods and - use strptime() instead of some selfmade scanf mangling - - use the portable timegm shown in his manpage instead of a strange - looking code copycat from wget - * ftparchive/writer.cc: - - add ValidTime option to generate a Valid-Until header in Release file [ Michael Vogt ] * methods/http.{cc,h}: diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index fe005e0f1..0cf4bb663 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -230,6 +230,30 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; and the URI handlers. + Check-Valid-Until + Security related option defaulting to true as an + expiring validation for a Release file prevents longtime replay attacks + and can e.g. also help users to identify no longer updated mirrors - + but the feature depends on the correctness of the time on the user system. + Archive maintainers are encouraged to create Release files with the + Valid-Until header, but if they don't or a stricter value + is volitional the following Max-ValidTime option can be used. + + + + Max-ValidTime + Seconds the Release file should be considered valid after + it was created. The default is "for ever" (0) if the Release file of the + archive doesn't include a Valid-Until header. + If it does then this date is the default. The date from the Release file or + the date specified by the creation time of the Release file + (Date header) plus the seconds specified with this + options are used to check if the validation of a file has expired by using + the earlier date of the two. Archive specific settings can be made by + appending the label of the archive to the option name. + + + PDiffs Try to download deltas called PDiffs for Packages or Sources files instead of downloading whole ones. True diff --git a/doc/examples/configure-index b/doc/examples/configure-index index d168417d8..127feb9e9 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -176,6 +176,10 @@ Acquire PDiffs::SizeLimit "50"; // don't use diffs if size of all patches excess // 50% of the size of the original file + Check-Valid-Until "true"; + Max-ValidTime "864000"; // 10 days + Max-ValidTime::Debian-Security "604800"; // 7 days, label specific configuration + // HTTP method configuration http { -- cgit v1.2.3 From ba74b79fb5c74d916f9bfe1b314e8107a9e7eab4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 9 Jun 2010 13:03:41 +0200 Subject: debian/rules: remove two more leftovers fromthe ubuntu merge --- debian/rules | 2 -- 1 file changed, 2 deletions(-) diff --git a/debian/rules b/debian/rules index 4c6795910..0ac45f851 100755 --- a/debian/rules +++ b/debian/rules @@ -215,8 +215,6 @@ apt: build build-doc debian/shlibs.local cp debian/bugscript debian/$@/usr/share/bug/apt/script cp debian/apt.logrotate debian/$@/etc/logrotate.d/apt - cp share/ubuntu-archive.gpg debian/$@/usr/share/$@ - sed 's/^_//' share/apt-auth-failure.note > debian/$@/usr/share/$@/apt-auth-failure.note cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove # copy lintian override -- cgit v1.2.3 From a3a03f5d7436c870edac9c0eb92e85e1fcaf6bca Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Wed, 9 Jun 2010 14:08:20 +0200 Subject: * apt-pkg/contrib/fileutl.{h,cc}: - Add support for transparent reading of gzipped files. - Link against zlib (in apt-pkg/makefile) and add zlib build dependency. --- apt-pkg/contrib/fileutl.cc | 47 ++++++++++++++++++++++++++++++++++++++++------ apt-pkg/contrib/fileutl.h | 9 ++++++--- apt-pkg/makefile | 2 +- debian/changelog | 6 ++++++ debian/control | 2 +- 5 files changed, 55 insertions(+), 11 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index da32983f1..11a9e7f7b 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -11,6 +11,7 @@ Most of this source is placed in the Public Domain, do with it what you will It was originally written by Jason Gunthorpe . + FileFd gzip support added by Martin Pitt The exception is RunScripts() it is under the GPLv2 @@ -603,6 +604,13 @@ bool FileFd::Open(string FileName,OpenMode Mode, unsigned long Perms) { case ReadOnly: iFd = open(FileName.c_str(),O_RDONLY); + if (iFd > 0 && FileName.compare(FileName.size()-3, 3, ".gz") == 0) { + gz = gzdopen (iFd, "r"); + if (gz == NULL) { + close (iFd); + iFd = -1; + } + } break; case WriteEmpty: @@ -658,7 +666,10 @@ bool FileFd::Read(void *To,unsigned long Size,unsigned long *Actual) do { - Res = read(iFd,To,Size); + if (gz != NULL) + Res = gzread(gz,To,Size); + else + Res = read(iFd,To,Size); if (Res < 0 && errno == EINTR) continue; if (Res < 0) @@ -697,7 +708,10 @@ bool FileFd::Write(const void *From,unsigned long Size) errno = 0; do { - Res = write(iFd,From,Size); + if (gz != NULL) + Res = gzwrite(gz,From,Size); + else + Res = write(iFd,From,Size); if (Res < 0 && errno == EINTR) continue; if (Res < 0) @@ -723,7 +737,12 @@ bool FileFd::Write(const void *From,unsigned long Size) /* */ bool FileFd::Seek(unsigned long To) { - if (lseek(iFd,To,SEEK_SET) != (signed)To) + int res; + if (gz) + res = gzseek(gz,To,SEEK_SET); + else + res = lseek(iFd,To,SEEK_SET); + if (res != (signed)To) { Flags |= Fail; return _error->Error("Unable to seek to %lu",To); @@ -737,7 +756,12 @@ bool FileFd::Seek(unsigned long To) /* */ bool FileFd::Skip(unsigned long Over) { - if (lseek(iFd,Over,SEEK_CUR) < 0) + int res; + if (gz) + res = gzseek(gz,Over,SEEK_CUR); + else + res = lseek(iFd,Over,SEEK_CUR); + if (res < 0) { Flags |= Fail; return _error->Error("Unable to seek ahead %lu",Over); @@ -751,6 +775,11 @@ bool FileFd::Skip(unsigned long Over) /* */ bool FileFd::Truncate(unsigned long To) { + if (gz) + { + Flags |= Fail; + return _error->Error("Truncating gzipped files is not implemented (%s)", FileName.c_str()); + } if (ftruncate(iFd,To) != 0) { Flags |= Fail; @@ -765,7 +794,11 @@ bool FileFd::Truncate(unsigned long To) /* */ unsigned long FileFd::Tell() { - off_t Res = lseek(iFd,0,SEEK_CUR); + off_t Res; + if (gz) + Res = gztell(gz); + else + Res = lseek(iFd,0,SEEK_CUR); if (Res == (off_t)-1) _error->Errno("lseek","Failed to determine the current file position"); return Res; @@ -776,6 +809,7 @@ unsigned long FileFd::Tell() /* */ unsigned long FileFd::Size() { + //TODO: For gz, do we need the actual file size here or the uncompressed length? struct stat Buf; if (fstat(iFd,&Buf) != 0) return _error->Errno("fstat","Unable to determine the file size"); @@ -789,9 +823,10 @@ bool FileFd::Close() { bool Res = true; if ((Flags & AutoClose) == AutoClose) - if (iFd >= 0 && close(iFd) != 0) + if ((gz != NULL && gzclose(gz) != 0) || (gz == NULL && iFd > 0 && close(iFd) != 0)) Res &= _error->Errno("close",_("Problem closing the file")); iFd = -1; + gz = NULL; if ((Flags & Fail) == Fail && (Flags & DelOnFail) == DelOnFail && FileName.empty() == false) diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 85a94898c..9925bbed4 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -25,6 +25,8 @@ #include #include +#include + using std::string; class FileFd @@ -36,6 +38,7 @@ class FileFd HitEof = (1<<3)}; unsigned long Flags; string FileName; + gzFile gz; public: enum OpenMode {ReadOnly,WriteEmpty,WriteExists,WriteAny,WriteTemp}; @@ -69,12 +72,12 @@ class FileFd inline string &Name() {return FileName;}; FileFd(string FileName,OpenMode Mode,unsigned long Perms = 0666) : iFd(-1), - Flags(0) + Flags(0), gz(NULL) { Open(FileName,Mode,Perms); }; - FileFd(int Fd = -1) : iFd(Fd), Flags(AutoClose) {}; - FileFd(int Fd,bool) : iFd(Fd), Flags(0) {}; + FileFd(int Fd = -1) : iFd(Fd), Flags(AutoClose), gz(NULL) {}; + FileFd(int Fd,bool) : iFd(Fd), Flags(0), gz(NULL) {}; virtual ~FileFd(); }; diff --git a/apt-pkg/makefile b/apt-pkg/makefile index bdd49c089..4cf07f3a8 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -14,7 +14,7 @@ include ../buildlib/libversion.mak LIBRARY=apt-pkg MAJOR=$(LIBAPTPKG_MAJOR) MINOR=$(LIBAPTPKG_RELEASE) -SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil -ldl +SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil -ldl -lz APT_DOMAIN:=libapt-pkg$(LIBAPTPKG_MAJOR) # Source code for the contributed non-core things diff --git a/debian/changelog b/debian/changelog index bc3da3679..2fba94d7c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low + [ Christian Perrier ] * Slovak translation update. Closes: #581159 * Italian translation update. Closes: #581742 + [ Martin Pitt ] + * apt-pkg/contrib/fileutl.{h,cc}: + - Add support for transparent reading of gzipped files. + - Link against zlib (in apt-pkg/makefile) and add zlib build dependency. + -- Christian Perrier Tue, 11 May 2010 19:52:00 +0200 apt (0.7.26~exp4) unstable; urgency=low diff --git a/debian/control b/debian/control index 0c6f6b16d..58916a2b9 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , Luca Bruno , Julian Andres Klode Standards-Version: 3.8.4 -Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev +Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Package: apt -- cgit v1.2.3 From ec7a129eeb1611ec097bc99a148d6d3a3dccf044 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Wed, 9 Jun 2010 14:09:42 +0200 Subject: * apt-pkg/deb/debindexfile.cc: - If we do not find uncompressed package/source/translation indexes, look for gzip compressed ones. --- apt-pkg/deb/debindexfile.cc | 22 +++++++++++++++++++--- debian/changelog | 3 +++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index 7379ca997..e87c21f13 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -106,8 +106,14 @@ string debSourcesIndex::Info(const char *Type) const /* */ inline string debSourcesIndex::IndexFile(const char *Type) const { - return URItoFileName(IndexURI(Type)); + string s = URItoFileName(IndexURI(Type)); + string sgzip = s + ".gz"; + if (!FileExists(s) && FileExists(sgzip)) + return sgzip; + else + return s; } + string debSourcesIndex::IndexURI(const char *Type) const { string Res; @@ -213,7 +219,12 @@ string debPackagesIndex::Info(const char *Type) const /* */ inline string debPackagesIndex::IndexFile(const char *Type) const { - return _config->FindDir("Dir::State::lists") + URItoFileName(IndexURI(Type)); + string s =_config->FindDir("Dir::State::lists") + URItoFileName(IndexURI(Type)); + string sgzip = s + ".gz"; + if (!FileExists(s) && FileExists(sgzip)) + return sgzip; + else + return s; } string debPackagesIndex::IndexURI(const char *Type) const { @@ -340,7 +351,12 @@ debTranslationsIndex::debTranslationsIndex(string URI,string Dist,string Section /* */ inline string debTranslationsIndex::IndexFile(const char *Type) const { - return _config->FindDir("Dir::State::lists") + URItoFileName(IndexURI(Type)); + string s =_config->FindDir("Dir::State::lists") + URItoFileName(IndexURI(Type)); + string sgzip = s + ".gz"; + if (!FileExists(s) && FileExists(sgzip)) + return sgzip; + else + return s; } string debTranslationsIndex::IndexURI(const char *Type) const { diff --git a/debian/changelog b/debian/changelog index 2fba94d7c..80c504b99 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low * apt-pkg/contrib/fileutl.{h,cc}: - Add support for transparent reading of gzipped files. - Link against zlib (in apt-pkg/makefile) and add zlib build dependency. + * apt-pkg/deb/debindexfile.cc: + - If we do not find uncompressed package/source/translation indexes, look + for gzip compressed ones. -- Christian Perrier Tue, 11 May 2010 19:52:00 +0200 -- cgit v1.2.3 From 6d052eba8cc67245b21d333ece2e76efb22f82db Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Jun 2010 14:18:56 +0200 Subject: remove the "typename" from the const_iterators as gcc-4.4 doesn't like them and gcc-4.5 does the right thing (TM) with and without them --- apt-pkg/cacheset.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index c9d121083..668d8039e 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -61,7 +61,7 @@ public: /*{{{*/ }; }; // 103. set::iterator is required to be modifiable, but this allows modification of keys - typedef typename APT::PackageSet::const_iterator iterator; + typedef APT::PackageSet::const_iterator iterator; using std::set::insert; inline void insert(pkgCache::PkgIterator const &P) { if (P.end() == false) std::set::insert(P); }; @@ -169,7 +169,7 @@ public: /*{{{*/ inline pkgCache::VerFileIterator NewestFile() const { return (**this).NewestFile(); }; }; // 103. set::iterator is required to be modifiable, but this allows modification of keys - typedef typename APT::VersionSet::const_iterator iterator; + typedef APT::VersionSet::const_iterator iterator; using std::set::insert; inline void insert(pkgCache::VerIterator const &V) { if (V.end() == false) std::set::insert(V); }; -- cgit v1.2.3 From 9ee8287e5ea8a993fbb4c5beb8fe8bbddadfa7a0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Jun 2010 14:20:27 +0200 Subject: * apt-pkg/policy.cc: - get the candidate right for a not-installed pseudo package if his non-pseudo friend is installed --- apt-pkg/policy.cc | 32 +++++++++++++++++++++----------- apt-pkg/policy.h | 4 ++-- debian/changelog | 5 ++++- 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc index 922efb0dd..a3286391b 100644 --- a/apt-pkg/policy.cc +++ b/apt-pkg/policy.cc @@ -115,7 +115,7 @@ bool pkgPolicy::InitDefaults() // --------------------------------------------------------------------- /* Evaluate the package pins and the default list to deteremine what the best package is. */ -pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator Pkg) +pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator const &Pkg) { // Look for a package pin and evaluate it. signed Max = GetPriority(Pkg); @@ -147,6 +147,16 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator Pkg) */ for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; Ver++) { + /* Lets see if this version is the installed version */ + bool instVer = (Pkg.CurrentVer() == Ver); + if (Ver.Pseudo() == true && instVer == false) + { + pkgCache::PkgIterator const allPkg = Ver.ParentPkg().Group().FindPkg("all"); + if (allPkg->CurrentVer != 0 && allPkg.CurrentVer()->Hash == Ver->Hash && + strcmp(allPkg.CurVersion(), Ver.VerStr()) == 0) + instVer = true; + } + for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false; VF++) { /* If this is the status file, and the current version is not the @@ -155,9 +165,9 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator Pkg) out bogus entries that may be due to config-file states, or other. */ if ((VF.File()->Flags & pkgCache::Flag::NotSource) == pkgCache::Flag::NotSource && - Pkg.CurrentVer() != Ver) + instVer == false) continue; - + signed Prio = PFPriority[VF.File()->ID]; if (Prio > Max) { @@ -171,7 +181,7 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator Pkg) } } - if (Pkg.CurrentVer() == Ver && Max < 1000) + if (instVer == true && Max < 1000) { /* Elevate our current selection (or the status file itself) to the Pseudo-status priority. */ @@ -189,6 +199,7 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator Pkg) // will always be a candidate (Closes: #512318) if (!Pref.IsGood() && MaxAlt > 0) Pref = PrefAlt; + return Pref; } /*}}}*/ @@ -238,15 +249,14 @@ void pkgPolicy::CreatePin(pkgVersionMatch::MatchType Type,string Name, // Policy::GetMatch - Get the matching version for a package pin /*{{{*/ // --------------------------------------------------------------------- /* */ -pkgCache::VerIterator pkgPolicy::GetMatch(pkgCache::PkgIterator Pkg) +pkgCache::VerIterator pkgPolicy::GetMatch(pkgCache::PkgIterator const &Pkg) { const Pin &PPkg = Pins[Pkg->ID]; - if (PPkg.Type != pkgVersionMatch::None) - { - pkgVersionMatch Match(PPkg.Data,PPkg.Type); - return Match.Find(Pkg); - } - return pkgCache::VerIterator(*Pkg.Cache()); + if (PPkg.Type == pkgVersionMatch::None) + return pkgCache::VerIterator(*Pkg.Cache()); + + pkgVersionMatch Match(PPkg.Data,PPkg.Type); + return Match.Find(Pkg); } /*}}}*/ // Policy::GetPriority - Get the priority of the package pin /*{{{*/ diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h index 4894682fa..28cb3ccbb 100644 --- a/apt-pkg/policy.h +++ b/apt-pkg/policy.h @@ -72,10 +72,10 @@ class pkgPolicy : public pkgDepCache::Policy inline signed short GetPriority(pkgCache::PkgFileIterator const &File) {return PFPriority[File->ID];}; signed short GetPriority(pkgCache::PkgIterator const &Pkg); - pkgCache::VerIterator GetMatch(pkgCache::PkgIterator Pkg); + pkgCache::VerIterator GetMatch(pkgCache::PkgIterator const &Pkg); // Things for the cache interface. - virtual pkgCache::VerIterator GetCandidateVer(pkgCache::PkgIterator Pkg); + virtual pkgCache::VerIterator GetCandidateVer(pkgCache::PkgIterator const &Pkg); virtual bool IsImportantDep(pkgCache::DepIterator Dep) {return pkgDepCache::Policy::IsImportantDep(Dep);}; bool InitDefaults(); diff --git a/debian/changelog b/debian/changelog index 9135d523b..8d67582e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -81,8 +81,11 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low looking code copycat from wget * ftparchive/writer.cc: - add ValidTime option to generate a Valid-Until header in Release file + * apt-pkg/policy.cc: + - get the candidate right for a not-installed pseudo package if + his non-pseudo friend is installed - -- David Kalnischkies Wed, 09 Jun 2010 10:52:31 +0200 + -- David Kalnischkies Wed, 09 Jun 2010 14:20:19 +0200 apt (0.7.26~exp5) experimental; urgency=low -- cgit v1.2.3 From 51561c4de75e84c2b2d037eb57387d3d3c2aa494 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Jun 2010 17:13:40 +0200 Subject: fix compiler warning in the new mirror code --- methods/http.h | 2 +- methods/mirror.cc | 27 ++++++++++++++++----------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/methods/http.h b/methods/http.h index d0677bdaa..0bc019e77 100644 --- a/methods/http.h +++ b/methods/http.h @@ -13,7 +13,7 @@ #define MAXLEN 360 - +#include using std::cout; using std::endl; diff --git a/methods/mirror.cc b/methods/mirror.cc index b2b6b2ecf..e8873d97b 100644 --- a/methods/mirror.cc +++ b/methods/mirror.cc @@ -153,11 +153,12 @@ void MirrorMethod::CurrentQueueUriToMirror() return; // find current mirror and select next one - for (int i=0; i < AllMirrors.size(); i++) + for (vector::const_iterator mirror = AllMirrors.begin(); + mirror != AllMirrors.end(); ++mirror) { - if (Queue->Uri.find(AllMirrors[i]) == 0) + if (Queue->Uri.find(*mirror) == 0) { - Queue->Uri.replace(0, AllMirrors[i].size(), BaseUri); + Queue->Uri.replace(0, mirror->length(), BaseUri); return; } } @@ -168,15 +169,19 @@ void MirrorMethod::CurrentQueueUriToMirror() bool MirrorMethod::TryNextMirror() { // find current mirror and select next one - for (int i=0; i < AllMirrors.size()-1; i++) + for (vector::const_iterator mirror = AllMirrors.begin(); + mirror != AllMirrors.end(); ++mirror) { - if (Queue->Uri.find(AllMirrors[i]) == 0) - { - Queue->Uri.replace(0, AllMirrors[i].size(), AllMirrors[i+1]); - if (Debug) - clog << "TryNextMirror: " << Queue->Uri << endl; - return true; - } + if (Queue->Uri.find(*mirror) != 0) + continue; + + vector::const_iterator nextmirror = mirror + 1; + if (nextmirror != AllMirrors.end()) + break; + Queue->Uri.replace(0, mirror->length(), *nextmirror); + if (Debug) + clog << "TryNextMirror: " << Queue->Uri << endl; + return true; } if (Debug) -- cgit v1.2.3 From a319c4eeae62511d1cb58986742491d3e224bf20 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Jun 2010 17:19:40 +0200 Subject: * apt-pkg/indexcopy.cc: - move the gpg codecopy to a new method and use it also in methods/gpgv.cc --- apt-pkg/indexcopy.cc | 109 +++++++++++++++++++++++++++++++++------------------ apt-pkg/indexcopy.h | 3 ++ debian/changelog | 4 +- methods/gpgv.cc | 47 +++------------------- 4 files changed, 82 insertions(+), 81 deletions(-) diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index 53eb11172..47eaefc5c 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -590,66 +590,39 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector &SigList, indexRecords *MetaIndex = new indexRecords; string prefix = *I; + string const releasegpg = *I+"Release.gpg"; + string const release = *I+"Release"; + // a Release.gpg without a Release should never happen - if(!FileExists(*I+"Release")) + if(FileExists(release) == false) { delete MetaIndex; continue; } - - // verify the gpg signature of "Release" - // gpg --verify "*I+Release.gpg", "*I+Release" - const char *Args[400]; - unsigned int i = 0; - - string gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); - string pubringpath = _config->Find("Apt::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg"); - string releasegpg = *I+"Release.gpg"; - string release = *I+"Release"; - - Args[i++] = gpgvpath.c_str(); - Args[i++] = "--keyring"; - Args[i++] = pubringpath.c_str(); - Configuration::Item const *Opts; - Opts = _config->Tree("Acquire::gpgv::Options"); - if (Opts != 0) - { - Opts = Opts->Child; - for (; Opts != 0; Opts = Opts->Next) - { - if (Opts->Value.empty() == true) - continue; - Args[i++] = Opts->Value.c_str(); - if(i >= 390) { - _error->Error("Argument list from Acquire::gpgv::Options too long. Exiting."); - return false; - } - } - } - - Args[i++] = releasegpg.c_str(); - Args[i++] = release.c_str(); - Args[i++] = NULL; - pid_t pid = ExecFork(); if(pid < 0) { _error->Error("Fork failed"); return false; } if(pid == 0) { - execvp(gpgvpath.c_str(), (char**)Args); + string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); + std::vector Args = GetGPGVCommandLine(); + Args.push_back(releasegpg.c_str()); + Args.push_back(release.c_str()); + Args.push_back(NULL); + execvp(gpgvpath.c_str(), (char**) &Args[0]); } if(!ExecWait(pid, "gpgv")) { _error->Warning("Signature verification failed for: %s", - string(*I+"Release.gpg").c_str()); + releasegpg.c_str()); // something went wrong, don't copy the Release.gpg // FIXME: delete any existing gpg file? continue; } // Open the Release file and add it to the MetaIndex - if(!MetaIndex->Load(*I+"Release")) + if(!MetaIndex->Load(release)) { _error->Error("%s",MetaIndex->ErrorText.c_str()); return false; @@ -679,6 +652,64 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector &SigList, return true; } /*}}}*/ +// SigVerify::GetGPGVCommandLine - returns the command needed for verify/*{{{*/ +// --------------------------------------------------------------------- +/* Generating the commandline for calling gpgv is somehow complicated as + we need to add multiple keyrings and user supplied options. Also, as + the cdrom code currently can not use the gpgv method we have two places + these need to be done - so the place for this method is wrong but better + than code duplication… */ +std::vector SigVerify::GetGPGVCommandLine() +{ + string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); + // FIXME: remove support for deprecated APT::GPGV setting + string const trustedFile = _config->FindFile("Dir::Etc::Trusted", + _config->Find("APT::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg").c_str()); + string const trustedPath = _config->FindDir("Dir::Etc::TrustedParts", "/etc/apt/trusted.gpg.d"); + + if (_config->FindB("Debug::Acquire::gpgv", false) == true) + { + std::clog << "gpgv path: " << gpgvpath << std::endl; + std::clog << "Keyring file: " << trustedFile << std::endl; + std::clog << "Keyring path: " << trustedPath << std::endl; + } + + std::vector keyrings = GetListOfFilesInDir(trustedPath, "gpg", false); + if (FileExists(trustedFile) == true) + keyrings.push_back(trustedFile); + + std::vector Args; + Args.reserve(30); + + if (keyrings.empty() == true) + return Args; + + Args.push_back(gpgvpath.c_str()); + Args.push_back("--ignore-time-conflict"); + + for (vector::const_iterator K = keyrings.begin(); + K != keyrings.end(); ++K) + { + Args.push_back("--keyring"); + Args.push_back(K->c_str()); + } + + Configuration::Item const *Opts; + Opts = _config->Tree("Acquire::gpgv::Options"); + if (Opts != 0) + { + Opts = Opts->Child; + for (; Opts != 0; Opts = Opts->Next) + { + if (Opts->Value.empty() == true) + continue; + Args.push_back(Opts->Value.c_str()); + } + } + + return Args; +} + /*}}}*/ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/ vector &List, pkgCdromStatus *log) { diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h index 9e5ad4e43..ee6557a3d 100644 --- a/apt-pkg/indexcopy.h +++ b/apt-pkg/indexcopy.h @@ -89,6 +89,9 @@ class SigVerify /*{{{*/ public: bool CopyAndVerify(string CDROM,string Name,vector &SigList, vector PkgList,vector SrcList); + + /** \brief generates the command to verify a file with gpgv */ + static std::vector GetGPGVCommandLine(); }; /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 8d67582e4..a83d4c52a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -84,8 +84,10 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low * apt-pkg/policy.cc: - get the candidate right for a not-installed pseudo package if his non-pseudo friend is installed + * apt-pkg/indexcopy.cc: + - move the gpg codecopy to a new method and use it also in methods/gpgv.cc - -- David Kalnischkies Wed, 09 Jun 2010 14:20:19 +0200 + -- David Kalnischkies Wed, 09 Jun 2010 17:18:26 +0200 apt (0.7.26~exp5) experimental; urgency=low diff --git a/methods/gpgv.cc b/methods/gpgv.cc index a149d67dd..5f5f23f7d 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -2,6 +2,7 @@ #include #include #include +#include #include #include @@ -58,26 +59,14 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, int fd[2]; FILE *pipein; int status; - string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); - // FIXME: remove support for deprecated APT::GPGV setting - string const trustedFile = _config->FindFile("Dir::Etc::Trusted", - _config->Find("APT::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg").c_str()); - string const trustedPath = _config->FindDir("Dir::Etc::TrustedParts", "/etc/apt/trusted.gpg.d"); - if (Debug == true) - { - std::clog << "gpgv path: " << gpgvpath << std::endl; - std::clog << "Keyring file: " << trustedFile << std::endl; - std::clog << "Keyring path: " << trustedPath << std::endl; - } - vector keyrings = GetListOfFilesInDir(trustedPath, "gpg", false); - if (FileExists(trustedFile) == true) - keyrings.push_back(trustedFile); - - if (keyrings.empty() == true) + string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); + std::vector Args = SigVerify::GetGPGVCommandLine(); + if (Args.empty() == true) { // TRANSLATOR: %s is the trusted keyring parts directory - ioprintf(ret, _("No keyring installed in %s."), trustedPath.c_str()); + ioprintf(ret, _("No keyring installed in %s."), + _config->FindDir("Dir::Etc::TrustedParts", "/etc/apt/trusted.gpg.d").c_str()); return ret.str(); } @@ -89,32 +78,8 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, return string("Couldn't spawn new process") + strerror(errno); else if (pid == 0) { - std::vector Args; - Args.reserve(30); - - Args.push_back(gpgvpath.c_str()); Args.push_back("--status-fd"); Args.push_back("3"); - Args.push_back("--ignore-time-conflict"); - for (vector::const_iterator K = keyrings.begin(); - K != keyrings.end(); ++K) - { - Args.push_back("--keyring"); - Args.push_back(K->c_str()); - } - - Configuration::Item const *Opts; - Opts = _config->Tree("Acquire::gpgv::Options"); - if (Opts != 0) - { - Opts = Opts->Child; - for (; Opts != 0; Opts = Opts->Next) - { - if (Opts->Value.empty() == true) - continue; - Args.push_back(Opts->Value.c_str()); - } - } Args.push_back(file); Args.push_back(outfile); Args.push_back(NULL); -- cgit v1.2.3 From 24d7b6267ef3e475a153d4e2c4bcb30e1d14e671 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Jun 2010 18:23:23 +0200 Subject: be sure that the RFC1123StrToTime method is run in a LANG=C environment --- apt-pkg/contrib/strutl.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 160450366..ace74cb37 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -861,12 +861,16 @@ static time_t timegm(struct tm *t) bool RFC1123StrToTime(const char* const str,time_t &time) { struct tm Tm; + setlocale (LC_ALL,"C"); + bool const invalid = // Sun, 06 Nov 1994 08:49:37 GMT ; RFC 822, updated by RFC 1123 - if (strptime(str, "%a, %d %b %Y %H:%M:%S %Z", &Tm) == NULL && + (strptime(str, "%a, %d %b %Y %H:%M:%S %Z", &Tm) == NULL && // Sunday, 06-Nov-94 08:49:37 GMT ; RFC 850, obsoleted by RFC 1036 strptime(str, "%A, %d-%b-%y %H:%M:%S %Z", &Tm) == NULL && // Sun Nov 6 08:49:37 1994 ; ANSI C's asctime() format - strptime(str, "%a %b %d %H:%M:%S %Y", &Tm) == NULL) + strptime(str, "%a %b %d %H:%M:%S %Y", &Tm) == NULL); + setlocale (LC_ALL,""); + if (invalid == true) return false; time = timegm(&Tm); -- cgit v1.2.3 From c91d9a630bfe95f152d574a0ca420fde2afc6b2c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Jun 2010 21:15:52 +0200 Subject: sent Last-Modified header also for Translation files --- apt-pkg/acquire-item.cc | 13 ++++++++++--- debian/changelog | 3 ++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 4d9a152ab..58754a5c0 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -140,7 +140,8 @@ void pkgAcquire::Item::Rename(string From,string To) } } /*}}}*/ - +// Acquire::Item::ReportMirrorFailure /*{{{*/ +// --------------------------------------------------------------------- void pkgAcquire::Item::ReportMirrorFailure(string FailCode) { // we only act if a mirror was used at all @@ -182,7 +183,7 @@ void pkgAcquire::Item::ReportMirrorFailure(string FailCode) _config->Find("Methods::Mirror::ProblemReporting").c_str()); } } - + /*}}}*/ // AcqDiffIndex::AcqDiffIndex - Constructor /*{{{*/ // --------------------------------------------------------------------- /* Get the DiffIndex file first and see if there are patches availabe @@ -835,7 +836,13 @@ pkgAcqIndexTrans::pkgAcqIndexTrans(pkgAcquire *Owner, // --------------------------------------------------------------------- string pkgAcqIndexTrans::Custom600Headers() { - return "\nFail-Ignore: true"; + string Final = _config->FindDir("Dir::State::lists"); + Final += URItoFileName(RealURI); + + struct stat Buf; + if (stat(Final.c_str(),&Buf) != 0) + return "\nFail-Ignore: true"; + return "\nFail-Ignore: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime); } /*}}}*/ // AcqIndexTrans::Failed - Silence failure messages for missing files /*{{{*/ diff --git a/debian/changelog b/debian/changelog index a83d4c52a..42fe916c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low - add a constant Exists check for MetaKeys * apt-pkg/acquire-item.cc: - do not try PDiff if it is not listed in the Meta file + - sent Last-Modified header also for Translation files * apt-pkg/cacheiterator.h: - let pkgCache::Iterator inherent std::iterator * ftparchive/writer.h: @@ -87,7 +88,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low * apt-pkg/indexcopy.cc: - move the gpg codecopy to a new method and use it also in methods/gpgv.cc - -- David Kalnischkies Wed, 09 Jun 2010 17:18:26 +0200 + -- David Kalnischkies Wed, 09 Jun 2010 21:15:46 +0200 apt (0.7.26~exp5) experimental; urgency=low -- cgit v1.2.3 From cf440facb498fa0ec70148723b13d6d019758c0e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Jun 2010 23:20:26 +0200 Subject: enhance the split out of the gpgv commandline mangling by splitting out the call completely --- apt-pkg/indexcopy.cc | 62 +++++++++++++++++++++++++++++++++++++++++----------- apt-pkg/indexcopy.h | 10 +++++++-- methods/gpgv.cc | 51 +++++++++--------------------------------- 3 files changed, 67 insertions(+), 56 deletions(-) diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index 47eaefc5c..621c18716 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -27,6 +27,8 @@ #include #include #include +#include +#include #include /*}}}*/ @@ -605,14 +607,9 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector &SigList, _error->Error("Fork failed"); return false; } - if(pid == 0) { - string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); - std::vector Args = GetGPGVCommandLine(); - Args.push_back(releasegpg.c_str()); - Args.push_back(release.c_str()); - Args.push_back(NULL); - execvp(gpgvpath.c_str(), (char**) &Args[0]); - } + if(pid == 0) + RunGPGV(release, releasegpg); + if(!ExecWait(pid, "gpgv")) { _error->Warning("Signature verification failed for: %s", releasegpg.c_str()); @@ -652,14 +649,15 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector &SigList, return true; } /*}}}*/ -// SigVerify::GetGPGVCommandLine - returns the command needed for verify/*{{{*/ +// SigVerify::RunGPGV - returns the command needed for verify /*{{{*/ // --------------------------------------------------------------------- /* Generating the commandline for calling gpgv is somehow complicated as we need to add multiple keyrings and user supplied options. Also, as the cdrom code currently can not use the gpgv method we have two places these need to be done - so the place for this method is wrong but better than code duplication… */ -std::vector SigVerify::GetGPGVCommandLine() +bool SigVerify::RunGPGV(std::string const &File, std::string const &FileGPG, + int const &statusfd, int fd[2]) { string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); // FIXME: remove support for deprecated APT::GPGV setting @@ -667,7 +665,9 @@ std::vector SigVerify::GetGPGVCommandLine() _config->Find("APT::GPGV::TrustedKeyring", "/etc/apt/trusted.gpg").c_str()); string const trustedPath = _config->FindDir("Dir::Etc::TrustedParts", "/etc/apt/trusted.gpg.d"); - if (_config->FindB("Debug::Acquire::gpgv", false) == true) + bool const Debug = _config->FindB("Debug::Acquire::gpgv", false); + + if (Debug == true) { std::clog << "gpgv path: " << gpgvpath << std::endl; std::clog << "Keyring file: " << trustedFile << std::endl; @@ -682,11 +682,19 @@ std::vector SigVerify::GetGPGVCommandLine() Args.reserve(30); if (keyrings.empty() == true) - return Args; + return false; Args.push_back(gpgvpath.c_str()); Args.push_back("--ignore-time-conflict"); + if (statusfd != -1) + { + Args.push_back("--status-fd"); + char fd[10]; + snprintf(fd, sizeof(fd), "%i", statusfd); + Args.push_back(fd); + } + for (vector::const_iterator K = keyrings.begin(); K != keyrings.end(); ++K) { @@ -707,7 +715,35 @@ std::vector SigVerify::GetGPGVCommandLine() } } - return Args; + Args.push_back(FileGPG.c_str()); + Args.push_back(File.c_str()); + Args.push_back(NULL); + + if (Debug == true) + { + std::clog << "Preparing to exec: " << gpgvpath; + for (std::vector::const_iterator a = Args.begin(); *a != NULL; ++a) + std::clog << " " << *a; + std::clog << std::endl; + } + + if (statusfd != -1) + { + int const nullfd = open("/dev/null", O_RDONLY); + close(fd[0]); + // Redirect output to /dev/null; we read from the status fd + dup2(nullfd, STDOUT_FILENO); + dup2(nullfd, STDERR_FILENO); + // Redirect the pipe to the status fd (3) + dup2(fd[1], statusfd); + + putenv((char *)"LANG="); + putenv((char *)"LC_ALL="); + putenv((char *)"LC_MESSAGES="); + } + + execvp(gpgvpath.c_str(), (char **) &Args[0]); + return true; } /*}}}*/ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/ diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h index ee6557a3d..6fcd3b8ce 100644 --- a/apt-pkg/indexcopy.h +++ b/apt-pkg/indexcopy.h @@ -90,8 +90,14 @@ class SigVerify /*{{{*/ bool CopyAndVerify(string CDROM,string Name,vector &SigList, vector PkgList,vector SrcList); - /** \brief generates the command to verify a file with gpgv */ - static std::vector GetGPGVCommandLine(); + /** \brief generates and run the command to verify a file with gpgv */ + static bool RunGPGV(std::string const &File, std::string const &FileOut, + int const &statusfd, int fd[2]); + inline static bool RunGPGV(std::string const &File, std::string const &FileOut, + int const &statusfd = -1) { + int fd[2]; + return RunGPGV(File, FileOut, statusfd, fd); + }; }; /*}}}*/ diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 5f5f23f7d..018e4f622 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -55,61 +55,29 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, if (Debug == true) std::clog << "inside VerifyGetSigners" << std::endl; - pid_t pid; int fd[2]; - FILE *pipein; - int status; - - string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv"); - std::vector Args = SigVerify::GetGPGVCommandLine(); - if (Args.empty() == true) - { - // TRANSLATOR: %s is the trusted keyring parts directory - ioprintf(ret, _("No keyring installed in %s."), - _config->FindDir("Dir::Etc::TrustedParts", "/etc/apt/trusted.gpg.d").c_str()); - return ret.str(); - } if (pipe(fd) < 0) return "Couldn't create pipe"; - pid = fork(); + pid_t pid = fork(); if (pid < 0) return string("Couldn't spawn new process") + strerror(errno); else if (pid == 0) { - Args.push_back("--status-fd"); - Args.push_back("3"); - Args.push_back(file); - Args.push_back(outfile); - Args.push_back(NULL); - - if (Debug == true) + if (SigVerify::RunGPGV(outfile, file, 3, fd) == false) { - std::clog << "Preparing to exec: " << gpgvpath; - for(std::vector::const_iterator a = Args.begin();*a != NULL; ++a) - std::clog << " " << *a; - std::clog << std::endl; + // TRANSLATOR: %s is the trusted keyring parts directory + ioprintf(ret, _("No keyring installed in %s."), + _config->FindDir("Dir::Etc::TrustedParts", "/etc/apt/trusted.gpg.d").c_str()); + return ret.str(); } - int const nullfd = open("/dev/null", O_RDONLY); - close(fd[0]); - // Redirect output to /dev/null; we read from the status fd - dup2(nullfd, STDOUT_FILENO); - dup2(nullfd, STDERR_FILENO); - // Redirect the pipe to the status fd (3) - dup2(fd[1], 3); - - putenv((char *)"LANG="); - putenv((char *)"LC_ALL="); - putenv((char *)"LC_MESSAGES="); - execvp(gpgvpath.c_str(), (char **) &Args[0]); - exit(111); } close(fd[1]); - pipein = fdopen(fd[0], "r"); - + FILE *pipein = fdopen(fd[0], "r"); + // Loop over the output of gpgv, and check the signatures. size_t buffersize = 64; char *buffer = (char *) malloc(buffersize); @@ -182,6 +150,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, } fclose(pipein); + int status; waitpid(pid, &status, 0); if (Debug == true) { @@ -200,7 +169,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, } else if (WEXITSTATUS(status) == 111) { - ioprintf(ret, _("Could not execute '%s' to verify signature (is gpgv installed?)"), gpgvpath.c_str()); + ioprintf(ret, _("Could not execute 'gpgv' to verify signature (is gpgv installed?)")); return ret.str(); } else -- cgit v1.2.3 From 6f466ddbf2d9cb34b88df1738bb1115a66f46536 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 10 Jun 2010 02:04:03 +0200 Subject: readd the autoremove protection for the kfreebsd-image as it was lost in Michaels merge with the ubuntu branch --- debian/apt.conf.autoremove | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove index 2f00b9f8b..b3f4a3edd 100644 --- a/debian/apt.conf.autoremove +++ b/debian/apt.conf.autoremove @@ -1,9 +1,11 @@ APT { - NeverAutoRemove + NeverAutoRemove { - "^linux-firmware$"; - "^linux-image.*"; + "^firmware-linux.*"; + "^linux-firmware$"; + "^linux-image.*"; + "^kfreebsd-image.*"; "^linux-restricted-modules.*"; "^linux-ubuntu-modules-.*"; }; @@ -11,13 +13,12 @@ APT Never-MarkAuto-Sections { "metapackages"; - "restricted/metapackages"; - "universe/metapackages"; - "multiverse/metapackages"; + "restricted/metapackages"; + "universe/metapackages"; + "multiverse/metapackages"; "oldlibs"; - "restricted/oldlibs"; - "universe/oldlibs"; - "multiverse/oldlibs"; - + "restricted/oldlibs"; + "universe/oldlibs"; + "multiverse/oldlibs"; }; }; -- cgit v1.2.3 From 97f4026d93a85838439263d30146c3ad25fef474 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 10 Jun 2010 10:03:14 +0200 Subject: correct a minor spelling mistake in the changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 42fe916c5..f9638b78f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,7 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low that use round robin DNS) - support Original-Maintainer in RewritePackageOrder - enable cdrom autodetection via libudev by default - - show messsage about Vcs in use when apt-get source is run for + - show message about Vcs in use when apt-get source is run for packages maintained in a Vcs - better support transitional packages with mark auto-installed. when the transitional package is in "oldlibs" the new package -- cgit v1.2.3 From a8ef7efd6df81d4fb9e52419695f10df9fe76cda Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 10 Jun 2010 13:09:23 +0200 Subject: * apt-pkg/cacheset.cc: - get the candidate either from an already built depcache or use the policy which is a bit faster than depcache generation --- apt-pkg/cachefile.h | 8 ++++++-- apt-pkg/cacheset.cc | 11 ++++++++--- debian/changelog | 8 ++++++++ 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h index 1647aff8e..c68f06ed8 100644 --- a/apt-pkg/cachefile.h +++ b/apt-pkg/cachefile.h @@ -20,10 +20,9 @@ #include #include +#include #include -class pkgPolicy; -class pkgSourceList; class pkgCacheFile { protected: @@ -65,6 +64,11 @@ class pkgCacheFile inline pkgPolicy* GetPolicy() { BuildPolicy(); return Policy; }; inline pkgSourceList* GetSourceList() { BuildSourceList(); return SrcList; }; + inline bool IsPkgCacheBuilt() const { return (Cache != NULL); }; + inline bool IsDepCacheBuilt() const { return (DCache != NULL); }; + inline bool IsPolicyBuilt() const { return (Policy != NULL); }; + inline bool IsSrcListBuilt() const { return (SrcList != NULL); }; + pkgCacheFile(); virtual ~pkgCacheFile(); }; diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index 43ade4b4e..e91b56997 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -261,9 +261,14 @@ bool VersionSet::AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset, // getCandidateVer - Returns the candidate version of the given package /*{{{*/ pkgCache::VerIterator VersionSet::getCandidateVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg, bool const &AllowError) { - if (unlikely(Cache.BuildDepCache() == false)) - return pkgCache::VerIterator(*Cache); - pkgCache::VerIterator Cand = Cache[Pkg].CandidateVerIter(Cache); + pkgCache::VerIterator Cand; + if (Cache.IsDepCacheBuilt() == true) + Cand = Cache[Pkg].CandidateVerIter(Cache); + else { + if (unlikely(Cache.BuildPolicy() == false)) + return pkgCache::VerIterator(*Cache); + Cand = Cache.GetPolicy()->GetCandidateVer(Pkg); + } if (AllowError == false && Cand.end() == true) _error->Error(_("Can't select candidate version from package %s as it has no candidate"), Pkg.FullName(true).c_str()); return Cand; diff --git a/debian/changelog b/debian/changelog index f9638b78f..8470a0d85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.26~exp7) UNRELEASED; urgency=low + + * apt-pkg/cacheset.cc: + - get the candidate either from an already built depcache + or use the policy which is a bit faster than depcache generation + + -- David Kalnischkies Thu, 10 Jun 2010 13:04:47 +0200 + apt (0.7.26~exp6) UNRELEASED; urgency=low [ Michael Vogt ] -- cgit v1.2.3 From 01606def78105c9d64f12c89e387d37ed46925b6 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 10 Jun 2010 13:20:27 +0200 Subject: * apt-pkg/acquire-item.cc: - If the Acquire::GzipIndexes option is true and we download a gzipped index file, keep it as it is (and rename to .gz) instead of uncompressing it. --- apt-pkg/acquire-item.cc | 20 +++++++++++++++++++- debian/changelog | 4 ++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 6d4336425..eab34e26c 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -620,6 +620,8 @@ string pkgAcqIndex::Custom600Headers() { string Final = _config->FindDir("Dir::State::lists"); Final += URItoFileName(RealURI); + if (_config->FindB("Acquire::GzipIndexes",false)) + Final += ".gz"; struct stat Buf; if (stat(Final.c_str(),&Buf) != 0) @@ -714,6 +716,23 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash, Erase = false; Complete = true; + string compExt = flExtension(flNotDir(URI(Desc.URI).Path)); + + // If we enable compressed indexes and already have gzip, keep it + if (_config->FindB("Acquire::GzipIndexes",false) && compExt == "gz") { + string FinalFile = _config->FindDir("Dir::State::lists"); + FinalFile += URItoFileName(RealURI) + ".gz"; + //if(Debug) + // std::clog << "pkgAcqIndex: keeping gzipped " << FinalFile << endl; + Rename(DestFile,FinalFile); + chmod(FinalFile.c_str(),0644); + + // Update DestFile for .gz suffix so that the clean operation keeps it + DestFile = _config->FindDir("Dir::State::lists") + "partial/"; + DestFile += URItoFileName(RealURI) + ".gz"; + return; + } + // Handle the unzipd case string FileName = LookupTag(Message,"Alt-Filename"); if (FileName.empty() == false) @@ -746,7 +765,6 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash, else Local = true; - string compExt = flExtension(flNotDir(URI(Desc.URI).Path)); string decompProg; // get the binary name for your used compression type diff --git a/debian/changelog b/debian/changelog index 80c504b99..4122a728e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,10 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low * apt-pkg/deb/debindexfile.cc: - If we do not find uncompressed package/source/translation indexes, look for gzip compressed ones. + * apt-pkg/acquire-item.cc: + - If the Acquire::GzipIndexes option is true and we download a gzipped + index file, keep it as it is (and rename to .gz) instead of + uncompressing it. -- Christian Perrier Tue, 11 May 2010 19:52:00 +0200 -- cgit v1.2.3 From 6617de4d12e2bae1a463af2a6631dd2f109da7be Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 10 Jun 2010 14:23:24 +0200 Subject: mention abi break in changelog --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4122a728e..7facf6f80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low * apt-pkg/contrib/fileutl.{h,cc}: - Add support for transparent reading of gzipped files. - Link against zlib (in apt-pkg/makefile) and add zlib build dependency. + - [ABI BREAK] This introduces a new protected member of FileFD and changes + the behaviour of FileFd for reading gzipped files. * apt-pkg/deb/debindexfile.cc: - If we do not find uncompressed package/source/translation indexes, look for gzip compressed ones. -- cgit v1.2.3 From 2b968050ca6e650e76bb2205190be45a3ef28723 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 10 Jun 2010 14:35:23 +0200 Subject: releasing version 0.7.26~exp6 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index cfb7c814f..6b40ae94d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -88,7 +88,7 @@ apt (0.7.26~exp6) experimental; urgency=low * apt-pkg/indexcopy.cc: - move the gpg codecopy to a new method and use it also in methods/gpgv.cc - -- David Kalnischkies Wed, 09 Jun 2010 21:15:46 +0200 + -- Michael Vogt Thu, 10 Jun 2010 14:02:22 +0200 apt (0.7.26~exp5) experimental; urgency=low -- cgit v1.2.3 From c0ba35fc916d2adf0ba1fbd8cca62a83ce83d789 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 10 Jun 2010 15:10:38 +0200 Subject: * apt-pkg/orderlist.cc: - untouched packages are never missing * apt-pkg/packagemanager.cc: - packages that are not touched doesn't need to be unpacked --- apt-pkg/orderlist.cc | 3 ++- apt-pkg/packagemanager.cc | 3 ++- debian/changelog | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index 7c950292a..55f9cb9cc 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -117,7 +117,8 @@ bool pkgOrderList::IsMissing(PkgIterator Pkg) return false; // Skip Packages that need configure only. - if (Pkg.State() == pkgCache::PkgIterator::NeedsConfigure && + if ((Pkg.State() == pkgCache::PkgIterator::NeedsConfigure || + Pkg.State() == pkgCache::PkgIterator::NeedsNothing) && Cache[Pkg].Keep() == true) return false; diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index eef79cccd..49776aac7 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -602,7 +602,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg) // configured we don't need to unpack it again… PkgIterator const P = Pkg.Group().FindPkg("all"); if (List->IsFlag(P,pkgOrderList::UnPacked) != true && - List->IsFlag(P,pkgOrderList::Configured) != true) { + List->IsFlag(P,pkgOrderList::Configured) != true && + P.State() != pkgCache::PkgIterator::NeedsNothing) { if (SmartUnPack(P) == false) return false; } diff --git a/debian/changelog b/debian/changelog index 8470a0d85..edea3400a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,10 @@ apt (0.7.26~exp7) UNRELEASED; urgency=low * apt-pkg/cacheset.cc: - get the candidate either from an already built depcache or use the policy which is a bit faster than depcache generation + * apt-pkg/orderlist.cc: + - untouched packages are never missing + * apt-pkg/packagemanager.cc: + - packages that are not touched doesn't need to be unpacked -- David Kalnischkies Thu, 10 Jun 2010 13:04:47 +0200 -- cgit v1.2.3 From 31e1187be48846395cb3b57f0e9a731261a1484c Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 10 Jun 2010 15:19:10 +0200 Subject: * Add test/test-indexes.sh: - Test behaviour of index retrieval and usage, in particular with uncompressed and gzip compressed indexes. --- debian/changelog | 3 ++ test/test-indexes.sh | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+) create mode 100755 test/test-indexes.sh diff --git a/debian/changelog b/debian/changelog index 7facf6f80..bd328fd08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,9 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low - If the Acquire::GzipIndexes option is true and we download a gzipped index file, keep it as it is (and rename to .gz) instead of uncompressing it. + * Add test/test-indexes.sh: + - Test behaviour of index retrieval and usage, in particular with + uncompressed and gzip compressed indexes. -- Christian Perrier Tue, 11 May 2010 19:52:00 +0200 diff --git a/test/test-indexes.sh b/test/test-indexes.sh new file mode 100755 index 000000000..d3f5e7cd3 --- /dev/null +++ b/test/test-indexes.sh @@ -0,0 +1,106 @@ +#!/bin/sh -e + +# Test behaviour of index retrieval and usage, in particular with uncompressed +# and gzip compressed indexes. +# Author: Martin Pitt +# (C) 2010 Canonical Ltd. + +BUILDDIR=$(readlink -f $(dirname $0)/../build) + +TEST_SOURCE="deb http://ftp.debian.org/debian unstable contrib" +TEST_SOURCE_KEYID=55BE302B +GPG_KEYSERVER=gpg-keyserver.de +# should be a small package with dependencies satisfiable in TEST_SOURCE, i. e. +# ideally no depends at all +TEST_PKG="python-psyco-doc" + +export LD_LIBRARY_PATH=$BUILDDIR/bin + +OPTS="-o RootDir=. -o Dir::Bin::Methods=$BUILDDIR/bin/methods -o Debug::NoLocking=true" +DEBUG="" +#DEBUG="-o Debug::pkgCacheGen=true" +#DEBUG="-o Debug::pkgAcquire=true" +APT_GET="$BUILDDIR/bin/apt-get $OPTS $DEBUG" +APT_CACHE="$BUILDDIR/bin/apt-cache $OPTS $DEBUG" + +[ -x "$BUILDDIR/bin/apt-get" ] || { + echo "please build the tree first" >&2 + exit 1 +} + +echo "---- building sandbox----" +WORKDIR=$(mktemp -d) +trap "cd /; rm -rf $WORKDIR" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM +cd $WORKDIR + +rm -fr etc var +rm -f home +ln -s /home home +mkdir -p etc/apt/preferences.d etc/apt/trusted.gpg.d var/cache/apt/archives/partial var/lib/apt/lists/partial var/lib/dpkg +cp /etc/apt/trusted.gpg etc/apt +touch var/lib/dpkg/status +echo "$TEST_SOURCE" > etc/apt/sources.list + +# get keyring +gpg --no-options --no-default-keyring --secret-keyring etc/apt/secring.gpg --trustdb-name etc/apt/trustdb.gpg --keyring etc/apt/trusted.gpg --primary-keyring etc/apt/trusted.gpg --keyserver $GPG_KEYSERVER --recv-keys $TEST_SOURCE_KEYID + +echo "---- uncompressed update ----" +$APT_GET update +test -e var/lib/apt/lists/*_Packages +! test -e var/lib/apt/lists/*_Packages.gz + +echo "---- uncompressed cache ----" +$APT_CACHE show $TEST_PKG | grep -q ^Version: +# again (with cache) +$APT_CACHE show $TEST_PKG | grep -q ^Version: +rm var/cache/apt/*.bin +$APT_CACHE policy $TEST_PKG | grep -q '500 http://' +# again (with cache) +$APT_CACHE policy $TEST_PKG | grep -q '500 http://' + +echo "---- uncompressed install ----" +$APT_GET install -d $TEST_PKG +test -e var/cache/apt/archives/$TEST_PKG*.deb +$APT_GET clean +! test -e var/cache/apt/archives/$TEST_PKG*.deb + +echo "----- uncompressed update with preexisting indexes, no pdiff ----" +$APT_GET -o Acquire::PDiffs=false update +test -e var/lib/apt/lists/*_Packages +! test -e var/lib/apt/lists/*_Packages.gz + +echo "----- uncompressed update with preexisting indexes, with pdiff ----" +$APT_GET -o Acquire::PDiffs=true update +test -e var/lib/apt/lists/*_Packages +! test -e var/lib/apt/lists/*_Packages.gz + +echo "----- compressed update ----" +find var/lib/apt/lists/ -type f | xargs -r rm +$APT_GET -o Acquire::GzipIndexes=true update +! test -e var/lib/apt/lists/*_Packages +test -e var/lib/apt/lists/*_Packages.gz + +echo "---- compressed cache ----" +$APT_CACHE show $TEST_PKG | grep -q ^Version: +# again (with cache) +$APT_CACHE show $TEST_PKG | grep -q ^Version: +rm var/cache/apt/*.bin +$APT_CACHE policy $TEST_PKG | grep -q '500 http://' +# again (with cache) +$APT_CACHE policy $TEST_PKG | grep -q '500 http://' + +echo "---- compressed install ----" +$APT_GET install -d $TEST_PKG +! test -e var/cache/apt/archives/$TEST_PKG*.deb + +echo "----- compressed update with preexisting indexes, no pdiff ----" +$APT_GET -o Acquire::PDiffs=false -o Acquire::GzipIndexes=true update +! test -e var/lib/apt/lists/*_Packages +test -e var/lib/apt/lists/*_Packages.gz + +echo "----- compressed update with preexisting indexes, with pdiff ----" +$APT_GET -o Acquire::PDiffs=true -o Acquire::GzipIndexes=true update +! test -e var/lib/apt/lists/*_Packages +test -e var/lib/apt/lists/*_Packages.gz + +echo "---- ALL TESTS PASSED ----" -- cgit v1.2.3 From 6b2f7a60c3d7d22d1d6b0e300ef526d48ff20048 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 10 Jun 2010 16:15:57 +0200 Subject: * apt-pkg/cachefile.h: - make pkgPolicy public again, libapt-pkg-perl (and probably others) get unhappy without that --- apt-pkg/cachefile.h | 2 +- debian/changelog | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h index 1647aff8e..63bc3de47 100644 --- a/apt-pkg/cachefile.h +++ b/apt-pkg/cachefile.h @@ -31,10 +31,10 @@ class pkgCacheFile MMap *Map; pkgCache *Cache; pkgDepCache *DCache; - pkgPolicy *Policy; pkgSourceList *SrcList; public: + pkgPolicy *Policy; // We look pretty much exactly like a pointer to a dep cache inline operator pkgCache &() {return *Cache;}; diff --git a/debian/changelog b/debian/changelog index 6b40ae94d..d29705d24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.26~exp7) experimental; urgency=low + + * apt-pkg/cachefile.h: + - make pkgPolicy public again, libapt-pkg-perl (and probably + others) get unhappy without that + + -- Michael Vogt Thu, 10 Jun 2010 15:33:24 +0200 + apt (0.7.26~exp6) experimental; urgency=low [ Michael Vogt ] -- cgit v1.2.3 From 98ac10fad90f622b67a8cda3cffc041885c2e054 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 11 Jun 2010 08:51:01 +0200 Subject: * debian/control: - remove intltool's dependency as it is an ubuntu artefact --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9367c1743..f2a18d397 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low - untouched packages are never missing * apt-pkg/packagemanager.cc: - packages that are not touched doesn't need to be unpacked + * debian/control: + - remove intltool's dependency as it is an ubuntu artefact -- David Kalnischkies Thu, 10 Jun 2010 16:36:58 +0200 diff --git a/debian/control b/debian/control index 9ac0d582e..4f41c130b 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , Luca Bruno , Julian Andres Klode Standards-Version: 3.8.4 -Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen, intltool +Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen Build-Conflicts: autoconf2.13, automake1.4 Package: apt -- cgit v1.2.3 From fdd739c74dcf266a7cb2f3688ea11afec4055f2c Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Fri, 11 Jun 2010 10:01:27 +0200 Subject: * debian/rules: - Make DEB_BUILD_OPTIONS=noopt actually work by passing the right CXXFLAGS. --- debian/changelog | 3 +++ debian/rules | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index bd328fd08..483fff9c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low * Italian translation update. Closes: #581742 [ Martin Pitt ] + * debian/rules: + - Make DEB_BUILD_OPTIONS=noopt actually work by passing the right + CXXFLAGS. * apt-pkg/contrib/fileutl.{h,cc}: - Add support for transparent reading of gzipped files. - Link against zlib (in apt-pkg/makefile) and add zlib build dependency. diff --git a/debian/rules b/debian/rules index 7677708b2..450f3e0f6 100755 --- a/debian/rules +++ b/debian/rules @@ -108,7 +108,7 @@ build/configure-stamp: configure dh_testdir -mkdir build cp COPYING debian/copyright - cd build && CXXFLAGS="$(confcxxflags)" ../configure $(confflags) + cd build && CXXFLAGS="$(CXXFLAGS)" ../configure $(confflags) touch $@ build/build-stamp: build/configure-stamp -- cgit v1.2.3 From bb109d0b14218cde4fccc45856cf67e5513c0cc9 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Fri, 11 Jun 2010 10:43:43 +0200 Subject: Fix compressed index retrieval for current timestamps Fix a thinko in r1973, which did the Acquire::GzipIndexes test ealier than the IMS-Hit test. This led to rename errors. --- apt-pkg/acquire-item.cc | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index eab34e26c..83fb5328b 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -716,23 +716,6 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash, Erase = false; Complete = true; - string compExt = flExtension(flNotDir(URI(Desc.URI).Path)); - - // If we enable compressed indexes and already have gzip, keep it - if (_config->FindB("Acquire::GzipIndexes",false) && compExt == "gz") { - string FinalFile = _config->FindDir("Dir::State::lists"); - FinalFile += URItoFileName(RealURI) + ".gz"; - //if(Debug) - // std::clog << "pkgAcqIndex: keeping gzipped " << FinalFile << endl; - Rename(DestFile,FinalFile); - chmod(FinalFile.c_str(),0644); - - // Update DestFile for .gz suffix so that the clean operation keeps it - DestFile = _config->FindDir("Dir::State::lists") + "partial/"; - DestFile += URItoFileName(RealURI) + ".gz"; - return; - } - // Handle the unzipd case string FileName = LookupTag(Message,"Alt-Filename"); if (FileName.empty() == false) @@ -765,8 +748,24 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash, else Local = true; + string compExt = flExtension(flNotDir(URI(Desc.URI).Path)); string decompProg; + // If we enable compressed indexes and already have gzip, keep it + if (_config->FindB("Acquire::GzipIndexes",false) && compExt == "gz") { + string FinalFile = _config->FindDir("Dir::State::lists"); + FinalFile += URItoFileName(RealURI) + ".gz"; + //if(Debug) + // std::clog << "pkgAcqIndex: keeping gzipped " << FinalFile << endl; + Rename(DestFile,FinalFile); + chmod(FinalFile.c_str(),0644); + + // Update DestFile for .gz suffix so that the clean operation keeps it + DestFile = _config->FindDir("Dir::State::lists") + "partial/"; + DestFile += URItoFileName(RealURI) + ".gz"; + return; + } + // get the binary name for your used compression type decompProg = _config->Find(string("Acquire::CompressionTypes::").append(compExt),""); if(decompProg.empty() == false); -- cgit v1.2.3 From c8c6e61bb039136410a95dac716129d371d14d19 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Fri, 11 Jun 2010 10:56:56 +0200 Subject: * doc/apt.conf.5.xml: - Document the new Acquire::GzipIndexes option. --- debian/changelog | 2 ++ doc/apt.conf.5.xml | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 483fff9c3..85e80bb90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,8 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low - If the Acquire::GzipIndexes option is true and we download a gzipped index file, keep it as it is (and rename to .gz) instead of uncompressing it. + * doc/apt.conf.5.xml: + - Document the new Acquire::GzipIndexes option. * Add test/test-indexes.sh: - Test behaviour of index retrieval and usage, in particular with uncompressed and gzip compressed indexes. diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index c13ad4867..410489a73 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -411,6 +411,15 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; really prefer uncompressed files to support the usage of local mirrors. + GzipIndexes + + When downloading gzip compressed indexes (Packages, Sources, or + Translations), keep them gzip compressed locally instead of unpacking + them. This saves quite a lot of disk space at the expense of more CPU + requirements when building the local package caches. False by default. + + + Languages The Languages subsection controls which Translation files are downloaded and in which order APT tries to display the Description-Translations. APT will try to display the first -- cgit v1.2.3 From de2c243cd22b3bad3c27a5f3f7a35f0698cf07f1 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Fri, 11 Jun 2010 11:04:12 +0200 Subject: * doc/po/apt-doc.pot, doc/po/de.po: - German translation of new Acquire::GzipIndexes option. --- debian/changelog | 2 + doc/po/apt-doc.pot | 254 ++++++++++++++++++++++++++------------------------- doc/po/de.po | 259 ++++++++++++++++++++++++++++------------------------- 3 files changed, 275 insertions(+), 240 deletions(-) diff --git a/debian/changelog b/debian/changelog index 85e80bb90..7caa401fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low uncompressing it. * doc/apt.conf.5.xml: - Document the new Acquire::GzipIndexes option. + * doc/po/apt-doc.pot, doc/po/de.po: + - German translation of new Acquire::GzipIndexes option. * Add test/test-indexes.sh: - Test behaviour of index retrieval and usage, in particular with uncompressed and gzip compressed indexes. diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index f3b50640c..6b9240d4f 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2010-02-18 20:53+0100\n" +"POT-Creation-Date: 2010-06-11 10:56+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1284,7 +1284,7 @@ msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 +#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:511 apt.conf.5.xml:533 msgid "options" msgstr "" @@ -1482,7 +1482,7 @@ msgid "&apt-commonoptions;" msgstr "" #. type: Content of: -#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 apt.conf.5.xml:1035 apt_preferences.5.xml:630 +#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 apt.conf.5.xml:1044 apt_preferences.5.xml:630 msgid "Files" msgstr "" @@ -1492,7 +1492,7 @@ msgid "&file-sourceslist; &file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569 apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637 sources.list.5.xml:233 +#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569 apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1050 apt_preferences.5.xml:637 sources.list.5.xml:233 msgid "See Also" msgstr "" @@ -2806,7 +2806,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477 sources.list.5.xml:193 +#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1038 apt_preferences.5.xml:477 sources.list.5.xml:193 msgid "Examples" msgstr "" @@ -5043,11 +5043,25 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:414 +msgid "GzipIndexes" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:416 +msgid "" +"When downloading <literal>gzip</literal> compressed indexes (Packages, " +"Sources, or Translations), keep them gzip compressed locally instead of " +"unpacking them. This saves quite a lot of disk space at the expense of more " +"CPU requirements when building the local package caches. False by default." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:423 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:415 +#: apt.conf.5.xml:424 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the " @@ -5060,13 +5074,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:431 +#: apt.conf.5.xml:440 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:421 +#: apt.conf.5.xml:430 msgid "" "The default list includes \"environment\" and " "\"en\". \"<literal>environment</literal>\" has a special meaning here: It " @@ -5097,12 +5111,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:438 +#: apt.conf.5.xml:447 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:440 +#: apt.conf.5.xml:449 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -5114,7 +5128,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:447 +#: apt.conf.5.xml:456 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -5127,7 +5141,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:456 +#: apt.conf.5.xml:465 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -5137,7 +5151,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:462 +#: apt.conf.5.xml:471 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -5145,7 +5159,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:466 +#: apt.conf.5.xml:475 msgid "" "Binary programs are pointed to by " "<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies " @@ -5157,7 +5171,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:474 +#: apt.conf.5.xml:483 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -5170,12 +5184,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:487 +#: apt.conf.5.xml:496 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:489 +#: apt.conf.5.xml:498 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -5183,12 +5197,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:493 +#: apt.conf.5.xml:502 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:494 +#: apt.conf.5.xml:503 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -5199,50 +5213,50 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:503 +#: apt.conf.5.xml:512 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:507 +#: apt.conf.5.xml:516 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:508 +#: apt.conf.5.xml:517 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:512 +#: apt.conf.5.xml:521 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:513 +#: apt.conf.5.xml:522 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:528 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:520 +#: apt.conf.5.xml:529 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:525 +#: apt.conf.5.xml:534 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -5250,17 +5264,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:530 +#: apt.conf.5.xml:539 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:530 +#: apt.conf.5.xml:539 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:531 +#: apt.conf.5.xml:540 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5269,12 +5283,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:537 +#: apt.conf.5.xml:546 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:547 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5284,7 +5298,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:544 +#: apt.conf.5.xml:553 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -5295,36 +5309,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:560 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:552 +#: apt.conf.5.xml:561 msgid "" "APT chdirs to this directory before invoking dpkg, the default is " "<filename>/</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:556 +#: apt.conf.5.xml:565 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:557 +#: apt.conf.5.xml:566 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:562 +#: apt.conf.5.xml:571 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:563 +#: apt.conf.5.xml:572 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@ -5339,7 +5353,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:587 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -5349,7 +5363,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:572 +#: apt.conf.5.xml:581 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -5363,12 +5377,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:584 +#: apt.conf.5.xml:593 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:585 +#: apt.conf.5.xml:594 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -5380,12 +5394,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:592 +#: apt.conf.5.xml:601 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:593 +#: apt.conf.5.xml:602 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -5402,12 +5416,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:603 +#: apt.conf.5.xml:612 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:604 +#: apt.conf.5.xml:613 msgid "" "If this option is set apt will call <command>dpkg --configure " "--pending</command> to let dpkg handle all required configurations and " @@ -5419,12 +5433,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:610 +#: apt.conf.5.xml:619 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:611 +#: apt.conf.5.xml:620 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -5434,12 +5448,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:616 +#: apt.conf.5.xml:625 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:617 +#: apt.conf.5.xml:626 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by " @@ -5451,12 +5465,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:624 +#: apt.conf.5.xml:633 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:632 +#: apt.conf.5.xml:641 #, no-wrap msgid "" "OrderList::Score {\n" @@ -5468,7 +5482,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:625 +#: apt.conf.5.xml:634 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -5482,12 +5496,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:645 +#: apt.conf.5.xml:654 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:646 +#: apt.conf.5.xml:655 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -5496,12 +5510,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:654 +#: apt.conf.5.xml:663 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:656 +#: apt.conf.5.xml:665 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -5512,7 +5526,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:667 +#: apt.conf.5.xml:676 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, " @@ -5520,7 +5534,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:675 +#: apt.conf.5.xml:684 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s " @@ -5528,7 +5542,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:684 +#: apt.conf.5.xml:693 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -5538,110 +5552,110 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:692 +#: apt.conf.5.xml:701 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:702 +#: apt.conf.5.xml:711 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:716 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:711 +#: apt.conf.5.xml:720 msgid "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:718 +#: apt.conf.5.xml:727 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:731 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:738 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:742 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:749 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:753 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:751 +#: apt.conf.5.xml:760 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:755 +#: apt.conf.5.xml:764 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:762 +#: apt.conf.5.xml:771 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:766 +#: apt.conf.5.xml:775 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:773 +#: apt.conf.5.xml:782 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:776 +#: apt.conf.5.xml:785 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:783 +#: apt.conf.5.xml:792 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:786 +#: apt.conf.5.xml:795 msgid "" "Output each cryptographic hash that is generated by the " "<literal>apt</literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:802 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:796 +#: apt.conf.5.xml:805 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -5649,92 +5663,92 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:804 +#: apt.conf.5.xml:813 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:807 +#: apt.conf.5.xml:816 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:815 +#: apt.conf.5.xml:824 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:819 +#: apt.conf.5.xml:828 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:826 +#: apt.conf.5.xml:835 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:829 +#: apt.conf.5.xml:838 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:836 +#: apt.conf.5.xml:845 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:839 +#: apt.conf.5.xml:848 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:847 +#: apt.conf.5.xml:856 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:860 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:858 +#: apt.conf.5.xml:867 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:862 +#: apt.conf.5.xml:871 msgid "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:869 +#: apt.conf.5.xml:878 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:873 +#: apt.conf.5.xml:882 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:880 +#: apt.conf.5.xml:889 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:883 +#: apt.conf.5.xml:892 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial " @@ -5744,12 +5758,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:903 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:897 +#: apt.conf.5.xml:906 msgid "" "Generate debug messages describing which package is marked as " "keep/install/remove while the ProblemResolver does his work. Each addition " @@ -5767,90 +5781,90 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:916 +#: apt.conf.5.xml:925 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:919 +#: apt.conf.5.xml:928 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:926 +#: apt.conf.5.xml:935 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:929 +#: apt.conf.5.xml:938 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:937 +#: apt.conf.5.xml:946 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:940 +#: apt.conf.5.xml:949 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:947 +#: apt.conf.5.xml:956 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:951 +#: apt.conf.5.xml:960 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:959 +#: apt.conf.5.xml:968 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:963 +#: apt.conf.5.xml:972 msgid "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:970 +#: apt.conf.5.xml:979 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:974 +#: apt.conf.5.xml:983 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:980 +#: apt.conf.5.xml:989 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:984 +#: apt.conf.5.xml:993 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:992 +#: apt.conf.5.xml:1001 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1004 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5858,32 +5872,32 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1003 +#: apt.conf.5.xml:1012 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1007 +#: apt.conf.5.xml:1016 msgid "" "Print information about the vendors read from " "<filename>/etc/apt/vendors.list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1030 +#: apt.conf.5.xml:1039 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1037 +#: apt.conf.5.xml:1046 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1042 +#: apt.conf.5.xml:1051 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" diff --git a/doc/po/de.po b/doc/po/de.po index 99d56bed3..92d9092d2 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 0.7.24\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2010-02-18 20:53+0100\n" +"POT-Creation-Date: 2010-06-11 10:56+0300\n" "PO-Revision-Date: 2009-12-31 17:41+GMT\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@ -1751,7 +1751,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 #: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 -#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:511 apt.conf.5.xml:533 msgid "options" msgstr "Optionen" @@ -1994,7 +1994,7 @@ msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 -#: apt.conf.5.xml:1035 apt_preferences.5.xml:630 +#: apt.conf.5.xml:1044 apt_preferences.5.xml:630 msgid "Files" msgstr "Dateien" @@ -2007,7 +2007,7 @@ msgstr "&file-sourceslist; &file-statelists;" #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1050 apt_preferences.5.xml:637 #: sources.list.5.xml:233 msgid "See Also" msgstr "Siehe auch" @@ -3717,7 +3717,7 @@ msgstr "" "Dateien mit <command>apt-ftparchive</command> zu erstellen." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477 +#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1038 apt_preferences.5.xml:477 #: sources.list.5.xml:193 msgid "Examples" msgstr "Beispiele" @@ -6811,11 +6811,30 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:414 +msgid "GzipIndexes" +msgstr "GzipIndexes" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:416 +msgid "" +"When downloading <literal>gzip</literal> compressed indexes (Packages, " +"Sources, or Translations), keep them gzip compressed locally instead of " +"unpacking them. This saves quite a lot of disk space at the expense of more " +"CPU requirements when building the local package caches. False by default." +msgstr "" +"Wenn <literal>gzip</literal>-komprimierte Indizes heruntergeladen werden " +"(Packages, Sources, oder Translations), speichere sie lokal mit " +"gzip-Komprimierung. Dies spart eine Menge Festplattenplatz, aber benötigt " +"mehr CPU-Ressourcen bei der Erstellung des lokalen Paket-Caches. " +"Vorgabe ist False." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:423 msgid "Languages" msgstr "Sprachen" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:415 +#: apt.conf.5.xml:424 #, fuzzy #| msgid "" #| "The Languages subsection controls which <filename>Translation</filename> " @@ -6847,13 +6866,13 @@ msgstr "" "hier unmögliche Werte einsetzen." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:431 +#: apt.conf.5.xml:440 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:421 +#: apt.conf.5.xml:430 #, fuzzy #| msgid "" #| "The default list includes \"environment\" and \"en\". " @@ -6925,12 +6944,12 @@ msgstr "" "id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:438 +#: apt.conf.5.xml:447 msgid "Directories" msgstr "Verzeichnisse" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:440 +#: apt.conf.5.xml:449 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -6950,7 +6969,7 @@ msgstr "" "filename> oder <filename>./</filename> beginnen." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:447 +#: apt.conf.5.xml:456 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -6973,7 +6992,7 @@ msgstr "" "<literal>Dir::Cache</literal> enthalten." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:456 +#: apt.conf.5.xml:465 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -6988,7 +7007,7 @@ msgstr "" "Konfigurationsdatei erfolgt)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:462 +#: apt.conf.5.xml:471 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -7000,7 +7019,7 @@ msgstr "" "geladen." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:466 +#: apt.conf.5.xml:475 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -7018,7 +7037,7 @@ msgstr "" "Programms an." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:474 +#: apt.conf.5.xml:483 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -7038,12 +7057,12 @@ msgstr "" "<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:487 +#: apt.conf.5.xml:496 msgid "APT in DSelect" msgstr "APT in DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:489 +#: apt.conf.5.xml:498 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -7054,12 +7073,12 @@ msgstr "" "<literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:493 +#: apt.conf.5.xml:502 msgid "Clean" msgstr "Clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:494 +#: apt.conf.5.xml:503 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -7077,7 +7096,7 @@ msgstr "" "vor dem Herunterladen neuer Pakete durch." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:503 +#: apt.conf.5.xml:512 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." @@ -7086,12 +7105,12 @@ msgstr "" "übermittelt, wenn es für die Installationsphase durchlaufen wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:507 +#: apt.conf.5.xml:516 msgid "Updateoptions" msgstr "Updateoptions" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:508 +#: apt.conf.5.xml:517 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." @@ -7100,12 +7119,12 @@ msgstr "" "übermittelt, wenn es für die Aktualisierungsphase durchlaufen wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:512 +#: apt.conf.5.xml:521 msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:513 +#: apt.conf.5.xml:522 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -7114,12 +7133,12 @@ msgstr "" "nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:528 msgid "How APT calls dpkg" msgstr "Wie APT Dpkg aufruft" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:520 +#: apt.conf.5.xml:529 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -7128,7 +7147,7 @@ msgstr "" "stehen im Abschnitt <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:525 +#: apt.conf.5.xml:534 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -7139,17 +7158,17 @@ msgstr "" "jedes Listenelement wird als einzelnes Argument an &dpkg; übermittelt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:530 +#: apt.conf.5.xml:539 msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:530 +#: apt.conf.5.xml:539 msgid "Post-Invoke" msgstr "Post-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:531 +#: apt.conf.5.xml:540 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -7163,12 +7182,12 @@ msgstr "" "APT abgebrochen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:537 +#: apt.conf.5.xml:546 msgid "Pre-Install-Pkgs" msgstr "Pre-Install-Pkgs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:547 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -7185,7 +7204,7 @@ msgstr "" "pro Zeile." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:544 +#: apt.conf.5.xml:553 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -7201,12 +7220,12 @@ msgstr "" "literal> gegeben wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:560 msgid "Run-Directory" msgstr "Run-Directory" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:552 +#: apt.conf.5.xml:561 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." @@ -7215,12 +7234,12 @@ msgstr "" "die Vorgabe ist <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:556 +#: apt.conf.5.xml:565 msgid "Build-options" msgstr "Build-options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:557 +#: apt.conf.5.xml:566 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." @@ -7230,12 +7249,12 @@ msgstr "" "Programme werden erstellt." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:562 +#: apt.conf.5.xml:571 msgid "dpkg trigger usage (and related options)" msgstr "Dpkd-Trigger-Benutzung (und zugehöriger Optionen)" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:563 +#: apt.conf.5.xml:572 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@ -7261,7 +7280,7 @@ msgstr "" "Status 100% stehen, während es aktuell alle Pakete konfiguriert." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:587 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -7275,7 +7294,7 @@ msgstr "" "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:572 +#: apt.conf.5.xml:581 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -7300,12 +7319,12 @@ msgstr "" "wäre <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:584 +#: apt.conf.5.xml:593 msgid "DPkg::NoTriggers" msgstr "DPkg::NoTriggers" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:585 +#: apt.conf.5.xml:594 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -7326,12 +7345,12 @@ msgstr "" "außerdem an die »unpack«- und »remove«-Aufrufe anhängen." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:592 +#: apt.conf.5.xml:601 msgid "PackageManager::Configure" msgstr "PackageManager::Configure" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:593 +#: apt.conf.5.xml:602 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -7360,12 +7379,12 @@ msgstr "" "mehr startbar sein könnte." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:603 +#: apt.conf.5.xml:612 msgid "DPkg::ConfigurePending" msgstr "DPkg::ConfigurePending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:604 +#: apt.conf.5.xml:613 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -7384,12 +7403,12 @@ msgstr "" "deaktivieren." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:610 +#: apt.conf.5.xml:619 msgid "DPkg::TriggersPending" msgstr "DPkg::TriggersPending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:611 +#: apt.conf.5.xml:620 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -7405,12 +7424,12 @@ msgstr "" "benötigt werden." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:616 +#: apt.conf.5.xml:625 msgid "PackageManager::UnpackAll" msgstr "PackageManager::UnpackAll" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:617 +#: apt.conf.5.xml:626 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -7429,12 +7448,12 @@ msgstr "" "und weitere Verbesserungen benötigt, bevor sie wirklich nützlich wird." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:624 +#: apt.conf.5.xml:633 msgid "OrderList::Score::Immediate" msgstr "OrderList::Score::Immediate" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:632 +#: apt.conf.5.xml:641 #, no-wrap msgid "" "OrderList::Score {\n" @@ -7452,7 +7471,7 @@ msgstr "" "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:625 +#: apt.conf.5.xml:634 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -7476,12 +7495,12 @@ msgstr "" "mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:645 +#: apt.conf.5.xml:654 msgid "Periodic and Archives options" msgstr "Periodische- und Archivoptionen" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:646 +#: apt.conf.5.xml:655 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -7495,12 +7514,12 @@ msgstr "" "Dokumentation dieser Optionen zu erhalten." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:654 +#: apt.conf.5.xml:663 msgid "Debug options" msgstr "Fehlersuchoptionen" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:656 +#: apt.conf.5.xml:665 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -7518,7 +7537,7 @@ msgstr "" "könnten es sein:" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:667 +#: apt.conf.5.xml:676 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -7529,7 +7548,7 @@ msgstr "" "getroffenen Entscheidungen ein." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:675 +#: apt.conf.5.xml:684 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -7540,7 +7559,7 @@ msgstr "" "<literal>apt-get -s install</literal>) als nicht root-Anwender auszuführen." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:684 +#: apt.conf.5.xml:693 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -7552,7 +7571,7 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:692 +#: apt.conf.5.xml:701 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." @@ -7561,17 +7580,17 @@ msgstr "" "Daten in CD-ROM-IDs aus." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:702 +#: apt.conf.5.xml:711 msgid "A full list of debugging options to apt follows." msgstr "Eine vollständige Liste der Fehlersuchoptionen von APT folgt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:716 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "<literal>Debug::Acquire::cdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:711 +#: apt.conf.5.xml:720 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" @@ -7579,48 +7598,48 @@ msgstr "" "literal>-Quellen beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:718 +#: apt.conf.5.xml:727 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "<literal>Debug::Acquire::ftp</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:731 msgid "Print information related to downloading packages using FTP." msgstr "" "Gibt Informationen aus, die sich auf das Herunterladen von Paketen per FTP " "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:738 msgid "<literal>Debug::Acquire::http</literal>" msgstr "<literal>Debug::Acquire::http</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:742 msgid "Print information related to downloading packages using HTTP." msgstr "" "Gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTP " "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:749 msgid "<literal>Debug::Acquire::https</literal>" msgstr "<literal>Debug::Acquire::https</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:753 msgid "Print information related to downloading packages using HTTPS." msgstr "" "Gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTPS " "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:751 +#: apt.conf.5.xml:760 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "<literal>Debug::Acquire::gpgv</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:755 +#: apt.conf.5.xml:764 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -7629,12 +7648,12 @@ msgstr "" "mittels <literal>gpg</literal> beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:762 +#: apt.conf.5.xml:771 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:766 +#: apt.conf.5.xml:775 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@ -7643,23 +7662,23 @@ msgstr "" "CD-ROMs gespeichert sind." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:773 +#: apt.conf.5.xml:782 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:776 +#: apt.conf.5.xml:785 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" "Beschreibt den Prozess der Auflösung von Bauabhängigkeiten in &apt-get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:783 +#: apt.conf.5.xml:792 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:786 +#: apt.conf.5.xml:795 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@ -7668,12 +7687,12 @@ msgstr "" "Bibliotheken generiert wurde." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:802 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:796 +#: apt.conf.5.xml:805 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -7684,12 +7703,12 @@ msgstr "" "ID für eine CD-ROM generiert wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:804 +#: apt.conf.5.xml:813 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:807 +#: apt.conf.5.xml:816 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." @@ -7699,24 +7718,24 @@ msgstr "" "gleichen Zeit laufen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:815 +#: apt.conf.5.xml:824 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:819 +#: apt.conf.5.xml:828 msgid "Log when items are added to or removed from the global download queue." msgstr "" "Protokollieren, wenn Elemente aus der globalen Warteschlange zum " "Herunterladen hinzugefügt oder entfernt werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:826 +#: apt.conf.5.xml:835 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "<literal>Debug::pkgAcquire::Auth</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:829 +#: apt.conf.5.xml:838 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@ -7725,12 +7744,12 @@ msgstr "" "und kryptografischen Signaturen von heruntergeladenen Dateien beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:836 +#: apt.conf.5.xml:845 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "<literal>Debug::pkgAcquire::Diffs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:839 +#: apt.conf.5.xml:848 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@ -7739,12 +7758,12 @@ msgstr "" "und Fehler, die die Paketindexlisten-Diffs betreffen, ausgeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:847 +#: apt.conf.5.xml:856 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "<literal>Debug::pkgAcquire::RRed</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:860 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@ -7754,12 +7773,12 @@ msgstr "" "werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:858 +#: apt.conf.5.xml:867 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "<literal>Debug::pkgAcquire::Worker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:862 +#: apt.conf.5.xml:871 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@ -7767,12 +7786,12 @@ msgstr "" "durchführen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:869 +#: apt.conf.5.xml:878 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:873 +#: apt.conf.5.xml:882 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@ -7782,12 +7801,12 @@ msgstr "" "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:880 +#: apt.conf.5.xml:889 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:883 +#: apt.conf.5.xml:892 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -7803,12 +7822,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:903 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "<literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:897 +#: apt.conf.5.xml:906 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7840,23 +7859,23 @@ msgstr "" "erscheint." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:916 +#: apt.conf.5.xml:925 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:919 +#: apt.conf.5.xml:928 msgid "Dump the default configuration to standard error on startup." msgstr "" "Die Vorgabekonfiguration beim Start auf der Standardfehlerausgabe ausgeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:926 +#: apt.conf.5.xml:935 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:929 +#: apt.conf.5.xml:938 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@ -7866,12 +7885,12 @@ msgstr "" "sind." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:937 +#: apt.conf.5.xml:946 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:940 +#: apt.conf.5.xml:949 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@ -7880,12 +7899,12 @@ msgstr "" "alle während deren Auswertung gefundenen Fehler ausgeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:947 +#: apt.conf.5.xml:956 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:951 +#: apt.conf.5.xml:960 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@ -7895,12 +7914,12 @@ msgstr "" "soll." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:959 +#: apt.conf.5.xml:968 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:963 +#: apt.conf.5.xml:972 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" @@ -7908,22 +7927,22 @@ msgstr "" "von &dpkg; ausgeführt werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:970 +#: apt.conf.5.xml:979 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:974 +#: apt.conf.5.xml:983 msgid "Output the priority of each package list on startup." msgstr "Die Priorität jeder Paketliste beim Start ausgeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:980 +#: apt.conf.5.xml:989 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:984 +#: apt.conf.5.xml:993 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@ -7933,12 +7952,12 @@ msgstr "" "aufgetreten ist)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:992 +#: apt.conf.5.xml:1001 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1004 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -7950,12 +7969,12 @@ msgstr "" "beschrieben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1003 +#: apt.conf.5.xml:1012 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1007 +#: apt.conf.5.xml:1016 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -7964,7 +7983,7 @@ msgstr "" "gelesenen Anbieter ausgeben." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1030 +#: apt.conf.5.xml:1039 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -7973,13 +7992,13 @@ msgstr "" "möglichen Optionen zeigen." #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1037 +#: apt.conf.5.xml:1046 msgid "&file-aptconf;" msgstr "&file-aptconf;" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1042 +#: apt.conf.5.xml:1051 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." -- cgit v1.2.3 From bcc27ad808016b27bba7d7d137098df6abf766c3 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Fri, 11 Jun 2010 11:16:22 +0200 Subject: * configure.in: - Check for zlib library and headers. --- configure.in | 4 ++++ debian/changelog | 2 ++ 2 files changed, 6 insertions(+) diff --git a/configure.in b/configure.in index 82785a9dd..015b142ea 100644 --- a/configure.in +++ b/configure.in @@ -83,6 +83,10 @@ AC_CHECK_LIB(curl, curl_easy_init, AC_SUBST(BDBLIB) +AC_CHECK_LIB(z, gzopen, + [AC_CHECK_HEADER(zlib.h, [], AC_MSG_ERROR([failed: zlib.h not found]))], + AC_MSG_ERROR([failed: Need libz])) + dnl Converts the ARCH to be something singular for this general CPU family dnl This is often the dpkg architecture string. dnl First check against the full canonical canoncial-system-type in $target diff --git a/debian/changelog b/debian/changelog index 7caa401fc..9f9e09727 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low - Link against zlib (in apt-pkg/makefile) and add zlib build dependency. - [ABI BREAK] This introduces a new protected member of FileFD and changes the behaviour of FileFd for reading gzipped files. + * configure.in: + - Check for zlib library and headers. * apt-pkg/deb/debindexfile.cc: - If we do not find uncompressed package/source/translation indexes, look for gzip compressed ones. -- cgit v1.2.3 From 35454fa94aae83cf60042284dc82fac579aa84cd Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Fri, 11 Jun 2010 12:34:26 +0200 Subject: changelog: clarify abi break, it's not external --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9f9e09727..017e774ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,8 +11,8 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low * apt-pkg/contrib/fileutl.{h,cc}: - Add support for transparent reading of gzipped files. - Link against zlib (in apt-pkg/makefile) and add zlib build dependency. - - [ABI BREAK] This introduces a new protected member of FileFD and changes - the behaviour of FileFd for reading gzipped files. + - [Weak internal ABI BREAK] This changes the behaviour of FileFd for + reading gzipped files. * configure.in: - Check for zlib library and headers. * apt-pkg/deb/debindexfile.cc: -- cgit v1.2.3 From f4782b42840c1f86c40a59690698ccf6920e990a Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Fri, 11 Jun 2010 18:22:48 +0200 Subject: test-indexes.sh: Add source related tests, which uncovers two regressions --- test/test-indexes.sh | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/test/test-indexes.sh b/test/test-indexes.sh index d3f5e7cd3..e82633022 100755 --- a/test/test-indexes.sh +++ b/test/test-indexes.sh @@ -7,7 +7,7 @@ BUILDDIR=$(readlink -f $(dirname $0)/../build) -TEST_SOURCE="deb http://ftp.debian.org/debian unstable contrib" +TEST_SOURCE="http://ftp.debian.org/debian unstable contrib" TEST_SOURCE_KEYID=55BE302B GPG_KEYSERVER=gpg-keyserver.de # should be a small package with dependencies satisfiable in TEST_SOURCE, i. e. @@ -39,7 +39,8 @@ ln -s /home home mkdir -p etc/apt/preferences.d etc/apt/trusted.gpg.d var/cache/apt/archives/partial var/lib/apt/lists/partial var/lib/dpkg cp /etc/apt/trusted.gpg etc/apt touch var/lib/dpkg/status -echo "$TEST_SOURCE" > etc/apt/sources.list +echo "deb $TEST_SOURCE" > etc/apt/sources.list +echo "deb-src $TEST_SOURCE" >> etc/apt/sources.list # get keyring gpg --no-options --no-default-keyring --secret-keyring etc/apt/secring.gpg --trustdb-name etc/apt/trustdb.gpg --keyring etc/apt/trusted.gpg --primary-keyring etc/apt/trusted.gpg --keyserver $GPG_KEYSERVER --recv-keys $TEST_SOURCE_KEYID @@ -47,7 +48,9 @@ gpg --no-options --no-default-keyring --secret-keyring etc/apt/secring.gpg --tru echo "---- uncompressed update ----" $APT_GET update test -e var/lib/apt/lists/*_Packages +test -e var/lib/apt/lists/*_Sources ! test -e var/lib/apt/lists/*_Packages.gz +! test -e var/lib/apt/lists/*_Sources.gz echo "---- uncompressed cache ----" $APT_CACHE show $TEST_PKG | grep -q ^Version: @@ -58,27 +61,45 @@ $APT_CACHE policy $TEST_PKG | grep -q '500 http://' # again (with cache) $APT_CACHE policy $TEST_PKG | grep -q '500 http://' +TEST_SRC=`$APT_CACHE show $TEST_PKG | grep ^Source: | awk '{print $2}'` +rm var/cache/apt/*.bin +$APT_CACHE showsrc $TEST_SRC | grep -q ^Binary: +# again (with cache) +$APT_CACHE showsrc $TEST_SRC | grep -q ^Binary: + echo "---- uncompressed install ----" $APT_GET install -d $TEST_PKG test -e var/cache/apt/archives/$TEST_PKG*.deb $APT_GET clean ! test -e var/cache/apt/archives/$TEST_PKG*.deb +echo "---- uncompressed get source ----" +$APT_GET source $TEST_PKG +test -f $TEST_SRC_*.dsc +test -d $TEST_SRC-* +rm -r $TEST_SRC* + echo "----- uncompressed update with preexisting indexes, no pdiff ----" $APT_GET -o Acquire::PDiffs=false update test -e var/lib/apt/lists/*_Packages +test -e var/lib/apt/lists/*_Sources ! test -e var/lib/apt/lists/*_Packages.gz +! test -e var/lib/apt/lists/*_Sources.gz echo "----- uncompressed update with preexisting indexes, with pdiff ----" $APT_GET -o Acquire::PDiffs=true update test -e var/lib/apt/lists/*_Packages +test -e var/lib/apt/lists/*_Sources ! test -e var/lib/apt/lists/*_Packages.gz +! test -e var/lib/apt/lists/*_Sources.gz echo "----- compressed update ----" find var/lib/apt/lists/ -type f | xargs -r rm $APT_GET -o Acquire::GzipIndexes=true update ! test -e var/lib/apt/lists/*_Packages +! test -e var/lib/apt/lists/*_Sources test -e var/lib/apt/lists/*_Packages.gz +test -e var/lib/apt/lists/*_Sources.gz echo "---- compressed cache ----" $APT_CACHE show $TEST_PKG | grep -q ^Version: @@ -89,18 +110,34 @@ $APT_CACHE policy $TEST_PKG | grep -q '500 http://' # again (with cache) $APT_CACHE policy $TEST_PKG | grep -q '500 http://' +TEST_SRC=`$APT_CACHE show $TEST_PKG | grep ^Source: | awk '{print $2}'` +rm var/cache/apt/*.bin +$APT_CACHE showsrc $TEST_SRC | grep -q ^Binary: +# again (with cache) +$APT_CACHE showsrc $TEST_SRC | grep -q ^Binary: + echo "---- compressed install ----" $APT_GET install -d $TEST_PKG ! test -e var/cache/apt/archives/$TEST_PKG*.deb +echo "---- compressed get source ----" +$APT_GET source $TEST_PKG +test -f $TEST_SRC_*.dsc +test -d $TEST_SRC-* +rm -r $TEST_SRC* + echo "----- compressed update with preexisting indexes, no pdiff ----" $APT_GET -o Acquire::PDiffs=false -o Acquire::GzipIndexes=true update ! test -e var/lib/apt/lists/*_Packages +! test -e var/lib/apt/lists/*_Sources test -e var/lib/apt/lists/*_Packages.gz +test -e var/lib/apt/lists/*_Sources.gz echo "----- compressed update with preexisting indexes, with pdiff ----" $APT_GET -o Acquire::PDiffs=true -o Acquire::GzipIndexes=true update ! test -e var/lib/apt/lists/*_Packages +! test -e var/lib/apt/lists/*_Sources test -e var/lib/apt/lists/*_Packages.gz +test -e var/lib/apt/lists/*_Sources.gz echo "---- ALL TESTS PASSED ----" -- cgit v1.2.3 From b26e2415ee2d4f611966488954f8d4f30fcf827c Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Fri, 11 Jun 2010 18:59:06 +0200 Subject: * apt-pkg/acquire-item.cc: - Fix return value of pkgAcqFile::Custom600Headers() in the non-index case, to avoid returning NULL and causing crashers in callers. This also fixes a compiler warning. --- apt-pkg/acquire-item.cc | 2 ++ debian/changelog | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 83fb5328b..bcfe6a98a 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1688,5 +1688,7 @@ string pkgAcqFile::Custom600Headers() { if (IsIndexFile) return "\nIndex-File: true"; + else + return ""; } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 017e774ba..380060aa6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,10 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low * Add test/test-indexes.sh: - Test behaviour of index retrieval and usage, in particular with uncompressed and gzip compressed indexes. + * apt-pkg/acquire-item.cc: + - Fix return value of pkgAcqFile::Custom600Headers() in the non-index + case, to avoid returning NULL and causing crashers in callers. This also + fixes a compiler warning. -- Christian Perrier <bubulle@debian.org> Tue, 11 May 2010 19:52:00 +0200 -- cgit v1.2.3 From 94e8c9d4df70d2532e1640dfe2700dd63a094a4f Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Fri, 11 Jun 2010 19:23:08 +0200 Subject: apt-pkg/deb/debindexfile.cc: Fix one more place to check for gzipped indexes, to work with apt-get source as well --- apt-pkg/deb/debindexfile.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index e87c21f13..9832329c0 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -63,9 +63,13 @@ string debSourcesIndex::SourceInfo(pkgSrcRecords::Parser const &Record, /* */ pkgSrcRecords::Parser *debSourcesIndex::CreateSrcParser() const { - string SourcesURI = URItoFileName(IndexURI("Sources")); - return new debSrcRecordParser(_config->FindDir("Dir::State::lists") + - SourcesURI,this); + string SourcesURI = _config->FindDir("Dir::State::lists") + + URItoFileName(IndexURI("Sources")); + string SourcesURIgzip = SourcesURI + ".gz"; + if (!FileExists(SourcesURI) && FileExists(SourcesURIgzip)) + SourcesURI = SourcesURIgzip; + + return new debSrcRecordParser(SourcesURI,this); } /*}}}*/ // SourcesIndex::Describe - Give a descriptive path to the index /*{{{*/ -- cgit v1.2.3 From 8d48388ebfb69ab21a50d068275d2f6b7abffb87 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Tue, 15 Jun 2010 13:17:33 +0200 Subject: test/test-indexes.sh: Stop hardcoding archive gpg key ID, get it from first failed apt-get update output --- test/test-indexes.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/test/test-indexes.sh b/test/test-indexes.sh index e82633022..58b9cff72 100755 --- a/test/test-indexes.sh +++ b/test/test-indexes.sh @@ -8,7 +8,6 @@ BUILDDIR=$(readlink -f $(dirname $0)/../build) TEST_SOURCE="http://ftp.debian.org/debian unstable contrib" -TEST_SOURCE_KEYID=55BE302B GPG_KEYSERVER=gpg-keyserver.de # should be a small package with dependencies satisfiable in TEST_SOURCE, i. e. # ideally no depends at all @@ -42,11 +41,15 @@ touch var/lib/dpkg/status echo "deb $TEST_SOURCE" > etc/apt/sources.list echo "deb-src $TEST_SOURCE" >> etc/apt/sources.list -# get keyring -gpg --no-options --no-default-keyring --secret-keyring etc/apt/secring.gpg --trustdb-name etc/apt/trustdb.gpg --keyring etc/apt/trusted.gpg --primary-keyring etc/apt/trusted.gpg --keyserver $GPG_KEYSERVER --recv-keys $TEST_SOURCE_KEYID - echo "---- uncompressed update ----" +# first attempt should fail, no trusted GPG key +out=$($APT_GET update 2>&1) +echo "$out" | grep -q NO_PUBKEY +key=$(echo "$out" | sed -n '/NO_PUBKEY/ { s/^.*NO_PUBKEY \([[:alnum:]]\+\)$/\1/; p}') +# get keyring +gpg --no-options --no-default-keyring --secret-keyring etc/apt/secring.gpg --trustdb-name etc/apt/trustdb.gpg --keyring etc/apt/trusted.gpg --primary-keyring etc/apt/trusted.gpg --keyserver $GPG_KEYSERVER --recv-keys $key $APT_GET update + test -e var/lib/apt/lists/*_Packages test -e var/lib/apt/lists/*_Sources ! test -e var/lib/apt/lists/*_Packages.gz -- cgit v1.2.3 From 55c59998a046e8d60b5bf51772bd7db5cd43ca7c Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 15 Jun 2010 20:29:50 +0200 Subject: Add a GroupedFromCommandLine for the VersionSet similar to the one for PackageSet and refactor the existing VersionSet methods to simplify that. --- apt-pkg/cacheset.cc | 123 +++++++++++++++++++++++++++++++++++----------------- apt-pkg/cacheset.h | 35 +++++++++++++++ 2 files changed, 119 insertions(+), 39 deletions(-) diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index e91b56997..fde52168a 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -91,7 +91,7 @@ std::map<unsigned short, PackageSet> PackageSet::GroupedFromCommandLine( switch(mod->Pos) { case PackageSet::Modifier::POSTFIX: if (str.compare(str.length() - alength, alength, - mod->Alias, 0, alength) != 0) + mod->Alias, 0, alength) != 0) continue; str.erase(str.length() - alength); modID = mod->ID; @@ -148,53 +148,98 @@ PackageSet PackageSet::FromString(pkgCacheFile &Cache, std::string const &str, s return regex; } /*}}}*/ +// GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ +std::map<unsigned short, VersionSet> VersionSet::GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list<VersionSet::Modifier> const &mods, + unsigned short const &fallback, std::ostream &out) { + std::map<unsigned short, VersionSet> versets; + for (const char **I = cmdline; *I != 0; ++I) { + unsigned short modID = fallback; + VersionSet::Version select = VersionSet::NEWEST; + std::string str = *I; + for (std::list<VersionSet::Modifier>::const_iterator mod = mods.begin(); + mod != mods.end(); ++mod) { + if (modID == fallback && mod->ID == fallback) + select = mod->SelectVersion; + size_t const alength = strlen(mod->Alias); + switch(mod->Pos) { + case VersionSet::Modifier::POSTFIX: + if (str.compare(str.length() - alength, alength, + mod->Alias, 0, alength) != 0) + continue; + str.erase(str.length() - alength); + modID = mod->ID; + select = mod->SelectVersion; + break; + case VersionSet::Modifier::PREFIX: + continue; + case VersionSet::Modifier::NONE: + continue; + } + break; + } + VersionSet vset = VersionSet::FromString(Cache, str, select , out); + versets[modID].insert(vset.begin(), vset.end()); + } + return versets; +} + /*}}}*/ // FromCommandLine - Return all versions specified on commandline /*{{{*/ APT::VersionSet VersionSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, APT::VersionSet::Version const &fallback, std::ostream &out) { VersionSet verset; for (const char **I = cmdline; *I != 0; ++I) { - std::string pkg = *I; - std::string ver; - bool verIsRel = false; - size_t const vertag = pkg.find_last_of("/="); - if (vertag != string::npos) { - ver = pkg.substr(vertag+1); - verIsRel = (pkg[vertag] == '/'); - pkg.erase(vertag); + VersionSet vset = VersionSet::FromString(Cache, *I, fallback, out); + verset.insert(vset.begin(), vset.end()); + } + return verset; +} + /*}}}*/ +// FromString - Returns all versions spedcified by a string /*{{{*/ +APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, + APT::VersionSet::Version const &fallback, std::ostream &out) { + std::string ver; + bool verIsRel = false; + size_t const vertag = pkg.find_last_of("/="); + if (vertag != string::npos) { + ver = pkg.substr(vertag+1); + verIsRel = (pkg[vertag] == '/'); + pkg.erase(vertag); + } + PackageSet pkgset = PackageSet::FromString(Cache, pkg.c_str(), out); + VersionSet verset; + for (PackageSet::const_iterator P = pkgset.begin(); + P != pkgset.end(); ++P) { + if (vertag == string::npos) { + AddSelectedVersion(Cache, verset, P, fallback); + continue; } - PackageSet pkgset = PackageSet::FromString(Cache, pkg.c_str(), out); - for (PackageSet::const_iterator P = pkgset.begin(); - P != pkgset.end(); ++P) { - if (vertag == string::npos) { - AddSelectedVersion(Cache, verset, P, fallback); + pkgCache::VerIterator V; + if (ver == "installed") + V = getInstalledVer(Cache, P); + else if (ver == "candidate") + V = getCandidateVer(Cache, P); + else { + pkgVersionMatch Match(ver, (verIsRel == true ? pkgVersionMatch::Release : + pkgVersionMatch::Version)); + V = Match.Find(P); + if (V.end() == true) { + if (verIsRel == true) + _error->Error(_("Release '%s' for '%s' was not found"), + ver.c_str(), P.FullName(true).c_str()); + else + _error->Error(_("Version '%s' for '%s' was not found"), + ver.c_str(), P.FullName(true).c_str()); continue; } - pkgCache::VerIterator V; - if (ver == "installed") - V = getInstalledVer(Cache, P); - else if (ver == "candidate") - V = getCandidateVer(Cache, P); - else { - pkgVersionMatch Match(ver, (verIsRel == true ? pkgVersionMatch::Release : - pkgVersionMatch::Version)); - V = Match.Find(P); - if (V.end() == true) { - if (verIsRel == true) - _error->Error(_("Release '%s' for '%s' was not found"), - ver.c_str(), P.FullName(true).c_str()); - else - _error->Error(_("Version '%s' for '%s' was not found"), - ver.c_str(), P.FullName(true).c_str()); - continue; - } - } - if (V.end() == true) - continue; - if (ver == V.VerStr()) - ioprintf(out, _("Selected version '%s' (%s) for '%s'\n"), - V.VerStr(), V.RelStr().c_str(), P.FullName(true).c_str()); - verset.insert(V); } + if (V.end() == true) + continue; + if (ver == V.VerStr()) + ioprintf(out, _("Selected version '%s' (%s) for '%s'\n"), + V.VerStr(), V.RelStr().c_str(), P.FullName(true).c_str()); + verset.insert(V); } return verset; } diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index 668d8039e..2bc268380 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -209,6 +209,41 @@ public: /*{{{*/ static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { return APT::VersionSet::FromCommandLine(Cache, cmdline, CANDINST); } + + static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg, + APT::VersionSet::Version const &fallback, std::ostream &out); + static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg, + APT::VersionSet::Version const &fallback) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::VersionSet::FromString(Cache, pkg, fallback, out); + } + static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg) { + return APT::VersionSet::FromString(Cache, pkg, CANDINST); + } + + struct Modifier { + enum Position { NONE, PREFIX, POSTFIX }; + unsigned short ID; + const char * const Alias; + Position Pos; + VersionSet::Version SelectVersion; + Modifier (unsigned short const &id, const char * const alias, Position const &pos, + VersionSet::Version const &select) : ID(id), Alias(alias), Pos(pos), + SelectVersion(select) {}; + }; + + static std::map<unsigned short, VersionSet> GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list<VersionSet::Modifier> const &mods, + unsigned short const &fallback, std::ostream &out); + static std::map<unsigned short, VersionSet> GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list<VersionSet::Modifier> const &mods, + unsigned short const &fallback) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::VersionSet::GroupedFromCommandLine(Cache, cmdline, + mods, fallback, out); + } /*}}}*/ protected: /*{{{*/ -- cgit v1.2.3 From d8276801a1c84582a85ed9ea1f2eb4e66e052e6b Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 15 Jun 2010 20:46:09 +0200 Subject: * cmdline/cacheset.cc: - doesn't include it in the library for now as it is too volatile --- apt-pkg/cacheset.cc | 330 ---------------------------------------------------- apt-pkg/cacheset.h | 274 ------------------------------------------- apt-pkg/makefile | 5 +- cmdline/cacheset.cc | 330 ++++++++++++++++++++++++++++++++++++++++++++++++++++ cmdline/cacheset.h | 274 +++++++++++++++++++++++++++++++++++++++++++ cmdline/makefile | 4 +- debian/changelog | 3 +- 7 files changed, 610 insertions(+), 610 deletions(-) delete mode 100644 apt-pkg/cacheset.cc delete mode 100644 apt-pkg/cacheset.h create mode 100644 cmdline/cacheset.cc create mode 100644 cmdline/cacheset.h diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc deleted file mode 100644 index fde52168a..000000000 --- a/apt-pkg/cacheset.cc +++ /dev/null @@ -1,330 +0,0 @@ -// -*- mode: cpp; mode: fold -*- -// Description /*{{{*/ -/* ###################################################################### - - Simple wrapper around a std::set to provide a similar interface to - a set of cache structures as to the complete set of all structures - in the pkgCache. Currently only Package is supported. - - ##################################################################### */ - /*}}}*/ -// Include Files /*{{{*/ -#include <apt-pkg/aptconfiguration.h> -#include <apt-pkg/error.h> -#include <apt-pkg/cacheset.h> -#include <apt-pkg/strutl.h> -#include <apt-pkg/versionmatch.h> - -#include <apti18n.h> - -#include <vector> - -#include <regex.h> - /*}}}*/ -namespace APT { -// FromRegEx - Return all packages in the cache matching a pattern /*{{{*/ -PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, std::ostream &out) { - PackageSet pkgset; - std::string arch = "native"; - static const char * const isregex = ".?+*|[^$"; - - if (pattern.find_first_of(isregex) == std::string::npos) - return pkgset; - - size_t archfound = pattern.find_last_of(':'); - if (archfound != std::string::npos) { - arch = pattern.substr(archfound+1); - if (arch.find_first_of(isregex) == std::string::npos) - pattern.erase(archfound); - else - arch = "native"; - } - - regex_t Pattern; - int Res; - if ((Res = regcomp(&Pattern, pattern.c_str() , REG_EXTENDED | REG_ICASE | REG_NOSUB)) != 0) { - char Error[300]; - regerror(Res, &Pattern, Error, sizeof(Error)); - _error->Error(_("Regex compilation error - %s"), Error); - return pkgset; - } - - for (pkgCache::GrpIterator Grp = Cache.GetPkgCache()->GrpBegin(); Grp.end() == false; ++Grp) - { - if (regexec(&Pattern, Grp.Name(), 0, 0, 0) != 0) - continue; - pkgCache::PkgIterator Pkg = Grp.FindPkg(arch); - if (Pkg.end() == true) { - if (archfound == std::string::npos) { - std::vector<std::string> archs = APT::Configuration::getArchitectures(); - for (std::vector<std::string>::const_iterator a = archs.begin(); - a != archs.end() && Pkg.end() != true; ++a) - Pkg = Grp.FindPkg(*a); - } - if (Pkg.end() == true) - continue; - } - - ioprintf(out, _("Note, selecting %s for regex '%s'\n"), - Pkg.FullName(true).c_str(), pattern.c_str()); - - pkgset.insert(Pkg); - } - - regfree(&Pattern); - - return pkgset; -} - /*}}}*/ -// GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ -std::map<unsigned short, PackageSet> PackageSet::GroupedFromCommandLine( - pkgCacheFile &Cache, const char **cmdline, - std::list<PackageSet::Modifier> const &mods, - unsigned short const &fallback, std::ostream &out) { - std::map<unsigned short, PackageSet> pkgsets; - for (const char **I = cmdline; *I != 0; ++I) { - unsigned short modID = fallback; - std::string str = *I; - for (std::list<PackageSet::Modifier>::const_iterator mod = mods.begin(); - mod != mods.end(); ++mod) { - size_t const alength = strlen(mod->Alias); - switch(mod->Pos) { - case PackageSet::Modifier::POSTFIX: - if (str.compare(str.length() - alength, alength, - mod->Alias, 0, alength) != 0) - continue; - str.erase(str.length() - alength); - modID = mod->ID; - break; - case PackageSet::Modifier::PREFIX: - continue; - case PackageSet::Modifier::NONE: - continue; - } - break; - } - PackageSet pset = PackageSet::FromString(Cache, str, out); - pkgsets[modID].insert(pset.begin(), pset.end()); - } - return pkgsets; -} - /*}}}*/ -// FromCommandLine - Return all packages specified on commandline /*{{{*/ -PackageSet PackageSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, std::ostream &out) { - PackageSet pkgset; - for (const char **I = cmdline; *I != 0; ++I) { - PackageSet pset = FromString(Cache, *I, out); - pkgset.insert(pset.begin(), pset.end()); - } - return pkgset; -} - /*}}}*/ -// FromString - Return all packages matching a specific string /*{{{*/ -PackageSet PackageSet::FromString(pkgCacheFile &Cache, std::string const &str, std::ostream &out) { - std::string pkg = str; - size_t archfound = pkg.find_last_of(':'); - std::string arch; - if (archfound != std::string::npos) { - arch = pkg.substr(archfound+1); - pkg.erase(archfound); - } - - pkgCache::PkgIterator Pkg; - if (arch.empty() == true) { - pkgCache::GrpIterator Grp = Cache.GetPkgCache()->FindGrp(pkg); - if (Grp.end() == false) - Pkg = Grp.FindPreferredPkg(); - } else - Pkg = Cache.GetPkgCache()->FindPkg(pkg, arch); - - if (Pkg.end() == false) { - PackageSet pkgset; - pkgset.insert(Pkg); - return pkgset; - } - PackageSet regex = FromRegEx(Cache, str, out); - if (regex.empty() == true) - _error->Warning(_("Unable to locate package %s"), str.c_str()); - return regex; -} - /*}}}*/ -// GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ -std::map<unsigned short, VersionSet> VersionSet::GroupedFromCommandLine( - pkgCacheFile &Cache, const char **cmdline, - std::list<VersionSet::Modifier> const &mods, - unsigned short const &fallback, std::ostream &out) { - std::map<unsigned short, VersionSet> versets; - for (const char **I = cmdline; *I != 0; ++I) { - unsigned short modID = fallback; - VersionSet::Version select = VersionSet::NEWEST; - std::string str = *I; - for (std::list<VersionSet::Modifier>::const_iterator mod = mods.begin(); - mod != mods.end(); ++mod) { - if (modID == fallback && mod->ID == fallback) - select = mod->SelectVersion; - size_t const alength = strlen(mod->Alias); - switch(mod->Pos) { - case VersionSet::Modifier::POSTFIX: - if (str.compare(str.length() - alength, alength, - mod->Alias, 0, alength) != 0) - continue; - str.erase(str.length() - alength); - modID = mod->ID; - select = mod->SelectVersion; - break; - case VersionSet::Modifier::PREFIX: - continue; - case VersionSet::Modifier::NONE: - continue; - } - break; - } - VersionSet vset = VersionSet::FromString(Cache, str, select , out); - versets[modID].insert(vset.begin(), vset.end()); - } - return versets; -} - /*}}}*/ -// FromCommandLine - Return all versions specified on commandline /*{{{*/ -APT::VersionSet VersionSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, - APT::VersionSet::Version const &fallback, std::ostream &out) { - VersionSet verset; - for (const char **I = cmdline; *I != 0; ++I) { - VersionSet vset = VersionSet::FromString(Cache, *I, fallback, out); - verset.insert(vset.begin(), vset.end()); - } - return verset; -} - /*}}}*/ -// FromString - Returns all versions spedcified by a string /*{{{*/ -APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, - APT::VersionSet::Version const &fallback, std::ostream &out) { - std::string ver; - bool verIsRel = false; - size_t const vertag = pkg.find_last_of("/="); - if (vertag != string::npos) { - ver = pkg.substr(vertag+1); - verIsRel = (pkg[vertag] == '/'); - pkg.erase(vertag); - } - PackageSet pkgset = PackageSet::FromString(Cache, pkg.c_str(), out); - VersionSet verset; - for (PackageSet::const_iterator P = pkgset.begin(); - P != pkgset.end(); ++P) { - if (vertag == string::npos) { - AddSelectedVersion(Cache, verset, P, fallback); - continue; - } - pkgCache::VerIterator V; - if (ver == "installed") - V = getInstalledVer(Cache, P); - else if (ver == "candidate") - V = getCandidateVer(Cache, P); - else { - pkgVersionMatch Match(ver, (verIsRel == true ? pkgVersionMatch::Release : - pkgVersionMatch::Version)); - V = Match.Find(P); - if (V.end() == true) { - if (verIsRel == true) - _error->Error(_("Release '%s' for '%s' was not found"), - ver.c_str(), P.FullName(true).c_str()); - else - _error->Error(_("Version '%s' for '%s' was not found"), - ver.c_str(), P.FullName(true).c_str()); - continue; - } - } - if (V.end() == true) - continue; - if (ver == V.VerStr()) - ioprintf(out, _("Selected version '%s' (%s) for '%s'\n"), - V.VerStr(), V.RelStr().c_str(), P.FullName(true).c_str()); - verset.insert(V); - } - return verset; -} - /*}}}*/ -// AddSelectedVersion - add version from package based on fallback /*{{{*/ -bool VersionSet::AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset, - pkgCache::PkgIterator const &P, VersionSet::Version const &fallback, - bool const &AllowError) { - pkgCache::VerIterator V; - switch(fallback) { - case VersionSet::ALL: - if (P->VersionList != 0) - for (V = P.VersionList(); V.end() != true; ++V) - verset.insert(V); - else if (AllowError == false) - return _error->Error(_("Can't select versions from package '%s' as it purely virtual"), P.FullName(true).c_str()); - else - return false; - break; - case VersionSet::CANDANDINST: - verset.insert(getInstalledVer(Cache, P, AllowError)); - verset.insert(getCandidateVer(Cache, P, AllowError)); - break; - case VersionSet::CANDIDATE: - verset.insert(getCandidateVer(Cache, P, AllowError)); - break; - case VersionSet::INSTALLED: - verset.insert(getInstalledVer(Cache, P, AllowError)); - break; - case VersionSet::CANDINST: - V = getCandidateVer(Cache, P, true); - if (V.end() == true) - V = getInstalledVer(Cache, P, true); - if (V.end() == false) - verset.insert(V); - else if (AllowError == false) - return _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), P.FullName(true).c_str()); - else - return false; - break; - case VersionSet::INSTCAND: - V = getInstalledVer(Cache, P, true); - if (V.end() == true) - V = getCandidateVer(Cache, P, true); - if (V.end() == false) - verset.insert(V); - else if (AllowError == false) - return _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), P.FullName(true).c_str()); - else - return false; - break; - case VersionSet::NEWEST: - if (P->VersionList != 0) - verset.insert(P.VersionList()); - else if (AllowError == false) - return _error->Error(_("Can't select newest version from package '%s' as it is purely virtual"), P.FullName(true).c_str()); - else - return false; - break; - } - return true; -} - /*}}}*/ -// getCandidateVer - Returns the candidate version of the given package /*{{{*/ -pkgCache::VerIterator VersionSet::getCandidateVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg, bool const &AllowError) { - pkgCache::VerIterator Cand; - if (Cache.IsDepCacheBuilt() == true) - Cand = Cache[Pkg].CandidateVerIter(Cache); - else { - if (unlikely(Cache.BuildPolicy() == false)) - return pkgCache::VerIterator(*Cache); - Cand = Cache.GetPolicy()->GetCandidateVer(Pkg); - } - if (AllowError == false && Cand.end() == true) - _error->Error(_("Can't select candidate version from package %s as it has no candidate"), Pkg.FullName(true).c_str()); - return Cand; -} - /*}}}*/ -// getInstalledVer - Returns the installed version of the given package /*{{{*/ -pkgCache::VerIterator VersionSet::getInstalledVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg, bool const &AllowError) { - if (AllowError == false && Pkg->CurrentVer == 0) - _error->Error(_("Can't select installed version from package %s as it is not installed"), Pkg.FullName(true).c_str()); - return Pkg.CurrentVer(); -} - /*}}}*/ -} diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h deleted file mode 100644 index 2bc268380..000000000 --- a/apt-pkg/cacheset.h +++ /dev/null @@ -1,274 +0,0 @@ -// -*- mode: cpp; mode: fold -*- -// Description /*{{{*/ -/** \file cacheset.h - Wrappers around std::set to have set::iterators which behave - similar to the Iterators of the cache structures. - - Provides also a few helper methods which work with these sets */ - /*}}}*/ -#ifndef APT_CACHESET_H -#define APT_CACHESET_H -// Include Files /*{{{*/ -#include <iostream> -#include <fstream> -#include <list> -#include <map> -#include <set> -#include <string> - -#include <apt-pkg/cachefile.h> -#include <apt-pkg/pkgcache.h> - /*}}}*/ -namespace APT { -class PackageSet : public std::set<pkgCache::PkgIterator> { /*{{{*/ -/** \class APT::PackageSet - - Simple wrapper around a std::set to provide a similar interface to - a set of packages as to the complete set of all packages in the - pkgCache. */ -public: /*{{{*/ - /** \brief smell like a pkgCache::PkgIterator */ - class const_iterator : public std::set<pkgCache::PkgIterator>::const_iterator { - public: - const_iterator(std::set<pkgCache::PkgIterator>::const_iterator x) : - std::set<pkgCache::PkgIterator>::const_iterator(x) {} - - operator pkgCache::PkgIterator(void) { return **this; } - - inline const char *Name() const {return (**this).Name(); } - inline std::string FullName(bool const &Pretty) const { return (**this).FullName(Pretty); } - inline std::string FullName() const { return (**this).FullName(); } - inline const char *Section() const {return (**this).Section(); } - inline bool Purge() const {return (**this).Purge(); } - inline const char *Arch() const {return (**this).Arch(); } - inline pkgCache::GrpIterator Group() const { return (**this).Group(); } - inline pkgCache::VerIterator VersionList() const { return (**this).VersionList(); } - inline pkgCache::VerIterator CurrentVer() const { return (**this).CurrentVer(); } - inline pkgCache::DepIterator RevDependsList() const { return (**this).RevDependsList(); } - inline pkgCache::PrvIterator ProvidesList() const { return (**this).ProvidesList(); } - inline pkgCache::PkgIterator::OkState State() const { return (**this).State(); } - inline const char *CandVersion() const { return (**this).CandVersion(); } - inline const char *CurVersion() const { return (**this).CurVersion(); } - inline pkgCache *Cache() const { return (**this).Cache(); }; - inline unsigned long Index() const {return (**this).Index();}; - // we have only valid iterators here - inline bool end() const { return false; }; - - friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, (*i)); } - - inline pkgCache::Package const * operator->() const { - return &***this; - }; - }; - // 103. set::iterator is required to be modifiable, but this allows modification of keys - typedef APT::PackageSet::const_iterator iterator; - - using std::set<pkgCache::PkgIterator>::insert; - inline void insert(pkgCache::PkgIterator const &P) { if (P.end() == false) std::set<pkgCache::PkgIterator>::insert(P); }; - - /** \brief returns all packages in the cache whose name matchs a given pattern - - A simple helper responsible for executing a regular expression on all - package names in the cache. Optional it prints a a notice about the - packages chosen cause of the given package. - \param Cache the packages are in - \param pattern regular expression for package names - \param out stream to print the notice to */ - static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string pattern, std::ostream &out); - static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string const &pattern) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); - return APT::PackageSet::FromRegEx(Cache, pattern, out); - } - - /** \brief returns all packages specified by a string - - \param Cache the packages are in - \param string String the package name(s) should be extracted from - \param out stream to print various notices to */ - static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string, std::ostream &out); - static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); - return APT::PackageSet::FromString(Cache, string, out); - } - - /** \brief returns all packages specified on the commandline - - Get all package names from the commandline and executes regex's if needed. - No special package command is supported, just plain names. - \param Cache the packages are in - \param cmdline Command line the package names should be extracted from - \param out stream to print various notices to */ - static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, std::ostream &out); - static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); - return APT::PackageSet::FromCommandLine(Cache, cmdline, out); - } - - struct Modifier { - enum Position { NONE, PREFIX, POSTFIX }; - unsigned short ID; - const char * const Alias; - Position Pos; - Modifier (unsigned short const &id, const char * const alias, Position const &pos) : ID(id), Alias(alias), Pos(pos) {}; - }; - - static std::map<unsigned short, PackageSet> GroupedFromCommandLine( - pkgCacheFile &Cache, const char **cmdline, - std::list<PackageSet::Modifier> const &mods, - unsigned short const &fallback, std::ostream &out); - static std::map<unsigned short, PackageSet> GroupedFromCommandLine( - pkgCacheFile &Cache, const char **cmdline, - std::list<PackageSet::Modifier> const &mods, - unsigned short const &fallback) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); - return APT::PackageSet::GroupedFromCommandLine(Cache, cmdline, - mods, fallback, out); - } - /*}}}*/ -}; /*}}}*/ -class VersionSet : public std::set<pkgCache::VerIterator> { /*{{{*/ -/** \class APT::VersionSet - - Simple wrapper around a std::set to provide a similar interface to - a set of versions as to the complete set of all versions in the - pkgCache. */ -public: /*{{{*/ - /** \brief smell like a pkgCache::VerIterator */ - class const_iterator : public std::set<pkgCache::VerIterator>::const_iterator { - public: - const_iterator(std::set<pkgCache::VerIterator>::const_iterator x) : - std::set<pkgCache::VerIterator>::const_iterator(x) {} - - operator pkgCache::VerIterator(void) { return **this; } - - inline pkgCache *Cache() const { return (**this).Cache(); }; - inline unsigned long Index() const {return (**this).Index();}; - // we have only valid iterators here - inline bool end() const { return false; }; - - inline pkgCache::Version const * operator->() const { - return &***this; - }; - - inline int CompareVer(const pkgCache::VerIterator &B) const { return (**this).CompareVer(B); }; - inline const char *VerStr() const { return (**this).VerStr(); }; - inline const char *Section() const { return (**this).Section(); }; - inline const char *Arch() const { return (**this).Arch(); }; - inline const char *Arch(bool const pseudo) const { return (**this).Arch(pseudo); }; - inline pkgCache::PkgIterator ParentPkg() const { return (**this).ParentPkg(); }; - inline pkgCache::DescIterator DescriptionList() const { return (**this).DescriptionList(); }; - inline pkgCache::DescIterator TranslatedDescription() const { return (**this).TranslatedDescription(); }; - inline pkgCache::DepIterator DependsList() const { return (**this).DependsList(); }; - inline pkgCache::PrvIterator ProvidesList() const { return (**this).ProvidesList(); }; - inline pkgCache::VerFileIterator FileList() const { return (**this).FileList(); }; - inline bool Downloadable() const { return (**this).Downloadable(); }; - inline const char *PriorityType() const { return (**this).PriorityType(); }; - inline string RelStr() const { return (**this).RelStr(); }; - inline bool Automatic() const { return (**this).Automatic(); }; - inline bool Pseudo() const { return (**this).Pseudo(); }; - inline pkgCache::VerFileIterator NewestFile() const { return (**this).NewestFile(); }; - }; - // 103. set::iterator is required to be modifiable, but this allows modification of keys - typedef APT::VersionSet::const_iterator iterator; - - using std::set<pkgCache::VerIterator>::insert; - inline void insert(pkgCache::VerIterator const &V) { if (V.end() == false) std::set<pkgCache::VerIterator>::insert(V); }; - - /** \brief specifies which version(s) will be returned if non is given */ - enum Version { - /** All versions */ - ALL, - /** Candidate and installed version */ - CANDANDINST, - /** Candidate version */ - CANDIDATE, - /** Installed version */ - INSTALLED, - /** Candidate or if non installed version */ - CANDINST, - /** Installed or if non candidate version */ - INSTCAND, - /** Newest version */ - NEWEST - }; - - /** \brief returns all versions specified on the commandline - - Get all versions from the commandline, uses given default version if - non specifically requested and executes regex's if needed on names. - \param Cache the packages and versions are in - \param cmdline Command line the versions should be extracted from - \param out stream to print various notices to */ - static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, - APT::VersionSet::Version const &fallback, std::ostream &out); - static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, - APT::VersionSet::Version const &fallback) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); - return APT::VersionSet::FromCommandLine(Cache, cmdline, fallback, out); - } - static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { - return APT::VersionSet::FromCommandLine(Cache, cmdline, CANDINST); - } - - static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg, - APT::VersionSet::Version const &fallback, std::ostream &out); - static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg, - APT::VersionSet::Version const &fallback) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); - return APT::VersionSet::FromString(Cache, pkg, fallback, out); - } - static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg) { - return APT::VersionSet::FromString(Cache, pkg, CANDINST); - } - - struct Modifier { - enum Position { NONE, PREFIX, POSTFIX }; - unsigned short ID; - const char * const Alias; - Position Pos; - VersionSet::Version SelectVersion; - Modifier (unsigned short const &id, const char * const alias, Position const &pos, - VersionSet::Version const &select) : ID(id), Alias(alias), Pos(pos), - SelectVersion(select) {}; - }; - - static std::map<unsigned short, VersionSet> GroupedFromCommandLine( - pkgCacheFile &Cache, const char **cmdline, - std::list<VersionSet::Modifier> const &mods, - unsigned short const &fallback, std::ostream &out); - static std::map<unsigned short, VersionSet> GroupedFromCommandLine( - pkgCacheFile &Cache, const char **cmdline, - std::list<VersionSet::Modifier> const &mods, - unsigned short const &fallback) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); - return APT::VersionSet::GroupedFromCommandLine(Cache, cmdline, - mods, fallback, out); - } - /*}}}*/ -protected: /*{{{*/ - - /** \brief returns the candidate version of the package - - \param Cache to be used to query for information - \param Pkg we want the candidate version from this package - \param AllowError add an error to the stack if not */ - static pkgCache::VerIterator getCandidateVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg, bool const &AllowError = false); - - /** \brief returns the installed version of the package - - \param Cache to be used to query for information - \param Pkg we want the installed version from this package - \param AllowError add an error to the stack if not */ - static pkgCache::VerIterator getInstalledVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg, bool const &AllowError = false); - - - static bool AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset, - pkgCache::PkgIterator const &P, VersionSet::Version const &fallback, - bool const &AllowError = false); - - /*}}}*/ -}; /*}}}*/ -} -#endif diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 1a7078693..a5be462ce 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -35,15 +35,14 @@ SOURCE+= pkgcache.cc version.cc depcache.cc \ srcrecords.cc cachefile.cc versionmatch.cc policy.cc \ pkgsystem.cc indexfile.cc pkgcachegen.cc acquire-item.cc \ indexrecords.cc vendor.cc vendorlist.cc cdrom.cc indexcopy.cc \ - aptconfiguration.cc cacheset.cc + aptconfiguration.cc HEADERS+= algorithms.h depcache.h pkgcachegen.h cacheiterators.h \ orderlist.h sourcelist.h packagemanager.h tagfile.h \ init.h pkgcache.h version.h progress.h pkgrecords.h \ acquire.h acquire-worker.h acquire-item.h acquire-method.h \ clean.h srcrecords.h cachefile.h versionmatch.h policy.h \ pkgsystem.h indexfile.h metaindex.h indexrecords.h vendor.h \ - vendorlist.h cdrom.h indexcopy.h aptconfiguration.h \ - cacheset.h + vendorlist.h cdrom.h indexcopy.h aptconfiguration.h # Source code for the debian specific components # In theory the deb headers do not need to be exported.. diff --git a/cmdline/cacheset.cc b/cmdline/cacheset.cc new file mode 100644 index 000000000..fde52168a --- /dev/null +++ b/cmdline/cacheset.cc @@ -0,0 +1,330 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +/* ###################################################################### + + Simple wrapper around a std::set to provide a similar interface to + a set of cache structures as to the complete set of all structures + in the pkgCache. Currently only Package is supported. + + ##################################################################### */ + /*}}}*/ +// Include Files /*{{{*/ +#include <apt-pkg/aptconfiguration.h> +#include <apt-pkg/error.h> +#include <apt-pkg/cacheset.h> +#include <apt-pkg/strutl.h> +#include <apt-pkg/versionmatch.h> + +#include <apti18n.h> + +#include <vector> + +#include <regex.h> + /*}}}*/ +namespace APT { +// FromRegEx - Return all packages in the cache matching a pattern /*{{{*/ +PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, std::ostream &out) { + PackageSet pkgset; + std::string arch = "native"; + static const char * const isregex = ".?+*|[^$"; + + if (pattern.find_first_of(isregex) == std::string::npos) + return pkgset; + + size_t archfound = pattern.find_last_of(':'); + if (archfound != std::string::npos) { + arch = pattern.substr(archfound+1); + if (arch.find_first_of(isregex) == std::string::npos) + pattern.erase(archfound); + else + arch = "native"; + } + + regex_t Pattern; + int Res; + if ((Res = regcomp(&Pattern, pattern.c_str() , REG_EXTENDED | REG_ICASE | REG_NOSUB)) != 0) { + char Error[300]; + regerror(Res, &Pattern, Error, sizeof(Error)); + _error->Error(_("Regex compilation error - %s"), Error); + return pkgset; + } + + for (pkgCache::GrpIterator Grp = Cache.GetPkgCache()->GrpBegin(); Grp.end() == false; ++Grp) + { + if (regexec(&Pattern, Grp.Name(), 0, 0, 0) != 0) + continue; + pkgCache::PkgIterator Pkg = Grp.FindPkg(arch); + if (Pkg.end() == true) { + if (archfound == std::string::npos) { + std::vector<std::string> archs = APT::Configuration::getArchitectures(); + for (std::vector<std::string>::const_iterator a = archs.begin(); + a != archs.end() && Pkg.end() != true; ++a) + Pkg = Grp.FindPkg(*a); + } + if (Pkg.end() == true) + continue; + } + + ioprintf(out, _("Note, selecting %s for regex '%s'\n"), + Pkg.FullName(true).c_str(), pattern.c_str()); + + pkgset.insert(Pkg); + } + + regfree(&Pattern); + + return pkgset; +} + /*}}}*/ +// GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ +std::map<unsigned short, PackageSet> PackageSet::GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list<PackageSet::Modifier> const &mods, + unsigned short const &fallback, std::ostream &out) { + std::map<unsigned short, PackageSet> pkgsets; + for (const char **I = cmdline; *I != 0; ++I) { + unsigned short modID = fallback; + std::string str = *I; + for (std::list<PackageSet::Modifier>::const_iterator mod = mods.begin(); + mod != mods.end(); ++mod) { + size_t const alength = strlen(mod->Alias); + switch(mod->Pos) { + case PackageSet::Modifier::POSTFIX: + if (str.compare(str.length() - alength, alength, + mod->Alias, 0, alength) != 0) + continue; + str.erase(str.length() - alength); + modID = mod->ID; + break; + case PackageSet::Modifier::PREFIX: + continue; + case PackageSet::Modifier::NONE: + continue; + } + break; + } + PackageSet pset = PackageSet::FromString(Cache, str, out); + pkgsets[modID].insert(pset.begin(), pset.end()); + } + return pkgsets; +} + /*}}}*/ +// FromCommandLine - Return all packages specified on commandline /*{{{*/ +PackageSet PackageSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, std::ostream &out) { + PackageSet pkgset; + for (const char **I = cmdline; *I != 0; ++I) { + PackageSet pset = FromString(Cache, *I, out); + pkgset.insert(pset.begin(), pset.end()); + } + return pkgset; +} + /*}}}*/ +// FromString - Return all packages matching a specific string /*{{{*/ +PackageSet PackageSet::FromString(pkgCacheFile &Cache, std::string const &str, std::ostream &out) { + std::string pkg = str; + size_t archfound = pkg.find_last_of(':'); + std::string arch; + if (archfound != std::string::npos) { + arch = pkg.substr(archfound+1); + pkg.erase(archfound); + } + + pkgCache::PkgIterator Pkg; + if (arch.empty() == true) { + pkgCache::GrpIterator Grp = Cache.GetPkgCache()->FindGrp(pkg); + if (Grp.end() == false) + Pkg = Grp.FindPreferredPkg(); + } else + Pkg = Cache.GetPkgCache()->FindPkg(pkg, arch); + + if (Pkg.end() == false) { + PackageSet pkgset; + pkgset.insert(Pkg); + return pkgset; + } + PackageSet regex = FromRegEx(Cache, str, out); + if (regex.empty() == true) + _error->Warning(_("Unable to locate package %s"), str.c_str()); + return regex; +} + /*}}}*/ +// GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ +std::map<unsigned short, VersionSet> VersionSet::GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list<VersionSet::Modifier> const &mods, + unsigned short const &fallback, std::ostream &out) { + std::map<unsigned short, VersionSet> versets; + for (const char **I = cmdline; *I != 0; ++I) { + unsigned short modID = fallback; + VersionSet::Version select = VersionSet::NEWEST; + std::string str = *I; + for (std::list<VersionSet::Modifier>::const_iterator mod = mods.begin(); + mod != mods.end(); ++mod) { + if (modID == fallback && mod->ID == fallback) + select = mod->SelectVersion; + size_t const alength = strlen(mod->Alias); + switch(mod->Pos) { + case VersionSet::Modifier::POSTFIX: + if (str.compare(str.length() - alength, alength, + mod->Alias, 0, alength) != 0) + continue; + str.erase(str.length() - alength); + modID = mod->ID; + select = mod->SelectVersion; + break; + case VersionSet::Modifier::PREFIX: + continue; + case VersionSet::Modifier::NONE: + continue; + } + break; + } + VersionSet vset = VersionSet::FromString(Cache, str, select , out); + versets[modID].insert(vset.begin(), vset.end()); + } + return versets; +} + /*}}}*/ +// FromCommandLine - Return all versions specified on commandline /*{{{*/ +APT::VersionSet VersionSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, + APT::VersionSet::Version const &fallback, std::ostream &out) { + VersionSet verset; + for (const char **I = cmdline; *I != 0; ++I) { + VersionSet vset = VersionSet::FromString(Cache, *I, fallback, out); + verset.insert(vset.begin(), vset.end()); + } + return verset; +} + /*}}}*/ +// FromString - Returns all versions spedcified by a string /*{{{*/ +APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, + APT::VersionSet::Version const &fallback, std::ostream &out) { + std::string ver; + bool verIsRel = false; + size_t const vertag = pkg.find_last_of("/="); + if (vertag != string::npos) { + ver = pkg.substr(vertag+1); + verIsRel = (pkg[vertag] == '/'); + pkg.erase(vertag); + } + PackageSet pkgset = PackageSet::FromString(Cache, pkg.c_str(), out); + VersionSet verset; + for (PackageSet::const_iterator P = pkgset.begin(); + P != pkgset.end(); ++P) { + if (vertag == string::npos) { + AddSelectedVersion(Cache, verset, P, fallback); + continue; + } + pkgCache::VerIterator V; + if (ver == "installed") + V = getInstalledVer(Cache, P); + else if (ver == "candidate") + V = getCandidateVer(Cache, P); + else { + pkgVersionMatch Match(ver, (verIsRel == true ? pkgVersionMatch::Release : + pkgVersionMatch::Version)); + V = Match.Find(P); + if (V.end() == true) { + if (verIsRel == true) + _error->Error(_("Release '%s' for '%s' was not found"), + ver.c_str(), P.FullName(true).c_str()); + else + _error->Error(_("Version '%s' for '%s' was not found"), + ver.c_str(), P.FullName(true).c_str()); + continue; + } + } + if (V.end() == true) + continue; + if (ver == V.VerStr()) + ioprintf(out, _("Selected version '%s' (%s) for '%s'\n"), + V.VerStr(), V.RelStr().c_str(), P.FullName(true).c_str()); + verset.insert(V); + } + return verset; +} + /*}}}*/ +// AddSelectedVersion - add version from package based on fallback /*{{{*/ +bool VersionSet::AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset, + pkgCache::PkgIterator const &P, VersionSet::Version const &fallback, + bool const &AllowError) { + pkgCache::VerIterator V; + switch(fallback) { + case VersionSet::ALL: + if (P->VersionList != 0) + for (V = P.VersionList(); V.end() != true; ++V) + verset.insert(V); + else if (AllowError == false) + return _error->Error(_("Can't select versions from package '%s' as it purely virtual"), P.FullName(true).c_str()); + else + return false; + break; + case VersionSet::CANDANDINST: + verset.insert(getInstalledVer(Cache, P, AllowError)); + verset.insert(getCandidateVer(Cache, P, AllowError)); + break; + case VersionSet::CANDIDATE: + verset.insert(getCandidateVer(Cache, P, AllowError)); + break; + case VersionSet::INSTALLED: + verset.insert(getInstalledVer(Cache, P, AllowError)); + break; + case VersionSet::CANDINST: + V = getCandidateVer(Cache, P, true); + if (V.end() == true) + V = getInstalledVer(Cache, P, true); + if (V.end() == false) + verset.insert(V); + else if (AllowError == false) + return _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), P.FullName(true).c_str()); + else + return false; + break; + case VersionSet::INSTCAND: + V = getInstalledVer(Cache, P, true); + if (V.end() == true) + V = getCandidateVer(Cache, P, true); + if (V.end() == false) + verset.insert(V); + else if (AllowError == false) + return _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), P.FullName(true).c_str()); + else + return false; + break; + case VersionSet::NEWEST: + if (P->VersionList != 0) + verset.insert(P.VersionList()); + else if (AllowError == false) + return _error->Error(_("Can't select newest version from package '%s' as it is purely virtual"), P.FullName(true).c_str()); + else + return false; + break; + } + return true; +} + /*}}}*/ +// getCandidateVer - Returns the candidate version of the given package /*{{{*/ +pkgCache::VerIterator VersionSet::getCandidateVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg, bool const &AllowError) { + pkgCache::VerIterator Cand; + if (Cache.IsDepCacheBuilt() == true) + Cand = Cache[Pkg].CandidateVerIter(Cache); + else { + if (unlikely(Cache.BuildPolicy() == false)) + return pkgCache::VerIterator(*Cache); + Cand = Cache.GetPolicy()->GetCandidateVer(Pkg); + } + if (AllowError == false && Cand.end() == true) + _error->Error(_("Can't select candidate version from package %s as it has no candidate"), Pkg.FullName(true).c_str()); + return Cand; +} + /*}}}*/ +// getInstalledVer - Returns the installed version of the given package /*{{{*/ +pkgCache::VerIterator VersionSet::getInstalledVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg, bool const &AllowError) { + if (AllowError == false && Pkg->CurrentVer == 0) + _error->Error(_("Can't select installed version from package %s as it is not installed"), Pkg.FullName(true).c_str()); + return Pkg.CurrentVer(); +} + /*}}}*/ +} diff --git a/cmdline/cacheset.h b/cmdline/cacheset.h new file mode 100644 index 000000000..2bc268380 --- /dev/null +++ b/cmdline/cacheset.h @@ -0,0 +1,274 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +/** \file cacheset.h + Wrappers around std::set to have set::iterators which behave + similar to the Iterators of the cache structures. + + Provides also a few helper methods which work with these sets */ + /*}}}*/ +#ifndef APT_CACHESET_H +#define APT_CACHESET_H +// Include Files /*{{{*/ +#include <iostream> +#include <fstream> +#include <list> +#include <map> +#include <set> +#include <string> + +#include <apt-pkg/cachefile.h> +#include <apt-pkg/pkgcache.h> + /*}}}*/ +namespace APT { +class PackageSet : public std::set<pkgCache::PkgIterator> { /*{{{*/ +/** \class APT::PackageSet + + Simple wrapper around a std::set to provide a similar interface to + a set of packages as to the complete set of all packages in the + pkgCache. */ +public: /*{{{*/ + /** \brief smell like a pkgCache::PkgIterator */ + class const_iterator : public std::set<pkgCache::PkgIterator>::const_iterator { + public: + const_iterator(std::set<pkgCache::PkgIterator>::const_iterator x) : + std::set<pkgCache::PkgIterator>::const_iterator(x) {} + + operator pkgCache::PkgIterator(void) { return **this; } + + inline const char *Name() const {return (**this).Name(); } + inline std::string FullName(bool const &Pretty) const { return (**this).FullName(Pretty); } + inline std::string FullName() const { return (**this).FullName(); } + inline const char *Section() const {return (**this).Section(); } + inline bool Purge() const {return (**this).Purge(); } + inline const char *Arch() const {return (**this).Arch(); } + inline pkgCache::GrpIterator Group() const { return (**this).Group(); } + inline pkgCache::VerIterator VersionList() const { return (**this).VersionList(); } + inline pkgCache::VerIterator CurrentVer() const { return (**this).CurrentVer(); } + inline pkgCache::DepIterator RevDependsList() const { return (**this).RevDependsList(); } + inline pkgCache::PrvIterator ProvidesList() const { return (**this).ProvidesList(); } + inline pkgCache::PkgIterator::OkState State() const { return (**this).State(); } + inline const char *CandVersion() const { return (**this).CandVersion(); } + inline const char *CurVersion() const { return (**this).CurVersion(); } + inline pkgCache *Cache() const { return (**this).Cache(); }; + inline unsigned long Index() const {return (**this).Index();}; + // we have only valid iterators here + inline bool end() const { return false; }; + + friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, (*i)); } + + inline pkgCache::Package const * operator->() const { + return &***this; + }; + }; + // 103. set::iterator is required to be modifiable, but this allows modification of keys + typedef APT::PackageSet::const_iterator iterator; + + using std::set<pkgCache::PkgIterator>::insert; + inline void insert(pkgCache::PkgIterator const &P) { if (P.end() == false) std::set<pkgCache::PkgIterator>::insert(P); }; + + /** \brief returns all packages in the cache whose name matchs a given pattern + + A simple helper responsible for executing a regular expression on all + package names in the cache. Optional it prints a a notice about the + packages chosen cause of the given package. + \param Cache the packages are in + \param pattern regular expression for package names + \param out stream to print the notice to */ + static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string pattern, std::ostream &out); + static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string const &pattern) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::PackageSet::FromRegEx(Cache, pattern, out); + } + + /** \brief returns all packages specified by a string + + \param Cache the packages are in + \param string String the package name(s) should be extracted from + \param out stream to print various notices to */ + static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string, std::ostream &out); + static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::PackageSet::FromString(Cache, string, out); + } + + /** \brief returns all packages specified on the commandline + + Get all package names from the commandline and executes regex's if needed. + No special package command is supported, just plain names. + \param Cache the packages are in + \param cmdline Command line the package names should be extracted from + \param out stream to print various notices to */ + static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, std::ostream &out); + static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::PackageSet::FromCommandLine(Cache, cmdline, out); + } + + struct Modifier { + enum Position { NONE, PREFIX, POSTFIX }; + unsigned short ID; + const char * const Alias; + Position Pos; + Modifier (unsigned short const &id, const char * const alias, Position const &pos) : ID(id), Alias(alias), Pos(pos) {}; + }; + + static std::map<unsigned short, PackageSet> GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list<PackageSet::Modifier> const &mods, + unsigned short const &fallback, std::ostream &out); + static std::map<unsigned short, PackageSet> GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list<PackageSet::Modifier> const &mods, + unsigned short const &fallback) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::PackageSet::GroupedFromCommandLine(Cache, cmdline, + mods, fallback, out); + } + /*}}}*/ +}; /*}}}*/ +class VersionSet : public std::set<pkgCache::VerIterator> { /*{{{*/ +/** \class APT::VersionSet + + Simple wrapper around a std::set to provide a similar interface to + a set of versions as to the complete set of all versions in the + pkgCache. */ +public: /*{{{*/ + /** \brief smell like a pkgCache::VerIterator */ + class const_iterator : public std::set<pkgCache::VerIterator>::const_iterator { + public: + const_iterator(std::set<pkgCache::VerIterator>::const_iterator x) : + std::set<pkgCache::VerIterator>::const_iterator(x) {} + + operator pkgCache::VerIterator(void) { return **this; } + + inline pkgCache *Cache() const { return (**this).Cache(); }; + inline unsigned long Index() const {return (**this).Index();}; + // we have only valid iterators here + inline bool end() const { return false; }; + + inline pkgCache::Version const * operator->() const { + return &***this; + }; + + inline int CompareVer(const pkgCache::VerIterator &B) const { return (**this).CompareVer(B); }; + inline const char *VerStr() const { return (**this).VerStr(); }; + inline const char *Section() const { return (**this).Section(); }; + inline const char *Arch() const { return (**this).Arch(); }; + inline const char *Arch(bool const pseudo) const { return (**this).Arch(pseudo); }; + inline pkgCache::PkgIterator ParentPkg() const { return (**this).ParentPkg(); }; + inline pkgCache::DescIterator DescriptionList() const { return (**this).DescriptionList(); }; + inline pkgCache::DescIterator TranslatedDescription() const { return (**this).TranslatedDescription(); }; + inline pkgCache::DepIterator DependsList() const { return (**this).DependsList(); }; + inline pkgCache::PrvIterator ProvidesList() const { return (**this).ProvidesList(); }; + inline pkgCache::VerFileIterator FileList() const { return (**this).FileList(); }; + inline bool Downloadable() const { return (**this).Downloadable(); }; + inline const char *PriorityType() const { return (**this).PriorityType(); }; + inline string RelStr() const { return (**this).RelStr(); }; + inline bool Automatic() const { return (**this).Automatic(); }; + inline bool Pseudo() const { return (**this).Pseudo(); }; + inline pkgCache::VerFileIterator NewestFile() const { return (**this).NewestFile(); }; + }; + // 103. set::iterator is required to be modifiable, but this allows modification of keys + typedef APT::VersionSet::const_iterator iterator; + + using std::set<pkgCache::VerIterator>::insert; + inline void insert(pkgCache::VerIterator const &V) { if (V.end() == false) std::set<pkgCache::VerIterator>::insert(V); }; + + /** \brief specifies which version(s) will be returned if non is given */ + enum Version { + /** All versions */ + ALL, + /** Candidate and installed version */ + CANDANDINST, + /** Candidate version */ + CANDIDATE, + /** Installed version */ + INSTALLED, + /** Candidate or if non installed version */ + CANDINST, + /** Installed or if non candidate version */ + INSTCAND, + /** Newest version */ + NEWEST + }; + + /** \brief returns all versions specified on the commandline + + Get all versions from the commandline, uses given default version if + non specifically requested and executes regex's if needed on names. + \param Cache the packages and versions are in + \param cmdline Command line the versions should be extracted from + \param out stream to print various notices to */ + static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, + APT::VersionSet::Version const &fallback, std::ostream &out); + static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, + APT::VersionSet::Version const &fallback) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::VersionSet::FromCommandLine(Cache, cmdline, fallback, out); + } + static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { + return APT::VersionSet::FromCommandLine(Cache, cmdline, CANDINST); + } + + static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg, + APT::VersionSet::Version const &fallback, std::ostream &out); + static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg, + APT::VersionSet::Version const &fallback) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::VersionSet::FromString(Cache, pkg, fallback, out); + } + static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg) { + return APT::VersionSet::FromString(Cache, pkg, CANDINST); + } + + struct Modifier { + enum Position { NONE, PREFIX, POSTFIX }; + unsigned short ID; + const char * const Alias; + Position Pos; + VersionSet::Version SelectVersion; + Modifier (unsigned short const &id, const char * const alias, Position const &pos, + VersionSet::Version const &select) : ID(id), Alias(alias), Pos(pos), + SelectVersion(select) {}; + }; + + static std::map<unsigned short, VersionSet> GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list<VersionSet::Modifier> const &mods, + unsigned short const &fallback, std::ostream &out); + static std::map<unsigned short, VersionSet> GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list<VersionSet::Modifier> const &mods, + unsigned short const &fallback) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::VersionSet::GroupedFromCommandLine(Cache, cmdline, + mods, fallback, out); + } + /*}}}*/ +protected: /*{{{*/ + + /** \brief returns the candidate version of the package + + \param Cache to be used to query for information + \param Pkg we want the candidate version from this package + \param AllowError add an error to the stack if not */ + static pkgCache::VerIterator getCandidateVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg, bool const &AllowError = false); + + /** \brief returns the installed version of the package + + \param Cache to be used to query for information + \param Pkg we want the installed version from this package + \param AllowError add an error to the stack if not */ + static pkgCache::VerIterator getInstalledVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg, bool const &AllowError = false); + + + static bool AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset, + pkgCache::PkgIterator const &P, VersionSet::Version const &fallback, + bool const &AllowError = false); + + /*}}}*/ +}; /*}}}*/ +} +#endif diff --git a/cmdline/makefile b/cmdline/makefile index 917ccc96a..4ffe49ee0 100644 --- a/cmdline/makefile +++ b/cmdline/makefile @@ -9,14 +9,14 @@ include ../buildlib/defaults.mak PROGRAM=apt-cache SLIBS = -lapt-pkg $(INTLLIBS) LIB_MAKES = apt-pkg/makefile -SOURCE = apt-cache.cc +SOURCE = apt-cache.cc cacheset.cc include $(PROGRAM_H) # The apt-get program PROGRAM=apt-get SLIBS = -lapt-pkg -lutil $(INTLLIBS) LIB_MAKES = apt-pkg/makefile -SOURCE = apt-get.cc acqprogress.cc +SOURCE = apt-get.cc acqprogress.cc cacheset.cc include $(PROGRAM_H) # The apt-config program diff --git a/debian/changelog b/debian/changelog index f2a18d397..2648730ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low - * apt-pkg/cacheset.cc: + * cmdline/cacheset.cc: + - doesn't include it in the library for now as it is too volatile - get the candidate either from an already built depcache or use the policy which is a bit faster than depcache generation * apt-pkg/orderlist.cc: -- cgit v1.2.3 From 8ceeb9d695f7c8fc5d856aa4f8647e88c4a8659f Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 16 Jun 2010 17:19:21 +0200 Subject: add a simple method to VerIterator to check if two Versions are similar --- apt-pkg/cacheiterators.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index f0b40dbb5..51bf6819e 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -30,6 +30,8 @@ #ifndef PKGLIB_CACHEITERATORS_H #define PKGLIB_CACHEITERATORS_H #include<iterator> + +#include<string.h> // abstract Iterator template /*{{{*/ /* This template provides the very basic iterator methods we need to have for doing some walk-over-the-cache magic */ @@ -183,6 +185,13 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> { // Comparison int CompareVer(const VerIterator &B) const; + /** \brief compares two version and returns if they are similar + + This method should be used to identify if two pseudo versions are + refering to the same "real" version */ + inline bool SimilarVer(const VerIterator &B) const { + return (B.end() == false && S->Hash == B->Hash && strcmp(VerStr(), B.VerStr()) == 0); + }; // Accessors inline const char *VerStr() const {return S->VerStr == 0?0:Owner->StrP + S->VerStr;}; -- cgit v1.2.3 From 1019948cea2e6adbd4b0df3f07b52c90187b1a05 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 16 Jun 2010 17:48:37 +0200 Subject: * apt-pkg/depcache.cc: - SetCandidateVer for all pseudo packages - SetReInstall for the "all" package of a pseudo package --- apt-pkg/depcache.cc | 32 +++++++++++++++++++++++++++++++- apt-pkg/depcache.h | 2 +- debian/changelog | 3 +++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 3ae5f5953..d082b8404 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1453,6 +1453,9 @@ bool pkgDepCache::IsInstallOk(PkgIterator const &Pkg,bool AutoInst, /* */ void pkgDepCache::SetReInstall(PkgIterator const &Pkg,bool To) { + if (unlikely(Pkg.end() == true)) + return; + ActionGroup group(*this); RemoveSizes(Pkg); @@ -1466,12 +1469,17 @@ void pkgDepCache::SetReInstall(PkgIterator const &Pkg,bool To) AddStates(Pkg); AddSizes(Pkg); + + if (unlikely(Pkg.CurrentVer().end() == true) || Pkg.CurrentVer().Pseudo() == false) + return; + + SetReInstall(Pkg.Group().FindPkg("all"), To); } /*}}}*/ // DepCache::SetCandidateVersion - Change the candidate version /*{{{*/ // --------------------------------------------------------------------- /* */ -void pkgDepCache::SetCandidateVersion(VerIterator TargetVer) +void pkgDepCache::SetCandidateVersion(VerIterator TargetVer, bool const &Pseudo) { ActionGroup group(*this); @@ -1489,6 +1497,28 @@ void pkgDepCache::SetCandidateVersion(VerIterator TargetVer) AddStates(Pkg); Update(Pkg); AddSizes(Pkg); + + if (TargetVer.Pseudo() == false || Pseudo == false) + return; + + // the version was pseudo: set all other pseudos also + pkgCache::GrpIterator Grp = Pkg.Group(); + for (Pkg = Grp.FindPkg("any"); Pkg.end() == false; ++Pkg) + { + StateCache &P = PkgState[Pkg->ID]; + if (TargetVer.SimilarVer(P.CandidateVerIter(*this)) == true || + (P.CandidateVerIter(*this).Pseudo() == false && + strcmp(Pkg.Arch(), "all") != 0)) + continue; + + for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; ++Ver) + { + if (TargetVer.SimilarVer(Ver) == false) + continue; + SetCandidateVersion(Ver, false); + break; + } + } } void pkgDepCache::MarkAuto(const PkgIterator &Pkg, bool Auto) diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index c6f245a80..72d7cce5d 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -405,7 +405,7 @@ class pkgDepCache : protected pkgCache::Namespace bool ForceImportantDeps = false); void SetReInstall(PkgIterator const &Pkg,bool To); - void SetCandidateVersion(VerIterator TargetVer); + void SetCandidateVersion(VerIterator TargetVer, bool const &Pseudo = true); /** Set the "is automatically installed" flag of Pkg. */ void MarkAuto(const PkgIterator &Pkg, bool Auto); diff --git a/debian/changelog b/debian/changelog index 2648730ec..4de21d343 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low - packages that are not touched doesn't need to be unpacked * debian/control: - remove intltool's dependency as it is an ubuntu artefact + * apt-pkg/depcache.cc: + - SetCandidateVer for all pseudo packages + - SetReInstall for the "all" package of a pseudo package -- David Kalnischkies <kalnischkies@gmail.com> Thu, 10 Jun 2010 16:36:58 +0200 -- cgit v1.2.3 From 8d60bef0c235f86772686df1499ae5e9593437e2 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 17 Jun 2010 11:17:13 +0200 Subject: test-indexes.sh: More verbose failures on wrong/missing indexes --- test/test-indexes.sh | 53 +++++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/test/test-indexes.sh b/test/test-indexes.sh index 58b9cff72..d79e9e7e4 100755 --- a/test/test-indexes.sh +++ b/test/test-indexes.sh @@ -27,6 +27,28 @@ APT_CACHE="$BUILDDIR/bin/apt-cache $OPTS $DEBUG" exit 1 } +# if $1 == "compressed", check that we have compressed indexes, otherwise +# uncompressed ones +check_indexes() { + local F + if [ "$1" = "compressed" ]; then + ! test -e var/lib/apt/lists/*_Packages || F=1 + ! test -e var/lib/apt/lists/*_Sources || F=1 + test -e var/lib/apt/lists/*_Packages.gz || F=1 + test -e var/lib/apt/lists/*_Sources.gz || F=1 + else + test -e var/lib/apt/lists/*_Packages || F=1 + test -e var/lib/apt/lists/*_Sources || F=1 + ! test -e var/lib/apt/lists/*_Packages.gz || F=1 + ! test -e var/lib/apt/lists/*_Sources.gz || F=1 + fi + + if [ -n "$F" ]; then + ls -l var/lib/apt/lists/ + exit 1 + fi +} + echo "---- building sandbox----" WORKDIR=$(mktemp -d) trap "cd /; rm -rf $WORKDIR" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM @@ -49,11 +71,7 @@ key=$(echo "$out" | sed -n '/NO_PUBKEY/ { s/^.*NO_PUBKEY \([[:alnum:]]\+\)$/\1/; # get keyring gpg --no-options --no-default-keyring --secret-keyring etc/apt/secring.gpg --trustdb-name etc/apt/trustdb.gpg --keyring etc/apt/trusted.gpg --primary-keyring etc/apt/trusted.gpg --keyserver $GPG_KEYSERVER --recv-keys $key $APT_GET update - -test -e var/lib/apt/lists/*_Packages -test -e var/lib/apt/lists/*_Sources -! test -e var/lib/apt/lists/*_Packages.gz -! test -e var/lib/apt/lists/*_Sources.gz +check_indexes echo "---- uncompressed cache ----" $APT_CACHE show $TEST_PKG | grep -q ^Version: @@ -84,25 +102,16 @@ rm -r $TEST_SRC* echo "----- uncompressed update with preexisting indexes, no pdiff ----" $APT_GET -o Acquire::PDiffs=false update -test -e var/lib/apt/lists/*_Packages -test -e var/lib/apt/lists/*_Sources -! test -e var/lib/apt/lists/*_Packages.gz -! test -e var/lib/apt/lists/*_Sources.gz +check_indexes echo "----- uncompressed update with preexisting indexes, with pdiff ----" $APT_GET -o Acquire::PDiffs=true update -test -e var/lib/apt/lists/*_Packages -test -e var/lib/apt/lists/*_Sources -! test -e var/lib/apt/lists/*_Packages.gz -! test -e var/lib/apt/lists/*_Sources.gz +check_indexes echo "----- compressed update ----" find var/lib/apt/lists/ -type f | xargs -r rm $APT_GET -o Acquire::GzipIndexes=true update -! test -e var/lib/apt/lists/*_Packages -! test -e var/lib/apt/lists/*_Sources -test -e var/lib/apt/lists/*_Packages.gz -test -e var/lib/apt/lists/*_Sources.gz +check_indexes compressed echo "---- compressed cache ----" $APT_CACHE show $TEST_PKG | grep -q ^Version: @@ -131,16 +140,10 @@ rm -r $TEST_SRC* echo "----- compressed update with preexisting indexes, no pdiff ----" $APT_GET -o Acquire::PDiffs=false -o Acquire::GzipIndexes=true update -! test -e var/lib/apt/lists/*_Packages -! test -e var/lib/apt/lists/*_Sources -test -e var/lib/apt/lists/*_Packages.gz -test -e var/lib/apt/lists/*_Sources.gz +check_indexes compressed echo "----- compressed update with preexisting indexes, with pdiff ----" $APT_GET -o Acquire::PDiffs=true -o Acquire::GzipIndexes=true update -! test -e var/lib/apt/lists/*_Packages -! test -e var/lib/apt/lists/*_Sources -test -e var/lib/apt/lists/*_Packages.gz -test -e var/lib/apt/lists/*_Sources.gz +check_indexes compressed echo "---- ALL TESTS PASSED ----" -- cgit v1.2.3 From 2aab191f2a87d4d33a78d76e3c2978689c142190 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 17 Jun 2010 11:47:51 +0200 Subject: test-indexes.sh: Refactor common code into functions --- test/test-indexes.sh | 155 +++++++++++++++++++++++++++------------------------ 1 file changed, 81 insertions(+), 74 deletions(-) diff --git a/test/test-indexes.sh b/test/test-indexes.sh index d79e9e7e4..fdc1a698a 100755 --- a/test/test-indexes.sh +++ b/test/test-indexes.sh @@ -15,7 +15,7 @@ TEST_PKG="python-psyco-doc" export LD_LIBRARY_PATH=$BUILDDIR/bin -OPTS="-o RootDir=. -o Dir::Bin::Methods=$BUILDDIR/bin/methods -o Debug::NoLocking=true" +OPTS="-qq -o RootDir=. -o Dir::Bin::Methods=$BUILDDIR/bin/methods -o Debug::NoLocking=true" DEBUG="" #DEBUG="-o Debug::pkgCacheGen=true" #DEBUG="-o Debug::pkgAcquire=true" @@ -27,9 +27,25 @@ APT_CACHE="$BUILDDIR/bin/apt-cache $OPTS $DEBUG" exit 1 } +check_update() { + echo "--- apt-get update $@ (no trusted keys)" + + rm -f etc/apt/trusted.gpg etc/apt/secring.gpg + touch etc/apt/trusted.gpg etc/apt/secring.gpg + out=$($APT_GET "$@" update 2>&1) + echo "$out" | grep -q NO_PUBKEY + key=$(echo "$out" | sed -n '/NO_PUBKEY/ { s/^.*NO_PUBKEY \([[:alnum:]]\+\)$/\1/; p}') + # get keyring + gpg -q --no-options --no-default-keyring --secret-keyring etc/apt/secring.gpg --trustdb-name etc/apt/trustdb.gpg --keyring etc/apt/trusted.gpg --primary-keyring etc/apt/trusted.gpg --keyserver $GPG_KEYSERVER --recv-keys $key + + echo "--- apt-get update $@ (with trusted keys)" + $APT_GET "$@" update +} + # if $1 == "compressed", check that we have compressed indexes, otherwise # uncompressed ones check_indexes() { + echo "--- only ${1:-uncompressed} index files present" local F if [ "$1" = "compressed" ]; then ! test -e var/lib/apt/lists/*_Packages || F=1 @@ -44,12 +60,54 @@ check_indexes() { fi if [ -n "$F" ]; then - ls -l var/lib/apt/lists/ + ls -laR var/lib/apt/lists/ exit 1 fi } -echo "---- building sandbox----" +# test apt-cache commands +check_cache() { + echo "--- apt-cache commands" + + $APT_CACHE show $TEST_PKG | grep -q ^Version: + # again (with cache) + $APT_CACHE show $TEST_PKG | grep -q ^Version: + rm var/cache/apt/*.bin + $APT_CACHE policy $TEST_PKG | grep -q '500 http://' + # again (with cache) + $APT_CACHE policy $TEST_PKG | grep -q '500 http://' + + TEST_SRC=`$APT_CACHE show $TEST_PKG | grep ^Source: | awk '{print $2}'` + rm var/cache/apt/*.bin + $APT_CACHE showsrc $TEST_SRC | grep -q ^Binary: + # again (with cache) + $APT_CACHE showsrc $TEST_SRC | grep -q ^Binary: +} + +# test apt-get install +check_install() { + echo "--- apt-get install" + + $APT_GET install -d $TEST_PKG + test -e var/cache/apt/archives/$TEST_PKG*.deb + $APT_GET clean + ! test -e var/cache/apt/archives/$TEST_PKG*.deb +} + +# test apt-get source +check_get_source() { + echo "--- apt-get source" + $APT_GET source $TEST_PKG + test -f $TEST_SRC_*.dsc + test -d $TEST_SRC-* + rm -r $TEST_SRC* +} + +############################################################################ +# main +############################################################################ + +echo "===== building sandbox =====" WORKDIR=$(mktemp -d) trap "cd /; rm -rf $WORKDIR" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM cd $WORKDIR @@ -63,87 +121,36 @@ touch var/lib/dpkg/status echo "deb $TEST_SOURCE" > etc/apt/sources.list echo "deb-src $TEST_SOURCE" >> etc/apt/sources.list -echo "---- uncompressed update ----" +echo "===== uncompressed indexes =====" # first attempt should fail, no trusted GPG key -out=$($APT_GET update 2>&1) -echo "$out" | grep -q NO_PUBKEY -key=$(echo "$out" | sed -n '/NO_PUBKEY/ { s/^.*NO_PUBKEY \([[:alnum:]]\+\)$/\1/; p}') -# get keyring -gpg --no-options --no-default-keyring --secret-keyring etc/apt/secring.gpg --trustdb-name etc/apt/trustdb.gpg --keyring etc/apt/trusted.gpg --primary-keyring etc/apt/trusted.gpg --keyserver $GPG_KEYSERVER --recv-keys $key -$APT_GET update +check_update check_indexes +check_cache +check_install +check_get_source -echo "---- uncompressed cache ----" -$APT_CACHE show $TEST_PKG | grep -q ^Version: -# again (with cache) -$APT_CACHE show $TEST_PKG | grep -q ^Version: -rm var/cache/apt/*.bin -$APT_CACHE policy $TEST_PKG | grep -q '500 http://' -# again (with cache) -$APT_CACHE policy $TEST_PKG | grep -q '500 http://' - -TEST_SRC=`$APT_CACHE show $TEST_PKG | grep ^Source: | awk '{print $2}'` -rm var/cache/apt/*.bin -$APT_CACHE showsrc $TEST_SRC | grep -q ^Binary: -# again (with cache) -$APT_CACHE showsrc $TEST_SRC | grep -q ^Binary: - -echo "---- uncompressed install ----" -$APT_GET install -d $TEST_PKG -test -e var/cache/apt/archives/$TEST_PKG*.deb -$APT_GET clean -! test -e var/cache/apt/archives/$TEST_PKG*.deb - -echo "---- uncompressed get source ----" -$APT_GET source $TEST_PKG -test -f $TEST_SRC_*.dsc -test -d $TEST_SRC-* -rm -r $TEST_SRC* - -echo "----- uncompressed update with preexisting indexes, no pdiff ----" -$APT_GET -o Acquire::PDiffs=false update +echo "--- apt-get update with preexisting indexes" +$APT_GET update check_indexes -echo "----- uncompressed update with preexisting indexes, with pdiff ----" +echo "--- apt-get update with preexisting indexes and pdiff mode" $APT_GET -o Acquire::PDiffs=true update check_indexes -echo "----- compressed update ----" +echo "===== compressed indexes =====" find var/lib/apt/lists/ -type f | xargs -r rm -$APT_GET -o Acquire::GzipIndexes=true update +check_update -o Acquire::GzipIndexes=true check_indexes compressed +check_cache +check_install +check_get_source -echo "---- compressed cache ----" -$APT_CACHE show $TEST_PKG | grep -q ^Version: -# again (with cache) -$APT_CACHE show $TEST_PKG | grep -q ^Version: -rm var/cache/apt/*.bin -$APT_CACHE policy $TEST_PKG | grep -q '500 http://' -# again (with cache) -$APT_CACHE policy $TEST_PKG | grep -q '500 http://' - -TEST_SRC=`$APT_CACHE show $TEST_PKG | grep ^Source: | awk '{print $2}'` -rm var/cache/apt/*.bin -$APT_CACHE showsrc $TEST_SRC | grep -q ^Binary: -# again (with cache) -$APT_CACHE showsrc $TEST_SRC | grep -q ^Binary: - -echo "---- compressed install ----" -$APT_GET install -d $TEST_PKG -! test -e var/cache/apt/archives/$TEST_PKG*.deb - -echo "---- compressed get source ----" -$APT_GET source $TEST_PKG -test -f $TEST_SRC_*.dsc -test -d $TEST_SRC-* -rm -r $TEST_SRC* - -echo "----- compressed update with preexisting indexes, no pdiff ----" -$APT_GET -o Acquire::PDiffs=false -o Acquire::GzipIndexes=true update -check_indexes compressed +echo "--- apt-get update with preexisting indexes" +check_update -o Acquire::GzipIndexes=true +check_indexes -echo "----- compressed update with preexisting indexes, with pdiff ----" -$APT_GET -o Acquire::PDiffs=true -o Acquire::GzipIndexes=true update -check_indexes compressed +echo "--- apt-get update with preexisting indexes and pdiff mode" +check_update -o Acquire::GzipIndexes=true -o Acquire::PDiffs=true update +check_indexes -echo "---- ALL TESTS PASSED ----" +echo "===== ALL TESTS PASSED =====" -- cgit v1.2.3 From 81563bc11a6491b85d55dbefa9f25f8035ab187e Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 17 Jun 2010 12:18:54 +0200 Subject: test-indexes: Use /etc/apt from temporary work dir, not from system --- test/test-indexes.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/test/test-indexes.sh b/test/test-indexes.sh index fdc1a698a..452b0cc7a 100755 --- a/test/test-indexes.sh +++ b/test/test-indexes.sh @@ -15,7 +15,7 @@ TEST_PKG="python-psyco-doc" export LD_LIBRARY_PATH=$BUILDDIR/bin -OPTS="-qq -o RootDir=. -o Dir::Bin::Methods=$BUILDDIR/bin/methods -o Debug::NoLocking=true" +OPTS="-qq -o Dir::Bin::Methods=$BUILDDIR/bin/methods -o Debug::NoLocking=true" DEBUG="" #DEBUG="-o Debug::pkgCacheGen=true" #DEBUG="-o Debug::pkgAcquire=true" @@ -115,12 +115,18 @@ cd $WORKDIR rm -fr etc var rm -f home ln -s /home home -mkdir -p etc/apt/preferences.d etc/apt/trusted.gpg.d var/cache/apt/archives/partial var/lib/apt/lists/partial var/lib/dpkg +mkdir -p etc/apt/preferences.d etc/apt/trusted.gpg.d etc/apt/apt.conf.d var/cache/apt/archives/partial var/lib/apt/lists/partial var/lib/dpkg cp /etc/apt/trusted.gpg etc/apt touch var/lib/dpkg/status echo "deb $TEST_SOURCE" > etc/apt/sources.list echo "deb-src $TEST_SOURCE" >> etc/apt/sources.list +# specifying -o RootDir at the command line does not work for +# etc/apt/apt.conf.d/ since it is parsed after pkgInitConfig(); $APT_CONFIG is +# checked first, so this works +echo 'RootDir ".";' > apt_config +export APT_CONFIG=`pwd`/apt_config + echo "===== uncompressed indexes =====" # first attempt should fail, no trusted GPG key check_update -- cgit v1.2.3 From 08abac551a4bd4a26be4935d6f0707855f166da0 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 17 Jun 2010 13:18:19 +0200 Subject: test-indexes.sh: Actually test for non/pre-existing indexes in compressed mode --- test/test-indexes.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/test-indexes.sh b/test/test-indexes.sh index 452b0cc7a..514e82534 100755 --- a/test/test-indexes.sh +++ b/test/test-indexes.sh @@ -32,6 +32,7 @@ check_update() { rm -f etc/apt/trusted.gpg etc/apt/secring.gpg touch etc/apt/trusted.gpg etc/apt/secring.gpg + find var/lib/apt/lists/ -type f | xargs -r rm out=$($APT_GET "$@" update 2>&1) echo "$out" | grep -q NO_PUBKEY key=$(echo "$out" | sed -n '/NO_PUBKEY/ { s/^.*NO_PUBKEY \([[:alnum:]]\+\)$/\1/; p}') @@ -39,6 +40,7 @@ check_update() { gpg -q --no-options --no-default-keyring --secret-keyring etc/apt/secring.gpg --trustdb-name etc/apt/trustdb.gpg --keyring etc/apt/trusted.gpg --primary-keyring etc/apt/trusted.gpg --keyserver $GPG_KEYSERVER --recv-keys $key echo "--- apt-get update $@ (with trusted keys)" + find var/lib/apt/lists/ -type f | xargs -r rm $APT_GET "$@" update } @@ -144,7 +146,6 @@ $APT_GET -o Acquire::PDiffs=true update check_indexes echo "===== compressed indexes =====" -find var/lib/apt/lists/ -type f | xargs -r rm check_update -o Acquire::GzipIndexes=true check_indexes compressed check_cache @@ -152,11 +153,11 @@ check_install check_get_source echo "--- apt-get update with preexisting indexes" -check_update -o Acquire::GzipIndexes=true +$APT_GET -o Acquire::GzipIndexes=true update check_indexes echo "--- apt-get update with preexisting indexes and pdiff mode" -check_update -o Acquire::GzipIndexes=true -o Acquire::PDiffs=true update +$APT_GET -o Acquire::GzipIndexes=true -o Acquire::PDiffs=true update check_indexes echo "===== ALL TESTS PASSED =====" -- cgit v1.2.3 From 321798bedb529edf914f2c884e4d38363c908315 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 17 Jun 2010 13:35:23 +0200 Subject: test-indexes.sh: fix check_indexes call in compressed mode --- test/test-indexes.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test-indexes.sh b/test/test-indexes.sh index 514e82534..2c6ccfedf 100755 --- a/test/test-indexes.sh +++ b/test/test-indexes.sh @@ -154,10 +154,10 @@ check_get_source echo "--- apt-get update with preexisting indexes" $APT_GET -o Acquire::GzipIndexes=true update -check_indexes +check_indexes compressed echo "--- apt-get update with preexisting indexes and pdiff mode" $APT_GET -o Acquire::GzipIndexes=true -o Acquire::PDiffs=true update -check_indexes +check_indexes compressed echo "===== ALL TESTS PASSED =====" -- cgit v1.2.3 From 0b9032b180763ec974cdc918f93910540f05293a Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 17 Jun 2010 13:36:52 +0200 Subject: pkgAcqIndex::Done(): If we have an IMS-Hit, also rename the destination file in GzipIndexes mode, to avoid it being cleaned --- apt-pkg/acquire-item.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index bcfe6a98a..fe81ee791 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -739,16 +739,21 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash, ErrorText = "Method gave a blank filename"; } + string compExt = flExtension(flNotDir(URI(Desc.URI).Path)); + // The files timestamp matches - if (StringToBool(LookupTag(Message,"IMS-Hit"),false) == true) + if (StringToBool(LookupTag(Message,"IMS-Hit"),false) == true) { + if (_config->FindB("Acquire::GzipIndexes",false) && compExt == "gz") + // Update DestFile for .gz suffix so that the clean operation keeps it + DestFile += ".gz"; return; + } if (FileName == DestFile) Erase = true; else Local = true; - string compExt = flExtension(flNotDir(URI(Desc.URI).Path)); string decompProg; // If we enable compressed indexes and already have gzip, keep it -- cgit v1.2.3 From eee5ab3cb4a20a26468e6a0dc78ca0706b2b4ec6 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 17 Jun 2010 13:38:42 +0200 Subject: test-indexes.sh: Just for paranoia, test that apt-cache is still working after apt-get update with previously existing indexes --- test/test-indexes.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/test-indexes.sh b/test/test-indexes.sh index 2c6ccfedf..84413d2dd 100755 --- a/test/test-indexes.sh +++ b/test/test-indexes.sh @@ -140,10 +140,12 @@ check_get_source echo "--- apt-get update with preexisting indexes" $APT_GET update check_indexes +check_cache echo "--- apt-get update with preexisting indexes and pdiff mode" $APT_GET -o Acquire::PDiffs=true update check_indexes +check_cache echo "===== compressed indexes =====" check_update -o Acquire::GzipIndexes=true @@ -155,9 +157,11 @@ check_get_source echo "--- apt-get update with preexisting indexes" $APT_GET -o Acquire::GzipIndexes=true update check_indexes compressed +check_cache echo "--- apt-get update with preexisting indexes and pdiff mode" $APT_GET -o Acquire::GzipIndexes=true -o Acquire::PDiffs=true update check_indexes compressed +check_cache echo "===== ALL TESTS PASSED =====" -- cgit v1.2.3 From 0311890f60a1075222acf066a6405cb452b475d0 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 17 Jun 2010 13:41:48 +0200 Subject: test-indexes.sh: Also test compressed index mode with apt.conf.d file --- test/test-indexes.sh | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/test/test-indexes.sh b/test/test-indexes.sh index 84413d2dd..ce2c36481 100755 --- a/test/test-indexes.sh +++ b/test/test-indexes.sh @@ -33,12 +33,16 @@ check_update() { rm -f etc/apt/trusted.gpg etc/apt/secring.gpg touch etc/apt/trusted.gpg etc/apt/secring.gpg find var/lib/apt/lists/ -type f | xargs -r rm + + # first attempt should fail, no trusted GPG key out=$($APT_GET "$@" update 2>&1) echo "$out" | grep -q NO_PUBKEY key=$(echo "$out" | sed -n '/NO_PUBKEY/ { s/^.*NO_PUBKEY \([[:alnum:]]\+\)$/\1/; p}') + # get keyring gpg -q --no-options --no-default-keyring --secret-keyring etc/apt/secring.gpg --trustdb-name etc/apt/trustdb.gpg --keyring etc/apt/trusted.gpg --primary-keyring etc/apt/trusted.gpg --keyserver $GPG_KEYSERVER --recv-keys $key + # now it should work echo "--- apt-get update $@ (with trusted keys)" find var/lib/apt/lists/ -type f | xargs -r rm $APT_GET "$@" update @@ -130,7 +134,6 @@ echo 'RootDir ".";' > apt_config export APT_CONFIG=`pwd`/apt_config echo "===== uncompressed indexes =====" -# first attempt should fail, no trusted GPG key check_update check_indexes check_cache @@ -147,7 +150,7 @@ $APT_GET -o Acquire::PDiffs=true update check_indexes check_cache -echo "===== compressed indexes =====" +echo "===== compressed indexes (CLI option) =====" check_update -o Acquire::GzipIndexes=true check_indexes compressed check_cache @@ -164,4 +167,26 @@ $APT_GET -o Acquire::GzipIndexes=true -o Acquire::PDiffs=true update check_indexes compressed check_cache +echo "===== compressed indexes (apt.conf.d option) =====" +cat <<EOF > etc/apt/apt.conf.d/02compress-indexes +Acquire::GzipIndexes "true"; +Acquire::CompressionTypes::Order:: "gz"; +EOF + +check_update +check_indexes compressed +check_cache +check_install +check_get_source + +echo "--- apt-get update with preexisting indexes" +$APT_GET update +check_indexes compressed +check_cache + +echo "--- apt-get update with preexisting indexes and pdiff mode" +$APT_GET -o Acquire::PDiffs=true update +check_indexes compressed +check_cache + echo "===== ALL TESTS PASSED =====" -- cgit v1.2.3 From 594bfe6a9f11e393469522fdea54444488d6f8a3 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 17 Jun 2010 13:58:39 +0200 Subject: test-indexes.sh: quiesce apt-get source; we know that we cannot verify package signatures --- test/test-indexes.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/test-indexes.sh b/test/test-indexes.sh index ce2c36481..916532183 100755 --- a/test/test-indexes.sh +++ b/test/test-indexes.sh @@ -103,7 +103,8 @@ check_install() { # test apt-get source check_get_source() { echo "--- apt-get source" - $APT_GET source $TEST_PKG + # quiesce: it'll complain about not being able to verify the signature + $APT_GET source $TEST_PKG >/dev/null 2>&1 test -f $TEST_SRC_*.dsc test -d $TEST_SRC-* rm -r $TEST_SRC* -- cgit v1.2.3 From a5de4117b60617ace639fb1e09e8903279185c2e Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 19 Jun 2010 09:13:33 +0200 Subject: fix the gcc warning about the initialisation order of variables caused by moving Policy to public again (and therefore after SrcList) --- apt-pkg/cachefile.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc index 01598386c..964c5bd8b 100644 --- a/apt-pkg/cachefile.cc +++ b/apt-pkg/cachefile.cc @@ -28,7 +28,7 @@ // --------------------------------------------------------------------- /* */ pkgCacheFile::pkgCacheFile() : Map(NULL), Cache(NULL), DCache(NULL), - Policy(NULL), SrcList(NULL) + SrcList(NULL), Policy(NULL) { } /*}}}*/ -- cgit v1.2.3 From dc0f01f7cbe2ed8ae6a1d2dbc0e00c19bb04679d Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 19 Jun 2010 11:49:38 +0200 Subject: get packages by task^ with FromTask() --- cmdline/cacheset.cc | 76 ++++++++++++++++++++++++++++++++++++++++++++++++----- cmdline/cacheset.h | 20 ++++++++++++-- debian/changelog | 1 + 3 files changed, 88 insertions(+), 9 deletions(-) diff --git a/cmdline/cacheset.cc b/cmdline/cacheset.cc index fde52168a..55ab26780 100644 --- a/cmdline/cacheset.cc +++ b/cmdline/cacheset.cc @@ -11,27 +11,83 @@ // Include Files /*{{{*/ #include <apt-pkg/aptconfiguration.h> #include <apt-pkg/error.h> -#include <apt-pkg/cacheset.h> #include <apt-pkg/strutl.h> #include <apt-pkg/versionmatch.h> #include <apti18n.h> +#include "cacheset.h" + #include <vector> #include <regex.h> /*}}}*/ namespace APT { +// FromTask - Return all packages in the cache from a specific task /*{{{*/ +PackageSet PackageSet::FromTask(pkgCacheFile &Cache, std::string pattern, std::ostream &out) { + PackageSet pkgset; + if (Cache.BuildCaches() == false || Cache.BuildDepCache() == false) + return pkgset; + + size_t archfound = pattern.find_last_of(':'); + std::string arch = "native"; + if (archfound != std::string::npos) { + arch = pattern.substr(archfound+1); + pattern.erase(archfound); + } + + if (pattern[pattern.length() -1] != '^') + return pkgset; + pattern.erase(pattern.length()-1); + + // get the records + pkgRecords Recs(Cache); + + // build regexp for the task + regex_t Pattern; + char S[300]; + snprintf(S, sizeof(S), "^Task:.*[, ]%s([, ]|$)", pattern.c_str()); + if(regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE) != 0) { + _error->Error("Failed to compile task regexp"); + return pkgset; + } + + for (pkgCache::GrpIterator Grp = Cache->GrpBegin(); Grp.end() == false; ++Grp) { + pkgCache::PkgIterator Pkg = Grp.FindPkg(arch); + if (Pkg.end() == true) + continue; + pkgCache::VerIterator ver = Cache[Pkg].CandidateVerIter(Cache); + if(ver.end() == true) + continue; + + pkgRecords::Parser &parser = Recs.Lookup(ver.FileList()); + const char *start, *end; + parser.GetRec(start,end); + unsigned int const length = end - start; + char buf[length]; + strncpy(buf, start, length); + buf[length-1] = '\0'; + if (regexec(&Pattern, buf, 0, 0, 0) == 0) + pkgset.insert(Pkg); + } + + if (pkgset.empty() == true) + _error->Error(_("Couldn't find task %s"), pattern.c_str()); + + regfree(&Pattern); + return pkgset; +} + /*}}}*/ // FromRegEx - Return all packages in the cache matching a pattern /*{{{*/ PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, std::ostream &out) { PackageSet pkgset; - std::string arch = "native"; static const char * const isregex = ".?+*|[^$"; if (pattern.find_first_of(isregex) == std::string::npos) return pkgset; size_t archfound = pattern.find_last_of(':'); + std::string arch = "native"; if (archfound != std::string::npos) { arch = pattern.substr(archfound+1); if (arch.find_first_of(isregex) == std::string::npos) @@ -142,10 +198,16 @@ PackageSet PackageSet::FromString(pkgCacheFile &Cache, std::string const &str, s pkgset.insert(Pkg); return pkgset; } - PackageSet regex = FromRegEx(Cache, str, out); - if (regex.empty() == true) - _error->Warning(_("Unable to locate package %s"), str.c_str()); - return regex; + PackageSet pset = FromTask(Cache, str, out); + if (pset.empty() == false) + return pset; + + pset = FromRegEx(Cache, str, out); + if (pset.empty() == false) + return pset; + + _error->Warning(_("Unable to locate package %s"), str.c_str()); + return pset; } /*}}}*/ // GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ @@ -236,7 +298,7 @@ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, } if (V.end() == true) continue; - if (ver == V.VerStr()) + if (ver != V.VerStr()) ioprintf(out, _("Selected version '%s' (%s) for '%s'\n"), V.VerStr(), V.RelStr().c_str(), P.FullName(true).c_str()); verset.insert(V); diff --git a/cmdline/cacheset.h b/cmdline/cacheset.h index 2bc268380..64a72e758 100644 --- a/cmdline/cacheset.h +++ b/cmdline/cacheset.h @@ -28,7 +28,7 @@ class PackageSet : public std::set<pkgCache::PkgIterator> { /*{{{*/ pkgCache. */ public: /*{{{*/ /** \brief smell like a pkgCache::PkgIterator */ - class const_iterator : public std::set<pkgCache::PkgIterator>::const_iterator { + class const_iterator : public std::set<pkgCache::PkgIterator>::const_iterator {/*{{{*/ public: const_iterator(std::set<pkgCache::PkgIterator>::const_iterator x) : std::set<pkgCache::PkgIterator>::const_iterator(x) {} @@ -62,10 +62,25 @@ public: /*{{{*/ }; // 103. set::iterator is required to be modifiable, but this allows modification of keys typedef APT::PackageSet::const_iterator iterator; + /*}}}*/ using std::set<pkgCache::PkgIterator>::insert; inline void insert(pkgCache::PkgIterator const &P) { if (P.end() == false) std::set<pkgCache::PkgIterator>::insert(P); }; + /** \brief returns all packages in the cache who belong to the given task + + A simple helper responsible for search for all members of a task + in the cache. Optional it prints a a notice about the + packages chosen cause of the given task. + \param Cache the packages are in + \param pattern name of the task + \param out stream to print the notice to */ + static APT::PackageSet FromTask(pkgCacheFile &Cache, std::string pattern, std::ostream &out); + static APT::PackageSet FromTask(pkgCacheFile &Cache, std::string const &pattern) { + std::ostream out (std::ofstream("/dev/null").rdbuf()); + return APT::PackageSet::FromTask(Cache, pattern, out); + } + /** \brief returns all packages in the cache whose name matchs a given pattern A simple helper responsible for executing a regular expression on all @@ -134,7 +149,7 @@ class VersionSet : public std::set<pkgCache::VerIterator> { /*{{{*/ pkgCache. */ public: /*{{{*/ /** \brief smell like a pkgCache::VerIterator */ - class const_iterator : public std::set<pkgCache::VerIterator>::const_iterator { + class const_iterator : public std::set<pkgCache::VerIterator>::const_iterator {/*{{{*/ public: const_iterator(std::set<pkgCache::VerIterator>::const_iterator x) : std::set<pkgCache::VerIterator>::const_iterator(x) {} @@ -168,6 +183,7 @@ public: /*{{{*/ inline bool Pseudo() const { return (**this).Pseudo(); }; inline pkgCache::VerFileIterator NewestFile() const { return (**this).NewestFile(); }; }; + /*}}}*/ // 103. set::iterator is required to be modifiable, but this allows modification of keys typedef APT::VersionSet::const_iterator iterator; diff --git a/debian/changelog b/debian/changelog index 4de21d343..f6645c0fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low - doesn't include it in the library for now as it is too volatile - get the candidate either from an already built depcache or use the policy which is a bit faster than depcache generation + - get packages by task^ with FromTask() * apt-pkg/orderlist.cc: - untouched packages are never missing * apt-pkg/packagemanager.cc: -- cgit v1.2.3 From 313678129b6f8ad37216db0b4e7679059ab37e56 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 19 Jun 2010 14:16:40 +0200 Subject: * cmdline/apt-get.cc: - use the cachsets in the install commands --- cmdline/apt-cache.cc | 3 +- cmdline/apt-get.cc | 249 ++++++++++----------------------------------------- debian/changelog | 2 + 3 files changed, 51 insertions(+), 203 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 7cb95b3f8..2332a0f13 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -29,7 +29,8 @@ #include <apt-pkg/tagfile.h> #include <apt-pkg/algorithms.h> #include <apt-pkg/sptr.h> -#include <apt-pkg/cacheset.h> + +#include "cacheset.h" #include <config.h> #include <apti18n.h> diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 0ada46c73..c081ca130 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -40,12 +40,12 @@ #include <apt-pkg/sptr.h> #include <apt-pkg/md5.h> #include <apt-pkg/versionmatch.h> -#include <apt-pkg/cacheset.h> #include <config.h> #include <apti18n.h> #include "acqprogress.h" +#include "cacheset.h" #include <set> #include <locale.h> @@ -1252,41 +1252,6 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, if ((State.InstBroken() == true || State.InstPolicyBroken() == true) && BrokenFix == false) Cache.MarkInstall(Pkg,true); - return true; -} - /*}}}*/ -// TryToChangeVer - Try to change a candidate version /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool TryToChangeVer(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, - const char *VerTag,bool IsRel) -{ - pkgVersionMatch Match(VerTag,(IsRel == true?pkgVersionMatch::Release : - pkgVersionMatch::Version)); - - pkgCache::VerIterator Ver = Match.Find(Pkg); - - if (Ver.end() == true) - { - if (IsRel == true) - return _error->Error(_("Release '%s' for '%s' was not found"), - VerTag,Pkg.FullName(true).c_str()); - return _error->Error(_("Version '%s' for '%s' was not found"), - VerTag,Pkg.FullName(true).c_str()); - } - - if (strcmp(VerTag,Ver.VerStr()) != 0) - { - ioprintf(c1out,_("Selected version %s (%s) for %s\n"), - Ver.VerStr(),Ver.RelStr().c_str(),Pkg.FullName(true).c_str()); - } - - Cache.SetCandidateVersion(Ver); - - // Set the all package to the same candidate - if (Ver.Pseudo() == true) - Cache.SetCandidateVersion(Match.Find(Pkg.Group().FindPkg("all"))); - return true; } /*}}}*/ @@ -1624,61 +1589,6 @@ bool DoUpgrade(CommandLine &CmdL) return InstallPackages(Cache,true); } /*}}}*/ -// DoInstallTask - Install task from the command line /*{{{*/ -// --------------------------------------------------------------------- -/* Install named task */ -bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix, - bool BrokenFix, - unsigned int& ExpectedInst, - const char *taskname, - bool Remove) -{ - const char *start, *end; - pkgCache::PkgIterator Pkg; - char buf[64*1024]; - regex_t Pattern; - - // get the records - pkgRecords Recs(Cache); - - // build regexp for the task - char S[300]; - snprintf(S, sizeof(S), "^Task:.*[, ]%s([, ]|$)", taskname); - if(regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE) != 0) - return _error->Error("Failed to compile task regexp"); - - bool found = false; - bool res = true; - - // two runs, first ignore dependencies, second install any missing - for(int IgnoreBroken=1; IgnoreBroken >= 0; IgnoreBroken--) - { - for (Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) - { - pkgCache::VerIterator ver = Cache[Pkg].CandidateVerIter(Cache); - if(ver.end()) - continue; - pkgRecords::Parser &parser = Recs.Lookup(ver.FileList()); - parser.GetRec(start,end); - strncpy(buf, start, end-start); - buf[end-start] = 0x0; - if (regexec(&Pattern,buf,0,0,0) != 0) - continue; - res &= TryToInstall(Pkg,Cache,Fix,Remove,IgnoreBroken,ExpectedInst); - found = true; - } - } - - // now let the problem resolver deal with any issues - Fix.Resolve(true); - - if(!found) - _error->Error(_("Couldn't find task %s"),taskname); - - regfree(&Pattern); - return res; -} - /*}}}*/ // DoInstall - Install packages from the command line /*{{{*/ // --------------------------------------------------------------------- /* Install named packages */ @@ -1696,138 +1606,73 @@ bool DoInstall(CommandLine &CmdL) unsigned int AutoMarkChanged = 0; unsigned int ExpectedInst = 0; - unsigned int Packages = 0; pkgProblemResolver Fix(Cache); - - bool DefRemove = false; + + unsigned short fallback = 0; if (strcasecmp(CmdL.FileList[0],"remove") == 0) - DefRemove = true; + fallback = 1; else if (strcasecmp(CmdL.FileList[0], "purge") == 0) { _config->Set("APT::Get::Purge", true); - DefRemove = true; + fallback = 1; } else if (strcasecmp(CmdL.FileList[0], "autoremove") == 0) { _config->Set("APT::Get::AutomaticRemove", "true"); - DefRemove = true; + fallback = 1; } // new scope for the ActionGroup { + // TODO: Howto get an ExpectedInst count ? pkgDepCache::ActionGroup group(Cache); - for (const char **I = CmdL.FileList + 1; *I != 0; I++) - { - // Duplicate the string - unsigned int Length = strlen(*I); - char S[300]; - if (Length >= sizeof(S)) - continue; - strcpy(S,*I); - - // See if we are removing and special indicators.. - bool Remove = DefRemove; - char *VerTag = 0; - bool VerIsRel = false; + std::list<APT::VersionSet::Modifier> mods; + mods.push_back(APT::VersionSet::Modifier(0, "+", + APT::VersionSet::Modifier::POSTFIX, APT::VersionSet::CANDINST)); + mods.push_back(APT::VersionSet::Modifier(1, "-", + APT::VersionSet::Modifier::POSTFIX, APT::VersionSet::INSTCAND)); + std::map<unsigned short, APT::VersionSet> verset = APT::VersionSet::GroupedFromCommandLine(Cache, + CmdL.FileList + 1, mods, fallback, c0out); - // this is a task! - if (Length >= 1 && S[Length - 1] == '^') - { - S[--Length] = 0; - // tasks must always be confirmed - ExpectedInst += 1000; - // see if we can install it - TryInstallTask(Cache, Fix, BrokenFix, ExpectedInst, S, Remove); - continue; - } + if (_error->PendingError() == true) + return false; - while (Cache->FindPkg(S).end() == true) + for (APT::VersionSet::const_iterator Ver = verset[0].begin(); + Ver != verset[0].end(); ++Ver) + { + pkgCache::PkgIterator Pkg = Ver.ParentPkg(); + Cache->SetCandidateVersion(Ver); + + if (TryToInstall(Pkg, Cache, Fix, false, BrokenFix, ExpectedInst) == false) + return false; + + // see if we need to fix the auto-mark flag + // e.g. apt-get install foo + // where foo is marked automatic + if (Cache[Pkg].Install() == false && + (Cache[Pkg].Flags & pkgCache::Flag::Auto) && + _config->FindB("APT::Get::ReInstall",false) == false && + _config->FindB("APT::Get::Only-Upgrade",false) == false && + _config->FindB("APT::Get::Download-Only",false) == false) { - // Handle an optional end tag indicating what to do - if (Length >= 1 && S[Length - 1] == '-') - { - Remove = true; - S[--Length] = 0; - continue; - } - - if (Length >= 1 && S[Length - 1] == '+') - { - Remove = false; - S[--Length] = 0; - continue; - } - - char *Slash = strchr(S,'='); - if (Slash != 0) - { - VerIsRel = false; - *Slash = 0; - VerTag = Slash + 1; - } - - Slash = strchr(S,'/'); - if (Slash != 0) - { - VerIsRel = true; - *Slash = 0; - VerTag = Slash + 1; - } - - break; + ioprintf(c1out,_("%s set to manually installed.\n"), + Pkg.FullName(true).c_str()); + Cache->MarkAuto(Pkg,false); + AutoMarkChanged++; } - - // Locate the package - pkgCache::PkgIterator Pkg = Cache->FindPkg(S); - Packages++; - if (Pkg.end() == true) - { - APT::PackageSet pkgset = APT::PackageSet::FromRegEx(Cache, S, c1out); - if (pkgset.empty() == true) - return _error->Error(_("Couldn't find package %s"),S); - - // Regexs must always be confirmed - ExpectedInst += 1000; - - bool Hit = false; - for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) - { - if (VerTag != 0) - if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false) - return false; + } - Hit |= TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix, - ExpectedInst,false); - } + for (APT::VersionSet::const_iterator Ver = verset[1].begin(); + Ver != verset[1].end(); ++Ver) + { + pkgCache::PkgIterator Pkg = Ver.ParentPkg(); - if (Hit == false) - return _error->Error(_("Couldn't find package %s"),S); - } - else - { - if (VerTag != 0) - if (TryToChangeVer(Pkg,Cache,VerTag,VerIsRel) == false) - return false; - if (TryToInstall(Pkg,Cache,Fix,Remove,BrokenFix,ExpectedInst) == false) - return false; - - // see if we need to fix the auto-mark flag - // e.g. apt-get install foo - // where foo is marked automatic - if(!Remove && - Cache[Pkg].Install() == false && - (Cache[Pkg].Flags & pkgCache::Flag::Auto) && - _config->FindB("APT::Get::ReInstall",false) == false && - _config->FindB("APT::Get::Only-Upgrade",false) == false && - _config->FindB("APT::Get::Download-Only",false) == false) - { - ioprintf(c1out,_("%s set to manually installed.\n"), - Pkg.FullName(true).c_str()); - Cache->MarkAuto(Pkg,false); - AutoMarkChanged++; - } - } + if (TryToInstall(Pkg, Cache, Fix, true, BrokenFix, ExpectedInst) == false) + return false; } + if (_error->PendingError() == true) + return false; + /* If we are in the Broken fixing mode we do not attempt to fix the problems. This is if the user invoked install without -f and gave packages */ diff --git a/debian/changelog b/debian/changelog index f6645c0fe..00877eefb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low - get the candidate either from an already built depcache or use the policy which is a bit faster than depcache generation - get packages by task^ with FromTask() + * cmdline/apt-get.cc: + - use the cachsets in the install commands * apt-pkg/orderlist.cc: - untouched packages are never missing * apt-pkg/packagemanager.cc: -- cgit v1.2.3 From 9d706e45650240cb7b05104211d93220dd6f614c Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Mon, 21 Jun 2010 13:22:40 +0200 Subject: debian/changelog: it is an ABI break after all --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 380060aa6..e44d7986d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,8 +11,9 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low * apt-pkg/contrib/fileutl.{h,cc}: - Add support for transparent reading of gzipped files. - Link against zlib (in apt-pkg/makefile) and add zlib build dependency. - - [Weak internal ABI BREAK] This changes the behaviour of FileFd for - reading gzipped files. + - [ABI BREAK] This adds a new private member to FileFd, but its + initialization is in the public header file. This also changes the + behaviour of FileFd for reading gzipped files. * configure.in: - Check for zlib library and headers. * apt-pkg/deb/debindexfile.cc: -- cgit v1.2.3 From 70e706adf75ed319d931a220ce27db2b981093f5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 22 Jun 2010 18:01:11 +0200 Subject: =?UTF-8?q?Use=20an=20abstract=20helper=20for=20error=20handling?= =?UTF-8?q?=20and=20output=20instead=20of=20doing=20this=20directly=20in?= =?UTF-8?q?=20the=20CacheSets.=20With=20this=20method=20an=20application?= =?UTF-8?q?=20like=20apt-get=20can=20change=20the=20behavior=20of=20the=20?= =?UTF-8?q?CacheSets=20to=20his=20liking.=20It=20can=20for=20example=20eas?= =?UTF-8?q?ily=20keep=20track=20of=20how=20packages=20were=20added=20to=20?= =?UTF-8?q?the=20set:=20by=20names=20or=20with=20regex's=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmdline/apt-get.cc | 79 ++++++++++++++++------- cmdline/cacheset.cc | 179 ++++++++++++++++++++++++++++++++++------------------ cmdline/cacheset.h | 104 ++++++++++++++++++++---------- 3 files changed, 244 insertions(+), 118 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index c081ca130..6a7d7a448 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1079,7 +1079,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, name matching it was split out.. */ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, pkgProblemResolver &Fix,bool Remove,bool BrokenFix, - unsigned int &ExpectedInst,bool AllowFail = true) + bool AllowFail = true) { /* This is a pure virtual package and there is a single available candidate providing it. */ @@ -1244,9 +1244,7 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, Pkg.FullName(true).c_str()); } } - else - ExpectedInst++; - + // Install it with autoinstalling enabled (if we not respect the minial // required deps or the policy) if ((State.InstBroken() == true || State.InstPolicyBroken() == true) && BrokenFix == false) @@ -1589,6 +1587,41 @@ bool DoUpgrade(CommandLine &CmdL) return InstallPackages(Cache,true); } /*}}}*/ +// CacheSetHelperAPTGet - responsible for message telling from the CacheSets/*{{{*/ +class CacheSetHelperAPTGet : public APT::CacheSetHelper { + /** \brief stream message should be printed to */ + std::ostream &out; + /** \brief were things like Task or RegEx used to select packages? */ + bool explicitlyNamed; + +public: + CacheSetHelperAPTGet(std::ostream &out) : APT::CacheSetHelper(true), out(out) { + explicitlyNamed = true; + } + + virtual void showTaskSelection(APT::PackageSet const &pkgset, string const &pattern) { + for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) + ioprintf(out, _("Note, selecting %s for task '%s'\n"), + Pkg.FullName(true).c_str(), pattern.c_str()); + explicitlyNamed = false; + } + virtual void showRegExSelection(APT::PackageSet const &pkgset, string const &pattern) { + for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) + ioprintf(out, _("Note, selecting %s for regex '%s'\n"), + Pkg.FullName(true).c_str(), pattern.c_str()); + explicitlyNamed = false; + } + virtual void showSelectedVersion(pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const Ver, + string const &ver, bool const &verIsRel) { + if (ver != Ver.VerStr()) + ioprintf(out, _("Selected version '%s' (%s) for '%s'\n"), + Ver.VerStr(), Ver.RelStr().c_str(), Pkg.FullName(true).c_str()); + } + + inline bool allPkgNamedExplicitly() const { return explicitlyNamed; } + +}; + /*}}}*/ // DoInstall - Install packages from the command line /*{{{*/ // --------------------------------------------------------------------- /* Install named packages */ @@ -1605,7 +1638,6 @@ bool DoInstall(CommandLine &CmdL) BrokenFix = true; unsigned int AutoMarkChanged = 0; - unsigned int ExpectedInst = 0; pkgProblemResolver Fix(Cache); unsigned short fallback = 0; @@ -1621,28 +1653,29 @@ bool DoInstall(CommandLine &CmdL) _config->Set("APT::Get::AutomaticRemove", "true"); fallback = 1; } - // new scope for the ActionGroup - { - // TODO: Howto get an ExpectedInst count ? - pkgDepCache::ActionGroup group(Cache); - std::list<APT::VersionSet::Modifier> mods; - mods.push_back(APT::VersionSet::Modifier(0, "+", + + std::list<APT::VersionSet::Modifier> mods; + mods.push_back(APT::VersionSet::Modifier(0, "+", APT::VersionSet::Modifier::POSTFIX, APT::VersionSet::CANDINST)); - mods.push_back(APT::VersionSet::Modifier(1, "-", + mods.push_back(APT::VersionSet::Modifier(1, "-", APT::VersionSet::Modifier::POSTFIX, APT::VersionSet::INSTCAND)); - std::map<unsigned short, APT::VersionSet> verset = APT::VersionSet::GroupedFromCommandLine(Cache, - CmdL.FileList + 1, mods, fallback, c0out); + CacheSetHelperAPTGet helper(c0out); + std::map<unsigned short, APT::VersionSet> verset = APT::VersionSet::GroupedFromCommandLine(Cache, + CmdL.FileList + 1, mods, fallback, helper); - if (_error->PendingError() == true) - return false; + if (_error->PendingError() == true) + return false; + // new scope for the ActionGroup + { + pkgDepCache::ActionGroup group(Cache); for (APT::VersionSet::const_iterator Ver = verset[0].begin(); Ver != verset[0].end(); ++Ver) { pkgCache::PkgIterator Pkg = Ver.ParentPkg(); Cache->SetCandidateVersion(Ver); - if (TryToInstall(Pkg, Cache, Fix, false, BrokenFix, ExpectedInst) == false) + if (TryToInstall(Pkg, Cache, Fix, false, BrokenFix) == false) return false; // see if we need to fix the auto-mark flag @@ -1666,7 +1699,7 @@ bool DoInstall(CommandLine &CmdL) { pkgCache::PkgIterator Pkg = Ver.ParentPkg(); - if (TryToInstall(Pkg, Cache, Fix, true, BrokenFix, ExpectedInst) == false) + if (TryToInstall(Pkg, Cache, Fix, true, BrokenFix) == false) return false; } @@ -1719,7 +1752,7 @@ bool DoInstall(CommandLine &CmdL) /* Print out a list of packages that are going to be installed extra to what the user asked */ - if (Cache->InstCount() != ExpectedInst) + if (Cache->InstCount() != verset[0].size()) { string List; string VersionsList; @@ -1845,7 +1878,8 @@ bool DoInstall(CommandLine &CmdL) Cache->writeStateFile(NULL); // See if we need to prompt - if (Cache->InstCount() == ExpectedInst && Cache->DelCount() == 0) + // FIXME: check if really the packages in the set are going to be installed + if (Cache->InstCount() == verset[0].size() && Cache->DelCount() == 0) return InstallPackages(Cache,false,false); return InstallPackages(Cache,false); @@ -2429,7 +2463,6 @@ bool DoBuildDep(CommandLine &CmdL) } // Install the requested packages - unsigned int ExpectedInst = 0; vector <pkgSrcRecords::Parser::BuildDepRec>::iterator D; pkgProblemResolver Fix(Cache); bool skipAlternatives = false; // skip remaining alternatives in an or group @@ -2460,7 +2493,7 @@ bool DoBuildDep(CommandLine &CmdL) */ if (IV.end() == false && Cache->VS().CheckDep(IV.VerStr(),(*D).Op,(*D).Version.c_str()) == true) - TryToInstall(Pkg,Cache,Fix,true,false,ExpectedInst); + TryToInstall(Pkg,Cache,Fix,true,false); } else // BuildDep || BuildDepIndep { @@ -2576,7 +2609,7 @@ bool DoBuildDep(CommandLine &CmdL) if (_config->FindB("Debug::BuildDeps",false) == true) cout << " Trying to install " << (*D).Package << endl; - if (TryToInstall(Pkg,Cache,Fix,false,false,ExpectedInst) == true) + if (TryToInstall(Pkg,Cache,Fix,false,false) == true) { // We successfully installed something; skip remaining alternatives skipAlternatives = hasAlternatives; diff --git a/cmdline/cacheset.cc b/cmdline/cacheset.cc index 55ab26780..88a98fdbe 100644 --- a/cmdline/cacheset.cc +++ b/cmdline/cacheset.cc @@ -24,7 +24,7 @@ /*}}}*/ namespace APT { // FromTask - Return all packages in the cache from a specific task /*{{{*/ -PackageSet PackageSet::FromTask(pkgCacheFile &Cache, std::string pattern, std::ostream &out) { +PackageSet PackageSet::FromTask(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) { PackageSet pkgset; if (Cache.BuildCaches() == false || Cache.BuildDepCache() == false) return pkgset; @@ -67,19 +67,22 @@ PackageSet PackageSet::FromTask(pkgCacheFile &Cache, std::string pattern, std::o char buf[length]; strncpy(buf, start, length); buf[length-1] = '\0'; - if (regexec(&Pattern, buf, 0, 0, 0) == 0) - pkgset.insert(Pkg); + if (regexec(&Pattern, buf, 0, 0, 0) != 0) + continue; + + pkgset.insert(Pkg); } + regfree(&Pattern); if (pkgset.empty() == true) - _error->Error(_("Couldn't find task %s"), pattern.c_str()); + return helper.canNotFindTask(Cache, pattern); - regfree(&Pattern); + helper.showTaskSelection(pkgset, pattern); return pkgset; } /*}}}*/ // FromRegEx - Return all packages in the cache matching a pattern /*{{{*/ -PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, std::ostream &out) { +PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) { PackageSet pkgset; static const char * const isregex = ".?+*|[^$"; @@ -121,14 +124,14 @@ PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, std:: continue; } - ioprintf(out, _("Note, selecting %s for regex '%s'\n"), - Pkg.FullName(true).c_str(), pattern.c_str()); - pkgset.insert(Pkg); } - regfree(&Pattern); + if (pkgset.empty() == true) + return helper.canNotFindRegEx(Cache, pattern); + + helper.showRegExSelection(pkgset, pattern); return pkgset; } /*}}}*/ @@ -136,7 +139,7 @@ PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, std:: std::map<unsigned short, PackageSet> PackageSet::GroupedFromCommandLine( pkgCacheFile &Cache, const char **cmdline, std::list<PackageSet::Modifier> const &mods, - unsigned short const &fallback, std::ostream &out) { + unsigned short const &fallback, CacheSetHelper &helper) { std::map<unsigned short, PackageSet> pkgsets; for (const char **I = cmdline; *I != 0; ++I) { unsigned short modID = fallback; @@ -159,24 +162,23 @@ std::map<unsigned short, PackageSet> PackageSet::GroupedFromCommandLine( } break; } - PackageSet pset = PackageSet::FromString(Cache, str, out); - pkgsets[modID].insert(pset.begin(), pset.end()); + pkgsets[modID].insert(PackageSet::FromString(Cache, str, helper)); } return pkgsets; } /*}}}*/ // FromCommandLine - Return all packages specified on commandline /*{{{*/ -PackageSet PackageSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, std::ostream &out) { +PackageSet PackageSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, CacheSetHelper &helper) { PackageSet pkgset; for (const char **I = cmdline; *I != 0; ++I) { - PackageSet pset = FromString(Cache, *I, out); + PackageSet pset = FromString(Cache, *I, helper); pkgset.insert(pset.begin(), pset.end()); } return pkgset; } /*}}}*/ // FromString - Return all packages matching a specific string /*{{{*/ -PackageSet PackageSet::FromString(pkgCacheFile &Cache, std::string const &str, std::ostream &out) { +PackageSet PackageSet::FromString(pkgCacheFile &Cache, std::string const &str, CacheSetHelper &helper) { std::string pkg = str; size_t archfound = pkg.find_last_of(':'); std::string arch; @@ -198,23 +200,22 @@ PackageSet PackageSet::FromString(pkgCacheFile &Cache, std::string const &str, s pkgset.insert(Pkg); return pkgset; } - PackageSet pset = FromTask(Cache, str, out); + PackageSet pset = FromTask(Cache, str, helper); if (pset.empty() == false) return pset; - pset = FromRegEx(Cache, str, out); + pset = FromRegEx(Cache, str, helper); if (pset.empty() == false) return pset; - _error->Warning(_("Unable to locate package %s"), str.c_str()); - return pset; + return helper.canNotFindPackage(Cache, str); } /*}}}*/ // GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ std::map<unsigned short, VersionSet> VersionSet::GroupedFromCommandLine( pkgCacheFile &Cache, const char **cmdline, std::list<VersionSet::Modifier> const &mods, - unsigned short const &fallback, std::ostream &out) { + unsigned short const &fallback, CacheSetHelper &helper) { std::map<unsigned short, VersionSet> versets; for (const char **I = cmdline; *I != 0; ++I) { unsigned short modID = fallback; @@ -241,18 +242,17 @@ std::map<unsigned short, VersionSet> VersionSet::GroupedFromCommandLine( } break; } - VersionSet vset = VersionSet::FromString(Cache, str, select , out); - versets[modID].insert(vset.begin(), vset.end()); + versets[modID].insert(VersionSet::FromString(Cache, str, select , helper)); } return versets; } /*}}}*/ // FromCommandLine - Return all versions specified on commandline /*{{{*/ APT::VersionSet VersionSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, - APT::VersionSet::Version const &fallback, std::ostream &out) { + APT::VersionSet::Version const &fallback, CacheSetHelper &helper) { VersionSet verset; for (const char **I = cmdline; *I != 0; ++I) { - VersionSet vset = VersionSet::FromString(Cache, *I, fallback, out); + VersionSet vset = VersionSet::FromString(Cache, *I, fallback, helper); verset.insert(vset.begin(), vset.end()); } return verset; @@ -260,7 +260,7 @@ APT::VersionSet VersionSet::FromCommandLine(pkgCacheFile &Cache, const char **cm /*}}}*/ // FromString - Returns all versions spedcified by a string /*{{{*/ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, - APT::VersionSet::Version const &fallback, std::ostream &out) { + APT::VersionSet::Version const &fallback, CacheSetHelper &helper) { std::string ver; bool verIsRel = false; size_t const vertag = pkg.find_last_of("/="); @@ -269,19 +269,19 @@ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, verIsRel = (pkg[vertag] == '/'); pkg.erase(vertag); } - PackageSet pkgset = PackageSet::FromString(Cache, pkg.c_str(), out); + PackageSet pkgset = PackageSet::FromString(Cache, pkg.c_str(), helper); VersionSet verset; for (PackageSet::const_iterator P = pkgset.begin(); P != pkgset.end(); ++P) { if (vertag == string::npos) { - AddSelectedVersion(Cache, verset, P, fallback); + AddSelectedVersion(Cache, verset, P, fallback, helper); continue; } pkgCache::VerIterator V; if (ver == "installed") - V = getInstalledVer(Cache, P); + V = getInstalledVer(Cache, P, helper); else if (ver == "candidate") - V = getCandidateVer(Cache, P); + V = getCandidateVer(Cache, P, helper); else { pkgVersionMatch Match(ver, (verIsRel == true ? pkgVersionMatch::Release : pkgVersionMatch::Version)); @@ -298,76 +298,70 @@ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, } if (V.end() == true) continue; - if (ver != V.VerStr()) - ioprintf(out, _("Selected version '%s' (%s) for '%s'\n"), - V.VerStr(), V.RelStr().c_str(), P.FullName(true).c_str()); + helper.showSelectedVersion(P, V, ver, verIsRel); verset.insert(V); } return verset; } /*}}}*/ // AddSelectedVersion - add version from package based on fallback /*{{{*/ -bool VersionSet::AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset, +void VersionSet::AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset, pkgCache::PkgIterator const &P, VersionSet::Version const &fallback, - bool const &AllowError) { + CacheSetHelper &helper) { pkgCache::VerIterator V; + bool showErrors; switch(fallback) { case VersionSet::ALL: if (P->VersionList != 0) for (V = P.VersionList(); V.end() != true; ++V) verset.insert(V); - else if (AllowError == false) - return _error->Error(_("Can't select versions from package '%s' as it purely virtual"), P.FullName(true).c_str()); else - return false; + verset.insert(helper.canNotFindAllVer(Cache, P)); break; case VersionSet::CANDANDINST: - verset.insert(getInstalledVer(Cache, P, AllowError)); - verset.insert(getCandidateVer(Cache, P, AllowError)); + verset.insert(getInstalledVer(Cache, P, helper)); + verset.insert(getCandidateVer(Cache, P, helper)); break; case VersionSet::CANDIDATE: - verset.insert(getCandidateVer(Cache, P, AllowError)); + verset.insert(getCandidateVer(Cache, P, helper)); break; case VersionSet::INSTALLED: - verset.insert(getInstalledVer(Cache, P, AllowError)); + verset.insert(getInstalledVer(Cache, P, helper)); break; case VersionSet::CANDINST: - V = getCandidateVer(Cache, P, true); + showErrors = helper.showErrors(false); + V = getCandidateVer(Cache, P, helper); if (V.end() == true) - V = getInstalledVer(Cache, P, true); + V = getInstalledVer(Cache, P, helper); + helper.showErrors(showErrors); if (V.end() == false) verset.insert(V); - else if (AllowError == false) - return _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), P.FullName(true).c_str()); else - return false; + verset.insert(helper.canNotFindInstCandVer(Cache, P)); break; case VersionSet::INSTCAND: - V = getInstalledVer(Cache, P, true); + showErrors = helper.showErrors(false); + V = getInstalledVer(Cache, P, helper); if (V.end() == true) - V = getCandidateVer(Cache, P, true); + V = getCandidateVer(Cache, P, helper); + helper.showErrors(showErrors); if (V.end() == false) verset.insert(V); - else if (AllowError == false) - return _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), P.FullName(true).c_str()); else - return false; + verset.insert(helper.canNotFindInstCandVer(Cache, P)); break; case VersionSet::NEWEST: if (P->VersionList != 0) verset.insert(P.VersionList()); - else if (AllowError == false) - return _error->Error(_("Can't select newest version from package '%s' as it is purely virtual"), P.FullName(true).c_str()); else - return false; + verset.insert(helper.canNotFindNewestVer(Cache, P)); break; } - return true; } /*}}}*/ // getCandidateVer - Returns the candidate version of the given package /*{{{*/ pkgCache::VerIterator VersionSet::getCandidateVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg, bool const &AllowError) { + pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper) { pkgCache::VerIterator Cand; if (Cache.IsDepCacheBuilt() == true) Cand = Cache[Pkg].CandidateVerIter(Cache); @@ -376,17 +370,78 @@ pkgCache::VerIterator VersionSet::getCandidateVer(pkgCacheFile &Cache, return pkgCache::VerIterator(*Cache); Cand = Cache.GetPolicy()->GetCandidateVer(Pkg); } - if (AllowError == false && Cand.end() == true) - _error->Error(_("Can't select candidate version from package %s as it has no candidate"), Pkg.FullName(true).c_str()); + if (Cand.end() == true) + return helper.canNotFindCandidateVer(Cache, Pkg); return Cand; } /*}}}*/ // getInstalledVer - Returns the installed version of the given package /*{{{*/ pkgCache::VerIterator VersionSet::getInstalledVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg, bool const &AllowError) { - if (AllowError == false && Pkg->CurrentVer == 0) - _error->Error(_("Can't select installed version from package %s as it is not installed"), Pkg.FullName(true).c_str()); + pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper) { + if (Pkg->CurrentVer == 0) + return helper.canNotFindInstalledVer(Cache, Pkg); return Pkg.CurrentVer(); } /*}}}*/ +// canNotFindTask - handle the case no package is found for a task /*{{{*/ +PackageSet CacheSetHelper::canNotFindTask(pkgCacheFile &Cache, std::string pattern) { + if (ShowError == true) + _error->Error(_("Couldn't find task '%s'"), pattern.c_str()); + return PackageSet(); +} + /*}}}*/ +// canNotFindRegEx - handle the case no package is found by a regex /*{{{*/ +PackageSet CacheSetHelper::canNotFindRegEx(pkgCacheFile &Cache, std::string pattern) { + if (ShowError == true) + _error->Error(_("Couldn't find any package by regex '%s'"), pattern.c_str()); + return PackageSet(); +} + /*}}}*/ +// canNotFindPackage - handle the case no package is found from a string/*{{{*/ +PackageSet CacheSetHelper::canNotFindPackage(pkgCacheFile &Cache, std::string const &str) { + if (ShowError == true) + _error->Error(_("Unable to locate package %s"), str.c_str()); + return PackageSet(); +} + /*}}}*/ +// canNotFindAllVer /*{{{*/ +VersionSet CacheSetHelper::canNotFindAllVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg) { + if (ShowError == true) + _error->Error(_("Can't select versions from package '%s' as it purely virtual"), Pkg.FullName(true).c_str()); + return VersionSet(); +} + /*}}}*/ +// canNotFindInstCandVer /*{{{*/ +VersionSet CacheSetHelper::canNotFindInstCandVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg) { + if (ShowError == true) + _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), Pkg.FullName(true).c_str()); + return VersionSet(); +} + /*}}}*/ +// canNotFindNewestVer /*{{{*/ +pkgCache::VerIterator CacheSetHelper::canNotFindNewestVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg) { + if (ShowError == true) + _error->Error(_("Can't select newest version from package '%s' as it is purely virtual"), Pkg.FullName(true).c_str()); + return pkgCache::VerIterator(*Cache); +} + /*}}}*/ +// canNotFindCandidateVer /*{{{*/ +pkgCache::VerIterator CacheSetHelper::canNotFindCandidateVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg) { + if (ShowError == true) + _error->Error(_("Can't select candidate version from package %s as it has no candidate"), Pkg.FullName(true).c_str()); + return pkgCache::VerIterator(*Cache); +} + /*}}}*/ +// canNotFindInstalledVer /*{{{*/ +pkgCache::VerIterator CacheSetHelper::canNotFindInstalledVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg) { + if (ShowError == true) + _error->Error(_("Can't select installed version from package %s as it is not installed"), Pkg.FullName(true).c_str()); + return pkgCache::VerIterator(*Cache); +} + /*}}}*/ } diff --git a/cmdline/cacheset.h b/cmdline/cacheset.h index 64a72e758..9c9491020 100644 --- a/cmdline/cacheset.h +++ b/cmdline/cacheset.h @@ -20,6 +20,45 @@ #include <apt-pkg/pkgcache.h> /*}}}*/ namespace APT { +class PackageSet; +class VersionSet; +class CacheSetHelper { /*{{{*/ +/** \class APT::CacheSetHelper + Simple base class with a lot of virtual methods which can be overridden + to alter the behavior or the output of the CacheSets. + + This helper is passed around by the static methods in the CacheSets and + used every time they hit an error condition or something could be + printed out. +*/ +public: /*{{{*/ + CacheSetHelper(bool const &ShowError = true) : ShowError(ShowError) {}; + virtual ~CacheSetHelper() {}; + + virtual void showTaskSelection(PackageSet const &pkgset, string const &pattern) {}; + virtual void showRegExSelection(PackageSet const &pkgset, string const &pattern) {}; + virtual void showSelectedVersion(pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const Ver, + string const &ver, bool const &verIsRel) {}; + + virtual PackageSet canNotFindTask(pkgCacheFile &Cache, std::string pattern); + virtual PackageSet canNotFindRegEx(pkgCacheFile &Cache, std::string pattern); + virtual PackageSet canNotFindPackage(pkgCacheFile &Cache, std::string const &str); + virtual VersionSet canNotFindAllVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg); + virtual VersionSet canNotFindInstCandVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg); + virtual pkgCache::VerIterator canNotFindNewestVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg); + virtual pkgCache::VerIterator canNotFindCandidateVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg); + virtual pkgCache::VerIterator canNotFindInstalledVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg); + + bool showErrors() const { return ShowError; }; + bool showErrors(bool const &newValue) { if (ShowError == newValue) return ShowError; else return ((ShowError = newValue) == false); }; + /*}}}*/ +protected: + bool ShowError; +}; /*}}}*/ class PackageSet : public std::set<pkgCache::PkgIterator> { /*{{{*/ /** \class APT::PackageSet @@ -66,6 +105,7 @@ public: /*{{{*/ using std::set<pkgCache::PkgIterator>::insert; inline void insert(pkgCache::PkgIterator const &P) { if (P.end() == false) std::set<pkgCache::PkgIterator>::insert(P); }; + inline void insert(PackageSet const &pkgset) { insert(pkgset.begin(), pkgset.end()); }; /** \brief returns all packages in the cache who belong to the given task @@ -75,10 +115,10 @@ public: /*{{{*/ \param Cache the packages are in \param pattern name of the task \param out stream to print the notice to */ - static APT::PackageSet FromTask(pkgCacheFile &Cache, std::string pattern, std::ostream &out); + static APT::PackageSet FromTask(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper); static APT::PackageSet FromTask(pkgCacheFile &Cache, std::string const &pattern) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); - return APT::PackageSet::FromTask(Cache, pattern, out); + CacheSetHelper helper; + return APT::PackageSet::FromTask(Cache, pattern, helper); } /** \brief returns all packages in the cache whose name matchs a given pattern @@ -89,10 +129,10 @@ public: /*{{{*/ \param Cache the packages are in \param pattern regular expression for package names \param out stream to print the notice to */ - static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string pattern, std::ostream &out); + static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper); static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string const &pattern) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); - return APT::PackageSet::FromRegEx(Cache, pattern, out); + CacheSetHelper helper; + return APT::PackageSet::FromRegEx(Cache, pattern, helper); } /** \brief returns all packages specified by a string @@ -100,10 +140,10 @@ public: /*{{{*/ \param Cache the packages are in \param string String the package name(s) should be extracted from \param out stream to print various notices to */ - static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string, std::ostream &out); + static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string, CacheSetHelper &helper); static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); - return APT::PackageSet::FromString(Cache, string, out); + CacheSetHelper helper; + return APT::PackageSet::FromString(Cache, string, helper); } /** \brief returns all packages specified on the commandline @@ -113,10 +153,10 @@ public: /*{{{*/ \param Cache the packages are in \param cmdline Command line the package names should be extracted from \param out stream to print various notices to */ - static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, std::ostream &out); + static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, CacheSetHelper &helper); static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); - return APT::PackageSet::FromCommandLine(Cache, cmdline, out); + CacheSetHelper helper; + return APT::PackageSet::FromCommandLine(Cache, cmdline, helper); } struct Modifier { @@ -130,14 +170,14 @@ public: /*{{{*/ static std::map<unsigned short, PackageSet> GroupedFromCommandLine( pkgCacheFile &Cache, const char **cmdline, std::list<PackageSet::Modifier> const &mods, - unsigned short const &fallback, std::ostream &out); + unsigned short const &fallback, CacheSetHelper &helper); static std::map<unsigned short, PackageSet> GroupedFromCommandLine( pkgCacheFile &Cache, const char **cmdline, std::list<PackageSet::Modifier> const &mods, unsigned short const &fallback) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); + CacheSetHelper helper; return APT::PackageSet::GroupedFromCommandLine(Cache, cmdline, - mods, fallback, out); + mods, fallback, helper); } /*}}}*/ }; /*}}}*/ @@ -189,6 +229,7 @@ public: /*{{{*/ using std::set<pkgCache::VerIterator>::insert; inline void insert(pkgCache::VerIterator const &V) { if (V.end() == false) std::set<pkgCache::VerIterator>::insert(V); }; + inline void insert(VersionSet const &verset) { insert(verset.begin(), verset.end()); }; /** \brief specifies which version(s) will be returned if non is given */ enum Version { @@ -216,22 +257,22 @@ public: /*{{{*/ \param cmdline Command line the versions should be extracted from \param out stream to print various notices to */ static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, - APT::VersionSet::Version const &fallback, std::ostream &out); + APT::VersionSet::Version const &fallback, CacheSetHelper &helper); static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, APT::VersionSet::Version const &fallback) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); - return APT::VersionSet::FromCommandLine(Cache, cmdline, fallback, out); + CacheSetHelper helper; + return APT::VersionSet::FromCommandLine(Cache, cmdline, fallback, helper); } static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { return APT::VersionSet::FromCommandLine(Cache, cmdline, CANDINST); } static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg, - APT::VersionSet::Version const &fallback, std::ostream &out); + APT::VersionSet::Version const &fallback, CacheSetHelper &helper); static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg, APT::VersionSet::Version const &fallback) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); - return APT::VersionSet::FromString(Cache, pkg, fallback, out); + CacheSetHelper helper; + return APT::VersionSet::FromString(Cache, pkg, fallback, helper); } static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg) { return APT::VersionSet::FromString(Cache, pkg, CANDINST); @@ -251,14 +292,14 @@ public: /*{{{*/ static std::map<unsigned short, VersionSet> GroupedFromCommandLine( pkgCacheFile &Cache, const char **cmdline, std::list<VersionSet::Modifier> const &mods, - unsigned short const &fallback, std::ostream &out); + unsigned short const &fallback, CacheSetHelper &helper); static std::map<unsigned short, VersionSet> GroupedFromCommandLine( pkgCacheFile &Cache, const char **cmdline, std::list<VersionSet::Modifier> const &mods, unsigned short const &fallback) { - std::ostream out (std::ofstream("/dev/null").rdbuf()); + CacheSetHelper helper; return APT::VersionSet::GroupedFromCommandLine(Cache, cmdline, - mods, fallback, out); + mods, fallback, helper); } /*}}}*/ protected: /*{{{*/ @@ -266,23 +307,20 @@ protected: /*{{{*/ /** \brief returns the candidate version of the package \param Cache to be used to query for information - \param Pkg we want the candidate version from this package - \param AllowError add an error to the stack if not */ + \param Pkg we want the candidate version from this package */ static pkgCache::VerIterator getCandidateVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg, bool const &AllowError = false); + pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper); /** \brief returns the installed version of the package \param Cache to be used to query for information - \param Pkg we want the installed version from this package - \param AllowError add an error to the stack if not */ + \param Pkg we want the installed version from this package */ static pkgCache::VerIterator getInstalledVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg, bool const &AllowError = false); - + pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper); - static bool AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset, + static void AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset, pkgCache::PkgIterator const &P, VersionSet::Version const &fallback, - bool const &AllowError = false); + CacheSetHelper &helper); /*}}}*/ }; /*}}}*/ -- cgit v1.2.3 From 330463dd2374bd11757c6f2662f279fc31f035a0 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode <jak@debian.org> Date: Thu, 24 Jun 2010 10:57:45 +0200 Subject: methods/ftp.h: Handle different logins are on the same server (Closes: #586904). --- debian/changelog | 7 +++++++ methods/ftp.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d29705d24..037dfa7bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.26~exp8) experimental; urgency=low + + * methods/ftp.h: + - Handle different logins are on the same server (Closes: #586904). + + -- Julian Andres Klode <jak@debian.org> Thu, 24 Jun 2010 10:56:39 +0200 + apt (0.7.26~exp7) experimental; urgency=low * apt-pkg/cachefile.h: diff --git a/methods/ftp.h b/methods/ftp.h index 1bcea41b6..d7f1f7fbe 100644 --- a/methods/ftp.h +++ b/methods/ftp.h @@ -40,7 +40,7 @@ class FTPConn public: - bool Comp(URI Other) {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;}; + bool Comp(URI Other) {return Other.Host == ServerName.Host && Other.Port == ServerName.Port && Other.User == ServerName.User && Other.Password == ServerName.Password; }; // Raw connection IO bool ReadResp(unsigned int &Ret,string &Text); -- cgit v1.2.3 From c4fc2fd7fa0fc63fd8cd6bc9b73492e6baf0222a Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 24 Jun 2010 21:27:27 +0200 Subject: Switch FileFd to not transparently gunzip, since that breaks code which expects the compressed contents to stay (such as the copy backend, or when using file:// repositories. Instead, introduce a new ReadOnlyGzip mode and use that where needed --- apt-pkg/acquire-item.cc | 4 ++-- apt-pkg/contrib/fileutl.cc | 14 +++++++++----- apt-pkg/contrib/fileutl.h | 2 +- apt-pkg/deb/debindexfile.cc | 6 +++--- apt-pkg/deb/debrecords.cc | 2 +- apt-pkg/deb/debsrcrecords.h | 2 +- cmdline/apt-cache.cc | 2 +- debian/changelog | 10 +++++++--- 8 files changed, 25 insertions(+), 17 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index fe81ee791..9abdb0ad0 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -228,7 +228,7 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/ ss >> ServerSha1 >> size; unsigned long const ServerSize = atol(size.c_str()); - FileFd fd(CurrentPackagesFile, FileFd::ReadOnly); + FileFd fd(CurrentPackagesFile, FileFd::ReadOnlyGzip); SHA1Summation SHA1; SHA1.AddFD(fd.Fd(), fd.Size()); string const local_sha1 = SHA1.Result(); @@ -459,7 +459,7 @@ bool pkgAcqIndexDiffs::QueueNextDiff() /*{{{*/ string FinalFile = _config->FindDir("Dir::State::lists"); FinalFile += URItoFileName(RealURI); - FileFd fd(FinalFile, FileFd::ReadOnly); + FileFd fd(FinalFile, FileFd::ReadOnlyGzip); SHA1Summation SHA1; SHA1.AddFD(fd.Fd(), fd.Size()); string local_sha1 = string(SHA1.Result()); diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 11a9e7f7b..2b91a46f7 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -604,12 +604,16 @@ bool FileFd::Open(string FileName,OpenMode Mode, unsigned long Perms) { case ReadOnly: iFd = open(FileName.c_str(),O_RDONLY); + break; + + case ReadOnlyGzip: + iFd = open(FileName.c_str(),O_RDONLY); if (iFd > 0 && FileName.compare(FileName.size()-3, 3, ".gz") == 0) { - gz = gzdopen (iFd, "r"); - if (gz == NULL) { - close (iFd); - iFd = -1; - } + gz = gzdopen (iFd, "r"); + if (gz == NULL) { + close (iFd); + iFd = -1; + } } break; diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 9925bbed4..c4b282126 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -41,7 +41,7 @@ class FileFd gzFile gz; public: - enum OpenMode {ReadOnly,WriteEmpty,WriteExists,WriteAny,WriteTemp}; + enum OpenMode {ReadOnly,WriteEmpty,WriteExists,WriteAny,WriteTemp,ReadOnlyGzip}; inline bool Read(void *To,unsigned long Size,bool AllowEof) { diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index 9832329c0..7d7bd09fb 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -273,7 +273,7 @@ unsigned long debPackagesIndex::Size() const bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const { string PackageFile = IndexFile("Packages"); - FileFd Pkg(PackageFile,FileFd::ReadOnly); + FileFd Pkg(PackageFile,FileFd::ReadOnlyGzip); debListParser Parser(&Pkg); if (_error->PendingError() == true) return _error->Error("Problem opening %s",PackageFile.c_str()); @@ -464,7 +464,7 @@ bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const string TranslationFile = IndexFile(Language); if (TranslationsAvailable() && FileExists(TranslationFile)) { - FileFd Trans(TranslationFile,FileFd::ReadOnly); + FileFd Trans(TranslationFile,FileFd::ReadOnlyGzip); debListParser TransParser(&Trans); if (_error->PendingError() == true) return false; @@ -544,7 +544,7 @@ unsigned long debStatusIndex::Size() const /* */ bool debStatusIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const { - FileFd Pkg(File,FileFd::ReadOnly); + FileFd Pkg(File,FileFd::ReadOnlyGzip); if (_error->PendingError() == true) return false; debListParser Parser(&Pkg); diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc index 34ef0d8f2..ec9e395ef 100644 --- a/apt-pkg/deb/debrecords.cc +++ b/apt-pkg/deb/debrecords.cc @@ -19,7 +19,7 @@ // --------------------------------------------------------------------- /* */ debRecordParser::debRecordParser(string FileName,pkgCache &Cache) : - File(FileName,FileFd::ReadOnly), + File(FileName,FileFd::ReadOnlyGzip), Tags(&File, std::max(Cache.Head().MaxVerFileSize, Cache.Head().MaxDescFileSize) + 200) { diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h index c39d78bae..905264daa 100644 --- a/apt-pkg/deb/debsrcrecords.h +++ b/apt-pkg/deb/debsrcrecords.h @@ -48,7 +48,7 @@ class debSrcRecordParser : public pkgSrcRecords::Parser virtual bool Files(vector<pkgSrcRecords::File> &F); debSrcRecordParser(string const &File,pkgIndexFile const *Index) - : Parser(Index), Fd(File,FileFd::ReadOnly), Tags(&Fd,102400), + : Parser(Index), Fd(File,FileFd::ReadOnlyGzip), Tags(&Fd,102400), Buffer(0), BufSize(0) {} ~debSrcRecordParser(); }; diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 3f68579cc..2b47184f9 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1220,7 +1220,7 @@ bool DisplayRecord(pkgCache::VerIterator V) if (I.IsOk() == false) return _error->Error(_("Package file %s is out of sync."),I.FileName()); - FileFd PkgF(I.FileName(),FileFd::ReadOnly); + FileFd PkgF(I.FileName(),FileFd::ReadOnlyGzip); if (_error->PendingError() == true) return false; diff --git a/debian/changelog b/debian/changelog index e44d7986d..f3f2d3df4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,13 +9,17 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low - Make DEB_BUILD_OPTIONS=noopt actually work by passing the right CXXFLAGS. * apt-pkg/contrib/fileutl.{h,cc}: - - Add support for transparent reading of gzipped files. + - Add support for reading of gzipped files with the new "ReadOnlyGzip" + OpenMode. - Link against zlib (in apt-pkg/makefile) and add zlib build dependency. - [ABI BREAK] This adds a new private member to FileFd, but its - initialization is in the public header file. This also changes the - behaviour of FileFd for reading gzipped files. + initialization is in the public header file. * configure.in: - Check for zlib library and headers. + * apt-pkg/acquire-item.cc, apt-pkg/deb/debindexfile.cc, + apt-pkg/deb/debrecords.cc, apt-pkg/deb/debsrcrecords.h, + cmdline/apt-cache.cc: + - Open Packages, Sources, and Translations indexes in "ReadOnlyGzip" mode. * apt-pkg/deb/debindexfile.cc: - If we do not find uncompressed package/source/translation indexes, look for gzip compressed ones. -- cgit v1.2.3 From c19625e7dc99caea960c91b1ce6dc999ec6f4ed4 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 24 Jun 2010 21:27:59 +0200 Subject: test-indexes.sh: Test handling of local file:// archives --- test/test-indexes.sh | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/test/test-indexes.sh b/test/test-indexes.sh index 916532183..b0ae4dcd4 100755 --- a/test/test-indexes.sh +++ b/test/test-indexes.sh @@ -21,6 +21,7 @@ DEBUG="" #DEBUG="-o Debug::pkgAcquire=true" APT_GET="$BUILDDIR/bin/apt-get $OPTS $DEBUG" APT_CACHE="$BUILDDIR/bin/apt-cache $OPTS $DEBUG" +APT_FTPARCHIVE="$BUILDDIR/bin/apt-ftparchive" [ -x "$BUILDDIR/bin/apt-get" ] || { echo "please build the tree first" >&2 @@ -79,9 +80,9 @@ check_cache() { # again (with cache) $APT_CACHE show $TEST_PKG | grep -q ^Version: rm var/cache/apt/*.bin - $APT_CACHE policy $TEST_PKG | grep -q '500 http://' + $APT_CACHE policy $TEST_PKG | egrep -q '500 (http://|file:/)' # again (with cache) - $APT_CACHE policy $TEST_PKG | grep -q '500 http://' + $APT_CACHE policy $TEST_PKG | egrep -q '500 (http://|file:/)' TEST_SRC=`$APT_CACHE show $TEST_PKG | grep ^Source: | awk '{print $2}'` rm var/cache/apt/*.bin @@ -131,7 +132,7 @@ echo "deb-src $TEST_SOURCE" >> etc/apt/sources.list # specifying -o RootDir at the command line does not work for # etc/apt/apt.conf.d/ since it is parsed after pkgInitConfig(); $APT_CONFIG is # checked first, so this works -echo 'RootDir ".";' > apt_config +echo "RootDir \"$WORKDIR\";" > apt_config export APT_CONFIG=`pwd`/apt_config echo "===== uncompressed indexes =====" @@ -190,4 +191,34 @@ $APT_GET -o Acquire::PDiffs=true update check_indexes compressed check_cache +rm etc/apt/apt.conf.d/02compress-indexes + +echo "==== apt-ftparchive ====" +mkdir arch +$APT_GET install -d $TEST_PKG +cp var/cache/apt/archives/$TEST_PKG*.deb arch/ +cd arch +$APT_GET source -d $TEST_PKG >/dev/null 2>&1 +$APT_FTPARCHIVE packages . | gzip -9 > Packages.gz +$APT_FTPARCHIVE sources . | gzip -9 > Sources.gz +cd .. + +echo "deb file://$WORKDIR/arch / +deb-src file://$WORKDIR/arch /" > etc/apt/sources.list +$APT_GET clean + +echo "==== uncompressed indexes from local file:// archive ====" +echo "--- apt-get update" +$APT_GET update +check_indexes +check_cache +check_get_source + +echo "==== compressed indexes from local file:// archive ====" +echo "--- apt-get update" +$APT_GET -o Acquire::GzipIndexes=true update +check_indexes compressed +check_cache +check_get_source + echo "===== ALL TESTS PASSED =====" -- cgit v1.2.3 From 7aeee3653d7d0dc34769bb74a2bf4824b438834f Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 24 Jun 2010 22:43:07 +0200 Subject: apt-pkg/acquire-item.cc: Fix handling of local (file:/) sources --- apt-pkg/acquire-item.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 9abdb0ad0..a506aa9aa 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -757,7 +757,7 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash, string decompProg; // If we enable compressed indexes and already have gzip, keep it - if (_config->FindB("Acquire::GzipIndexes",false) && compExt == "gz") { + if (_config->FindB("Acquire::GzipIndexes",false) && compExt == "gz" && !Local) { string FinalFile = _config->FindDir("Dir::State::lists"); FinalFile += URItoFileName(RealURI) + ".gz"; //if(Debug) -- cgit v1.2.3 From 9a3a552a2859040ffc587a4e5d8d96311038e680 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Thu, 24 Jun 2010 22:59:48 +0200 Subject: test-indexes.sh: EXFAIL: file:/ URIs currently decompress even with the GzipIndexes option; not a big deal for now --- test/test-indexes.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/test-indexes.sh b/test/test-indexes.sh index b0ae4dcd4..dad3e1fb2 100755 --- a/test/test-indexes.sh +++ b/test/test-indexes.sh @@ -217,7 +217,9 @@ check_get_source echo "==== compressed indexes from local file:// archive ====" echo "--- apt-get update" $APT_GET -o Acquire::GzipIndexes=true update -check_indexes compressed +# EXFAIL: file:/ URIs currently decompress even with above option +#check_indexes compressed +check_indexes check_cache check_get_source -- cgit v1.2.3 From 98ee7cd35cf205c52b3698ee91cec76d704a3937 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 25 Jun 2010 08:01:48 +0200 Subject: * apt-pkg/contrib/error.{cc,h}: - complete rewrite but use the same API - add NOTICE and DEBUG as new types of a message --- apt-pkg/contrib/error.cc | 333 ++++++++++++++++++++++------------------------- apt-pkg/contrib/error.h | 230 +++++++++++++++++++++++++++----- debian/changelog | 5 +- 3 files changed, 360 insertions(+), 208 deletions(-) diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc index 927b7e05c..837d9e615 100644 --- a/apt-pkg/contrib/error.cc +++ b/apt-pkg/contrib/error.cc @@ -1,16 +1,15 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: error.cc,v 1.11 2002/03/26 07:38:58 jgg Exp $ /* ###################################################################### - - Global Erorr Class - Global error mechanism + + Global Error Class - Global error mechanism We use a simple STL vector to store each error record. A PendingFlag is kept which indicates when the vector contains a Sever error. - + This source is placed in the Public Domain, do with it what you will It was originally written by Jason Gunthorpe. - + ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ @@ -19,7 +18,6 @@ #include <iostream> #include <errno.h> #include <stdio.h> -#include <stdarg.h> #include <unistd.h> #include <string> @@ -28,209 +26,188 @@ #include "config.h" /*}}}*/ -using namespace std; - // Global Error Object /*{{{*/ /* If the implementation supports posix threads then the accessor function is compiled to be thread safe otherwise a non-safe version is used. A Per-Thread error object is maintained in much the same manner as libc manages errno */ #if defined(_POSIX_THREADS) && defined(HAVE_PTHREAD) - #include <pthread.h> - - static pthread_key_t ErrorKey; - static void ErrorDestroy(void *Obj) {delete (GlobalError *)Obj;}; - static void KeyAlloc() {pthread_key_create(&ErrorKey,ErrorDestroy);}; - - GlobalError *_GetErrorObj() - { - static pthread_once_t Once = PTHREAD_ONCE_INIT; - pthread_once(&Once,KeyAlloc); - - void *Res = pthread_getspecific(ErrorKey); - if (Res == 0) - pthread_setspecific(ErrorKey,Res = new GlobalError); - return (GlobalError *)Res; - } + #include <pthread.h> + + static pthread_key_t ErrorKey; + static void ErrorDestroy(void *Obj) {delete (GlobalError *)Obj;}; + static void KeyAlloc() {pthread_key_create(&ErrorKey,ErrorDestroy);}; + + GlobalError *_GetErrorObj() { + static pthread_once_t Once = PTHREAD_ONCE_INIT; + pthread_once(&Once,KeyAlloc); + + void *Res = pthread_getspecific(ErrorKey); + if (Res == 0) + pthread_setspecific(ErrorKey,Res = new GlobalError); + return (GlobalError *)Res; + } #else - GlobalError *_GetErrorObj() - { - static GlobalError *Obj = new GlobalError; - return Obj; - } + GlobalError *_GetErrorObj() { + static GlobalError *Obj = new GlobalError; + return Obj; + } #endif /*}}}*/ - // GlobalError::GlobalError - Constructor /*{{{*/ -// --------------------------------------------------------------------- -/* */ -GlobalError::GlobalError() : List(0), PendingFlag(false) -{ +GlobalError::GlobalError() : PendingFlag(false) {} + /*}}}*/ +// GlobalError::FatalE - Get part of the error string from errno /*{{{*/ +bool GlobalError::FatalE(const char *Function,const char *Description,...) { + va_list args; + va_start(args,Description); + return InsertErrno(FATAL, Function, Description, args); } /*}}}*/ // GlobalError::Errno - Get part of the error string from errno /*{{{*/ -// --------------------------------------------------------------------- -/* Function indicates the stdlib function that failed and Description is - a user string that leads the text. Form is: - Description - Function (errno: strerror) - Carefull of the buffer overrun, sprintf. - */ -bool GlobalError::Errno(const char *Function,const char *Description,...) -{ - va_list args; - va_start(args,Description); - - // sprintf the description - char S[400]; - vsnprintf(S,sizeof(S),Description,args); - snprintf(S + strlen(S),sizeof(S) - strlen(S), - " - %s (%i: %s)",Function,errno,strerror(errno)); - - // Put it on the list - Item *Itm = new Item; - Itm->Text = S; - Itm->Error = true; - Insert(Itm); - - PendingFlag = true; - - return false; +bool GlobalError::Errno(const char *Function,const char *Description,...) { + va_list args; + va_start(args,Description); + return InsertErrno(ERROR, Function, Description, args); } /*}}}*/ -// GlobalError::WarningE - Get part of the warn string from errno /*{{{*/ -// --------------------------------------------------------------------- -/* Function indicates the stdlib function that failed and Description is - a user string that leads the text. Form is: - Description - Function (errno: strerror) - Carefull of the buffer overrun, sprintf. - */ -bool GlobalError::WarningE(const char *Function,const char *Description,...) -{ - va_list args; - va_start(args,Description); - - // sprintf the description - char S[400]; - vsnprintf(S,sizeof(S),Description,args); - snprintf(S + strlen(S),sizeof(S) - strlen(S), - " - %s (%i: %s)",Function,errno,strerror(errno)); - - // Put it on the list - Item *Itm = new Item; - Itm->Text = S; - Itm->Error = false; - Insert(Itm); - - return false; +// GlobalError::WarningE - Get part of the warning string from errno /*{{{*/ +bool GlobalError::WarningE(const char *Function,const char *Description,...) { + va_list args; + va_start(args,Description); + return InsertErrno(WARNING, Function, Description, args); +} + /*}}}*/ +// GlobalError::NoticeE - Get part of the notice string from errno /*{{{*/ +bool GlobalError::NoticeE(const char *Function,const char *Description,...) { + va_list args; + va_start(args,Description); + return InsertErrno(NOTICE, Function, Description, args); +} + /*}}}*/ +// GlobalError::DebugE - Get part of the debug string from errno /*{{{*/ +bool GlobalError::DebugE(const char *Function,const char *Description,...) { + va_list args; + va_start(args,Description); + return InsertErrno(DEBUG, Function, Description, args); +} + /*}}}*/ +// GlobalError::InsertErrno - formats an error message with the errno /*{{{*/ +bool GlobalError::InsertErrno(MsgType type, const char* Function, + const char* Description, va_list const &args) { + char S[400]; + vsnprintf(S,sizeof(S),Description,args); + snprintf(S + strlen(S),sizeof(S) - strlen(S), + " - %s (%i: %s)", Function, errno, strerror(errno)); + return Insert(type, S, args); +} + /*}}}*/ +// GlobalError::Fatal - Add a fatal error to the list /*{{{*/ +bool GlobalError::Fatal(const char *Description,...) { + va_list args; + va_start(args,Description); + return Insert(FATAL, Description, args); } /*}}}*/ // GlobalError::Error - Add an error to the list /*{{{*/ -// --------------------------------------------------------------------- -/* Just vsprintfs and pushes */ -bool GlobalError::Error(const char *Description,...) -{ - va_list args; - va_start(args,Description); - - // sprintf the description - char S[400]; - vsnprintf(S,sizeof(S),Description,args); - - // Put it on the list - Item *Itm = new Item; - Itm->Text = S; - Itm->Error = true; - Insert(Itm); - - PendingFlag = true; - - return false; +bool GlobalError::Error(const char *Description,...) { + va_list args; + va_start(args,Description); + return Insert(ERROR, Description, args); } /*}}}*/ // GlobalError::Warning - Add a warning to the list /*{{{*/ -// --------------------------------------------------------------------- -/* This doesn't set the pending error flag */ -bool GlobalError::Warning(const char *Description,...) +bool GlobalError::Warning(const char *Description,...) { + va_list args; + va_start(args,Description); + return Insert(WARNING, Description, args); +} + /*}}}*/ +// GlobalError::Notice - Add a notice to the list /*{{{*/ +bool GlobalError::Notice(const char *Description,...) { - va_list args; - va_start(args,Description); - - // sprintf the description - char S[400]; - vsnprintf(S,sizeof(S),Description,args); - - // Put it on the list - Item *Itm = new Item; - Itm->Text = S; - Itm->Error = false; - Insert(Itm); - - return false; + va_list args; + va_start(args,Description); + return Insert(NOTICE, Description, args); } /*}}}*/ -// GlobalError::PopMessage - Pulls a single message out /*{{{*/ -// --------------------------------------------------------------------- -/* This should be used in a loop checking empty() each cycle. It returns - true if the message is an error. */ -bool GlobalError::PopMessage(string &Text) +// GlobalError::Debug - Add a debug to the list /*{{{*/ +bool GlobalError::Debug(const char *Description,...) { - if (List == 0) - return false; - - bool Ret = List->Error; - Text = List->Text; - Item *Old = List; - List = List->Next; - delete Old; - - // This really should check the list to see if only warnings are left.. - if (List == 0) - PendingFlag = false; - - return Ret; + va_list args; + va_start(args,Description); + return Insert(DEBUG, Description, args); +} + /*}}}*/ +// GlobalError::Insert - Insert a new item at the end /*{{{*/ +bool GlobalError::Insert(MsgType type, const char* Description, + va_list const &args) { + char S[400]; + vsnprintf(S,sizeof(S),Description,args); + + Item const m(S, type); + Messages.push_back(m); + + if (type == ERROR || type == FATAL) + PendingFlag = true; + + if (type == FATAL || type == DEBUG) + std::clog << m << std::endl; + + return false; +} + /*}}}*/ +// GlobalError::PopMessage - Pulls a single message out /*{{{*/ +bool GlobalError::PopMessage(std::string &Text) { + if (Messages.empty() == true) + return false; + + Item const msg = Messages.front(); + Messages.pop_front(); + + bool const Ret = (msg.Type == ERROR || msg.Type == FATAL); + Text = msg.Text; + if (PendingFlag == false || Ret == false) + return Ret; + + // check if another error message is pending + for (std::list<Item>::const_iterator m = Messages.begin(); + m != Messages.end(); m++) + if (m->Type == ERROR || m->Type == FATAL) + return Ret; + + PendingFlag = false; + return Ret; } /*}}}*/ // GlobalError::DumpErrors - Dump all of the errors/warns to cerr /*{{{*/ -// --------------------------------------------------------------------- -/* */ -void GlobalError::DumpErrors() -{ - // Print any errors or warnings found - string Err; - while (empty() == false) - { - bool Type = PopMessage(Err); - if (Type == true) - cerr << "E: " << Err << endl; - else - cerr << "W: " << Err << endl; - } +void GlobalError::DumpErrors(std::ostream &out, MsgType const &trashhold) { + for (std::list<Item>::const_iterator m = Messages.begin(); + m != Messages.end(); m++) + if (m->Type >= trashhold) + out << (*m) << std::endl; + Discard(); } /*}}}*/ -// GlobalError::Discard - Discard /*{{{*/ -// --------------------------------------------------------------------- -/* */ -void GlobalError::Discard() -{ - while (List != 0) - { - Item *Old = List; - List = List->Next; - delete Old; - } - - PendingFlag = false; +// GlobalError::Discard - Discard /*{{{*/ +void GlobalError::Discard() { + Messages.clear(); + PendingFlag = false; }; /*}}}*/ -// GlobalError::Insert - Insert a new item at the end /*{{{*/ -// --------------------------------------------------------------------- -/* */ -void GlobalError::Insert(Item *Itm) -{ - Item **End = &List; - for (Item *I = List; I != 0; I = I->Next) - End = &I->Next; - Itm->Next = *End; - *End = Itm; +// GlobalError::empty - does our error list include anything? /*{{{*/ +bool GlobalError::empty(MsgType const &trashhold) const { + if (PendingFlag == true) + return false; + + if (Messages.empty() == true) + return true; + + for (std::list<Item>::const_iterator m = Messages.begin(); + m != Messages.end(); m++) + if (m->Type >= trashhold) + return false; + + return true; } /*}}}*/ diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index 8d5ec05ea..fc7b38f1b 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -42,43 +42,215 @@ #include <apt-pkg/macros.h> +#include <iostream> +#include <list> #include <string> -class GlobalError +#include <stdarg.h> + +class GlobalError /*{{{*/ { - struct Item - { - std::string Text; - bool Error; - Item *Next; - }; - - Item *List; - bool PendingFlag; - void Insert(Item *I); - - public: +public: /*{{{*/ + /** \brief a message can have one of following severity */ + enum MsgType { + /** \brief Message will be printed instantly as it is likely that + this error will lead to a complete crash */ + FATAL = 40, + /** \brief An error does hinder the correct execution and should be corrected */ + ERROR = 30, + /** \brief indicates problem that can lead to errors later on */ + WARNING = 20, + /** \brief deprecation warnings, old fallback behavior, … */ + NOTICE = 10, + /** \brief for developers only in areas it is hard to print something directly */ + DEBUG = 0 + }; - // Call to generate an error from a library call. - bool Errno(const char *Function,const char *Description,...) __like_printf(3) __cold; - bool WarningE(const char *Function,const char *Description,...) __like_printf(3) __cold; + /** \brief add a fatal error message with errno to the list + * + * \param Function name of the function generating the error + * \param Description format string for the error message + * + * \return \b false + */ + bool FatalE(const char *Function,const char *Description,...) __like_printf(3) __cold; - /* A warning should be considered less severe than an error, and may be - ignored by the client. */ - bool Error(const char *Description,...) __like_printf(2) __cold; - bool Warning(const char *Description,...) __like_printf(2) __cold; + /** \brief add an Error message with errno to the list + * + * \param Function name of the function generating the error + * \param Description format string for the error message + * + * \return \b false + */ + bool Errno(const char *Function,const char *Description,...) __like_printf(3) __cold; - // Simple accessors - inline bool PendingError() {return PendingFlag;}; - inline bool empty() {return List == 0;}; - bool PopMessage(std::string &Text); - void Discard(); + /** \brief add a warning message with errno to the list + * + * A warning should be considered less severe than an error and + * may be ignored by the client. + * + * \param Function Name of the function generates the warning. + * \param Description Format string for the warning message. + * + * \return \b false + */ + bool WarningE(const char *Function,const char *Description,...) __like_printf(3) __cold; - // Usefull routine to dump to cerr - void DumpErrors(); - - GlobalError(); + /** \brief add a notice message with errno to the list + * + * \param Function name of the function generating the error + * \param Description format string for the error message + * + * \return \b false + */ + bool NoticeE(const char *Function,const char *Description,...) __like_printf(3) __cold; + + /** \brief add a debug message with errno to the list + * + * \param Function name of the function generating the error + * \param Description format string for the error message + * + * \return \b false + */ + bool DebugE(const char *Function,const char *Description,...) __like_printf(3) __cold; + + /** \brief add an fatal error message to the list + * + * Most of the stuff we consider as "error" is also "fatal" for + * the user as the application will not have the expected result, + * but a fatal message here means that it gets printed directly + * to stderr in addiction to adding it to the list as the error + * leads sometimes to crashes and a maybe duplicated message + * is better than "Segfault" as the only displayed text + * + * \param Description Format string for the fatal error message. + * + * \return \b false + */ + bool Fatal(const char *Description,...) __like_printf(2) __cold; + + /** \brief add an Error message to the list + * + * \param Description Format string for the error message. + * + * \return \b false + */ + bool Error(const char *Description,...) __like_printf(2) __cold; + + /** \brief add a warning message to the list + * + * A warning should be considered less severe than an error and + * may be ignored by the client. + * + * \param Description Format string for the message + * + * \return \b false + */ + bool Warning(const char *Description,...) __like_printf(2) __cold; + + /** \brief add a notice message to the list + * + * A notice should be considered less severe than an error or a + * warning and can be ignored by the client without further problems + * for some times, but he should consider fixing the problem. + * This error type can be used for e.g. deprecation warnings of options. + * + * \param Description Format string for the message + * + * \return \b false + */ + bool Notice(const char *Description,...) __like_printf(2) __cold; + + /** \brief add a debug message to the list + * + * \param Description Format string for the message + * + * \return \b false + */ + bool Debug(const char *Description,...) __like_printf(2) __cold; + + /** \brief is an error in the list? + * + * \return \b true if an error is included in the list, \b false otherwise + */ + inline bool PendingError() const {return PendingFlag;}; + + /** \brief is the list empty? + * + * The default checks if the list is empty or contains only notices, + * if you want to check if also no notices happend set the parameter + * flag to \b false. + * + * \param WithoutNotice does notices count, default is \b true, so no + * + * \return \b true if an the list is empty, \b false otherwise + */ + bool empty(MsgType const &trashhold = WARNING) const; + + /** \brief returns and removes the first (or last) message in the list + * + * \param[out] Text message of the first/last item + * + * \return \b true if the message was an error, \b false otherwise + */ + bool PopMessage(std::string &Text); + + /** \brief clears the list of messages */ + void Discard(); + + /** \brief outputs the list of messages to the given stream + * + * Note that all messages are discarded, also the notices + * displayed or not. + * + * \param[out] out output stream to write the messages in + * \param WithoutNotice output notices or not + */ + void DumpErrors(std::ostream &out, MsgType const &trashhold = WARNING); + + /** \brief dumps the list of messages to std::cerr + * + * Note that all messages are discarded, also the notices + * displayed or not. + * + * \param WithoutNotice print notices or not + */ + void inline DumpErrors(MsgType const &trashhold = WARNING) { + DumpErrors(std::cerr, trashhold); + } + + GlobalError(); + /*}}}*/ +private: /*{{{*/ + struct Item { + std::string Text; + MsgType Type; + + Item(char const *Text, MsgType const &Type) : + Text(Text), Type(Type) {}; + + friend std::ostream& operator<< (std::ostream &out, Item i) { + switch(i.Type) { + case FATAL: + case ERROR: out << "E"; break; + case WARNING: out << "W"; break; + case NOTICE: out << "N"; break; + case DEBUG: out << "D"; break; + } + return out << ": " << i.Text; + } + }; + + std::list<Item> Messages; + bool PendingFlag; + + bool InsertErrno(MsgType type, const char* Function, + const char* Description, va_list const &args); + bool Insert(MsgType type, const char* Description, + va_list const &args); + /*}}}*/ }; + /*}}}*/ // The 'extra-ansi' syntax is used to help with collisions. GlobalError *_GetErrorObj(); diff --git a/debian/changelog b/debian/changelog index 00877eefb..3e7b16d62 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,8 +16,11 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low * apt-pkg/depcache.cc: - SetCandidateVer for all pseudo packages - SetReInstall for the "all" package of a pseudo package + * apt-pkg/contrib/error.{cc,h}: + - complete rewrite but use the same API + - add NOTICE and DEBUG as new types of a message - -- David Kalnischkies <kalnischkies@gmail.com> Thu, 10 Jun 2010 16:36:58 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Fri, 25 Jun 2010 08:01:14 +0200 apt (0.7.26~exp7) experimental; urgency=low -- cgit v1.2.3 From c4ba7c44ff03d67ff982bbab26dc48d796041e02 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 25 Jun 2010 19:16:12 +0200 Subject: add a simple stack handling to be able to delay error handling --- apt-pkg/contrib/error.cc | 32 ++++++++++++++++- apt-pkg/contrib/error.h | 35 ++++++++++++++++++- debian/changelog | 3 +- test/libapt/globalerror_test.cc | 77 +++++++++++++++++++++++++++++++++++++++++ test/libapt/makefile | 10 ++++-- 5 files changed, 152 insertions(+), 5 deletions(-) create mode 100644 test/libapt/globalerror_test.cc diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc index 837d9e615..8cee21c9c 100644 --- a/apt-pkg/contrib/error.cc +++ b/apt-pkg/contrib/error.cc @@ -181,7 +181,13 @@ bool GlobalError::PopMessage(std::string &Text) { } /*}}}*/ // GlobalError::DumpErrors - Dump all of the errors/warns to cerr /*{{{*/ -void GlobalError::DumpErrors(std::ostream &out, MsgType const &trashhold) { +void GlobalError::DumpErrors(std::ostream &out, MsgType const &trashhold, + bool const &mergeStack) { + if (mergeStack == true) + for (std::list<MsgStack>::const_reverse_iterator s = Stacks.rbegin(); + s != Stacks.rend(); ++s) + Messages.insert(Messages.begin(), s->Messages.begin(), s->Messages.end()); + for (std::list<Item>::const_iterator m = Messages.begin(); m != Messages.end(); m++) if (m->Type >= trashhold) @@ -211,3 +217,27 @@ bool GlobalError::empty(MsgType const &trashhold) const { return true; } /*}}}*/ +// GlobalError::PushToStack /*{{{*/ +void GlobalError::PushToStack() { + MsgStack pack(Messages, PendingFlag); + Stacks.push_back(pack); + Discard(); +} + /*}}}*/ +// GlobalError::RevertToStack /*{{{*/ +void GlobalError::RevertToStack() { + Discard(); + MsgStack pack = Stacks.back(); + Messages = pack.Messages; + PendingFlag = pack.PendingFlag; + Stacks.pop_back(); +} + /*}}}*/ +// GlobalError::MergeWithStack /*{{{*/ +void GlobalError::MergeWithStack() { + MsgStack pack = Stacks.back(); + Messages.insert(Messages.begin(), pack.Messages.begin(), pack.Messages.end()); + PendingFlag = PendingFlag || pack.PendingFlag; + Stacks.pop_back(); +} + /*}}}*/ diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index fc7b38f1b..73735162d 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -206,7 +206,8 @@ public: /*{{{*/ * \param[out] out output stream to write the messages in * \param WithoutNotice output notices or not */ - void DumpErrors(std::ostream &out, MsgType const &trashhold = WARNING); + void DumpErrors(std::ostream &out, MsgType const &trashhold = WARNING, + bool const &mergeStack = true); /** \brief dumps the list of messages to std::cerr * @@ -219,6 +220,28 @@ public: /*{{{*/ DumpErrors(std::cerr, trashhold); } + /** \brief put the current Messages into the stack + * + * All "old" messages will be pushed into a stack to + * them later back, but for now the Message query will be + * empty and performs as no messages were present before. + * + * The stack can be as deep as you want - all stack operations + * will only operate on the last element in the stack. + */ + void PushToStack(); + + /** \brief throw away all current messages */ + void RevertToStack(); + + /** \brief merge current and stack together */ + void MergeWithStack(); + + /** \brief return the deep of the stack */ + size_t StackCount() const { + return Stacks.size(); + } + GlobalError(); /*}}}*/ private: /*{{{*/ @@ -244,6 +267,16 @@ private: /*{{{*/ std::list<Item> Messages; bool PendingFlag; + struct MsgStack { + std::list<Item> const Messages; + bool const PendingFlag; + + MsgStack(std::list<Item> const &Messages, bool const &Pending) : + Messages(Messages), PendingFlag(Pending) {}; + }; + + std::list<MsgStack> Stacks; + bool InsertErrno(MsgType type, const char* Function, const char* Description, va_list const &args); bool Insert(MsgType type, const char* Description, diff --git a/debian/changelog b/debian/changelog index 3e7b16d62..46e371165 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,8 +19,9 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low * apt-pkg/contrib/error.{cc,h}: - complete rewrite but use the same API - add NOTICE and DEBUG as new types of a message + - add a simple stack handling to be able to delay error handling - -- David Kalnischkies <kalnischkies@gmail.com> Fri, 25 Jun 2010 08:01:14 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Fri, 25 Jun 2010 19:15:21 +0200 apt (0.7.26~exp7) experimental; urgency=low diff --git a/test/libapt/globalerror_test.cc b/test/libapt/globalerror_test.cc new file mode 100644 index 000000000..b2752255f --- /dev/null +++ b/test/libapt/globalerror_test.cc @@ -0,0 +1,77 @@ +#include <apt-pkg/error.h> + +#include "assert.h" +#include <string> + +int main(int argc,char *argv[]) +{ + equals(_error->empty(), true); + equals(_error->PendingError(), false); + equals(_error->Notice("%s Notice", "A"), false); + equals(_error->empty(), true); + equals(_error->empty(GlobalError::DEBUG), false); + equals(_error->PendingError(), false); + equals(_error->Error("%s horrible %s %d times", "Something", "happend", 2), false); + equals(_error->PendingError(), true); + std::string text; + equals(_error->PopMessage(text), false); + equals(_error->PendingError(), true); + equals(text, "A Notice"); + equals(_error->PopMessage(text), true); + equals(text, "Something horrible happend 2 times"); + equals(_error->empty(GlobalError::DEBUG), true); + equals(_error->PendingError(), false); + equals(_error->Error("%s horrible %s %d times", "Something", "happend", 2), false); + equals(_error->PendingError(), true); + equals(_error->empty(GlobalError::FATAL), false); + _error->Discard(); + + equals(_error->empty(), true); + equals(_error->PendingError(), false); + equals(_error->Notice("%s Notice", "A"), false); + equals(_error->Error("%s horrible %s %d times", "Something", "happend", 2), false); + equals(_error->PendingError(), true); + equals(_error->empty(GlobalError::NOTICE), false); + _error->PushToStack(); + equals(_error->empty(GlobalError::NOTICE), true); + equals(_error->PendingError(), false); + equals(_error->Warning("%s Warning", "A"), false); + equals(_error->empty(GlobalError::ERROR), true); + equals(_error->PendingError(), false); + _error->RevertToStack(); + equals(_error->empty(GlobalError::ERROR), false); + equals(_error->PendingError(), true); + equals(_error->PopMessage(text), false); + equals(_error->PendingError(), true); + equals(text, "A Notice"); + equals(_error->PopMessage(text), true); + equals(text, "Something horrible happend 2 times"); + equals(_error->PendingError(), false); + equals(_error->empty(), true); + + equals(_error->Notice("%s Notice", "A"), false); + equals(_error->Error("%s horrible %s %d times", "Something", "happend", 2), false); + equals(_error->PendingError(), true); + equals(_error->empty(GlobalError::NOTICE), false); + _error->PushToStack(); + equals(_error->empty(GlobalError::NOTICE), true); + equals(_error->PendingError(), false); + equals(_error->Warning("%s Warning", "A"), false); + equals(_error->empty(GlobalError::ERROR), true); + equals(_error->PendingError(), false); + _error->MergeWithStack(); + equals(_error->empty(GlobalError::ERROR), false); + equals(_error->PendingError(), true); + equals(_error->PopMessage(text), false); + equals(_error->PendingError(), true); + equals(text, "A Notice"); + equals(_error->PopMessage(text), true); + equals(text, "Something horrible happend 2 times"); + equals(_error->PendingError(), false); + equals(_error->empty(), false); + equals(_error->PopMessage(text), false); + equals(text, "A Warning"); + equals(_error->empty(), true); + + return 0; +} diff --git a/test/libapt/makefile b/test/libapt/makefile index ee3401b35..50058262e 100644 --- a/test/libapt/makefile +++ b/test/libapt/makefile @@ -30,13 +30,19 @@ SOURCE = getlistoffilesindir_test.cc include $(PROGRAM_H) # Program for testing CommandLine reconstruction -PROGRAM = commandlineasstring${BASENAME} +PROGRAM = CommandlineAsString${BASENAME} SLIBS = -lapt-pkg SOURCE = commandlineasstring_test.cc include $(PROGRAM_H) # Program for testing debians version comparing -PROGRAM = compareversion${BASENAME} +PROGRAM = CompareVersion${BASENAME} SLIBS = -lapt-pkg SOURCE = compareversion_test.cc include $(PROGRAM_H) + +# test the GlobalError stack class +PROGRAM = GlobalError${BASENAME} +SLIBS = -lapt-pkg +SOURCE = globalerror_test.cc +include $(PROGRAM_H) -- cgit v1.2.3 From 65beb5720f82845bf175e0cd80f070da21838827 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 25 Jun 2010 20:11:11 +0200 Subject: print all messages if the application is in an interactive run --- cmdline/apt-cache.cc | 12 +++++------- cmdline/apt-cdrom.cc | 12 +++++------- cmdline/apt-get.cc | 12 +++++------- 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 2332a0f13..a4ec63eed 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1876,13 +1876,11 @@ int main(int argc,const char *argv[]) /*{{{*/ CmdL.DispatchArg(CmdsB); // Print any errors or warnings found during parsing - if (_error->empty() == false) - { - bool Errors = _error->PendingError(); + bool const Errors = _error->PendingError(); + if (_config->FindI("quiet",0) > 0) _error->DumpErrors(); - return Errors == true?100:0; - } - - return 0; + else + _error->DumpErrors(GlobalError::DEBUG); + return Errors == true ? 100 : 0; } /*}}}*/ diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index 8b9eacae6..da2ffa390 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -273,13 +273,11 @@ int main(int argc,const char *argv[]) /*{{{*/ CmdL.DispatchArg(Cmds); // Print any errors or warnings found during parsing - if (_error->empty() == false) - { - bool Errors = _error->PendingError(); + bool const Errors = _error->PendingError(); + if (_config->FindI("quiet",0) > 0) _error->DumpErrors(); - return Errors == true?100:0; - } - - return 0; + else + _error->DumpErrors(GlobalError::DEBUG); + return Errors == true ? 100 : 0; } /*}}}*/ diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 6a7d7a448..605eedb0f 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2920,13 +2920,11 @@ int main(int argc,const char *argv[]) /*{{{*/ CmdL.DispatchArg(Cmds); // Print any errors or warnings found during parsing - if (_error->empty() == false) - { - bool Errors = _error->PendingError(); + bool const Errors = _error->PendingError(); + if (_config->FindI("quiet",0) > 0) _error->DumpErrors(); - return Errors == true?100:0; - } - - return 0; + else + _error->DumpErrors(GlobalError::DEBUG); + return Errors == true ? 100 : 0; } /*}}}*/ -- cgit v1.2.3 From 9f9717fa6bca13817cf9cf84d513e59d258af154 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 26 Jun 2010 09:03:26 +0200 Subject: * apt-pkg/aptconfiguration.cc: - show a deprecation notice for APT::Acquire::Translation --- apt-pkg/aptconfiguration.cc | 4 ++++ debian/changelog | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 0c050d9dc..44f1f318a 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -10,6 +10,7 @@ // Include Files /*{{{*/ #include <apt-pkg/aptconfiguration.h> #include <apt-pkg/configuration.h> +#include <apt-pkg/error.h> #include <apt-pkg/fileutl.h> #include <apt-pkg/macros.h> #include <apt-pkg/strutl.h> @@ -196,6 +197,9 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All, // it was undocumented and so it should be not very widthly used string const oldAcquire = _config->Find("APT::Acquire::Translation",""); if (oldAcquire.empty() == false && oldAcquire != "environment") { + // TRANSLATORS: the two %s are APT configuration options + _error->Notice("Option '%s' is deprecated. Please use '%s' instead, see 'man 5 apt.conf' for details.", + "APT::Acquire::Translation", "Acquire::Languages"); if (oldAcquire != "none") codes.push_back(oldAcquire); codes.push_back("en"); diff --git a/debian/changelog b/debian/changelog index 46e371165..06bde48fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,8 +20,10 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low - complete rewrite but use the same API - add NOTICE and DEBUG as new types of a message - add a simple stack handling to be able to delay error handling + * apt-pkg/aptconfiguration.cc: + - show a deprecation notice for APT::Acquire::Translation - -- David Kalnischkies <kalnischkies@gmail.com> Fri, 25 Jun 2010 19:15:21 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Sat, 26 Jun 2010 09:01:40 +0200 apt (0.7.26~exp7) experimental; urgency=low -- cgit v1.2.3 From 1f2933a8de0f3a26f51b4a0a2112cbdfd4461e9b Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 26 Jun 2010 13:29:24 +0200 Subject: - use the new MatchAgainstConfig for the DefaultRootSetFunc * apt-pkg/contrib/configuration.{cc,h}: - add a wrapper to match strings against configurable regex patterns --- apt-pkg/contrib/configuration.cc | 43 +++++++++++++++++++++++++++++++++++ apt-pkg/contrib/configuration.h | 19 +++++++++++++++- apt-pkg/depcache.cc | 48 ---------------------------------------- apt-pkg/depcache.h | 22 +++++------------- debian/changelog | 5 ++++- 5 files changed, 71 insertions(+), 66 deletions(-) diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 9129d92f0..81cc87d15 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -843,3 +843,46 @@ bool ReadConfigDir(Configuration &Conf,const string &Dir, return true; } /*}}}*/ +// MatchAgainstConfig Constructor /*{{{*/ +Configuration::MatchAgainstConfig::MatchAgainstConfig(char const * Config) +{ + std::vector<std::string> const strings = _config->FindVector(Config); + for (std::vector<std::string>::const_iterator s = strings.begin(); + s != strings.end(); ++s) + { + regex_t *p = new regex_t; + if (regcomp(p, s->c_str(), REG_EXTENDED | REG_ICASE | REG_NOSUB) == 0) + patterns.push_back(p); + else + { + regfree(p); + delete p; + _error->Warning("Regex compilation error for '%s' in configuration option '%s'", + s->c_str(), Config); + } + } + +} + /*}}}*/ +// MatchAgainstConfig Destructor /*{{{*/ +Configuration::MatchAgainstConfig::~MatchAgainstConfig() +{ + for(std::vector<regex_t *>::const_iterator p = patterns.begin(); + p != patterns.end(); ++p) + { + regfree(*p); + delete *p; + } +} + /*}}}*/ +// MatchAgainstConfig::Match - returns true if a pattern matches /*{{{*/ +bool Configuration::MatchAgainstConfig::Match(char const * str) const +{ + for(std::vector<regex_t *>::const_iterator p = patterns.begin(); + p != patterns.end(); ++p) + if (regexec(*p, str, 0, 0, 0) == 0) + return true; + + return false; +} + /*}}}*/ diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h index 2494c1d7c..cbe18e4e5 100644 --- a/apt-pkg/contrib/configuration.h +++ b/apt-pkg/contrib/configuration.h @@ -28,7 +28,7 @@ #ifndef PKGLIB_CONFIGURATION_H #define PKGLIB_CONFIGURATION_H - +#include <regex.h> #include <string> #include <vector> @@ -104,6 +104,23 @@ class Configuration Configuration(const Item *Root); Configuration(); ~Configuration(); + + /** \brief match a string against a configurable list of patterns */ + class MatchAgainstConfig + { + std::vector<regex_t *> patterns; + + public: + MatchAgainstConfig(char const * Config); + virtual ~MatchAgainstConfig(); + + /** \brief Returns \b true for a string matching one of the patterns */ + bool Match(char const * str) const; + bool Match(std::string const &str) const { return Match(str.c_str()); }; + + /** \brief returns if the matcher setup was successful */ + bool wasConstructedSuccessfully() const { return patterns.empty() == false; } + }; }; extern Configuration *_config; diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index d082b8404..8bca3e36e 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1635,54 +1635,6 @@ bool pkgDepCache::Policy::IsImportantDep(DepIterator Dep) else if(Dep->Type == pkgCache::Dep::Suggests) return _config->FindB("APT::Install-Suggests", false); - return false; -} - /*}}}*/ -pkgDepCache::DefaultRootSetFunc::DefaultRootSetFunc() /*{{{*/ - : constructedSuccessfully(false) -{ - Configuration::Item const *Opts; - Opts = _config->Tree("APT::NeverAutoRemove"); - if (Opts != 0 && Opts->Child != 0) - { - Opts = Opts->Child; - for (; Opts != 0; Opts = Opts->Next) - { - if (Opts->Value.empty() == true) - continue; - - regex_t *p = new regex_t; - if(regcomp(p,Opts->Value.c_str(), - REG_EXTENDED | REG_ICASE | REG_NOSUB) != 0) - { - regfree(p); - delete p; - _error->Error("Regex compilation error for APT::NeverAutoRemove"); - return; - } - - rootSetRegexp.push_back(p); - } - } - - constructedSuccessfully = true; -} - /*}}}*/ -pkgDepCache::DefaultRootSetFunc::~DefaultRootSetFunc() /*{{{*/ -{ - for(unsigned int i = 0; i < rootSetRegexp.size(); i++) - { - regfree(rootSetRegexp[i]); - delete rootSetRegexp[i]; - } -} - /*}}}*/ -bool pkgDepCache::DefaultRootSetFunc::InRootSet(const pkgCache::PkgIterator &pkg) /*{{{*/ -{ - for(unsigned int i = 0; i < rootSetRegexp.size(); i++) - if (regexec(rootSetRegexp[i], pkg.Name(), 0, 0, 0) == 0) - return true; - return false; } /*}}}*/ diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 72d7cce5d..66c099b80 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -38,11 +38,10 @@ #ifndef PKGLIB_DEPCACHE_H #define PKGLIB_DEPCACHE_H - +#include <apt-pkg/configuration.h> #include <apt-pkg/pkgcache.h> #include <apt-pkg/progress.h> - -#include <regex.h> +#include <apt-pkg/error.h> #include <vector> #include <memory> @@ -184,22 +183,13 @@ class pkgDepCache : protected pkgCache::Namespace /** \brief Returns \b true for packages matching a regular * expression in APT::NeverAutoRemove. */ - class DefaultRootSetFunc : public InRootSetFunc + class DefaultRootSetFunc : public InRootSetFunc, public Configuration::MatchAgainstConfig { - std::vector<regex_t *> rootSetRegexp; - bool constructedSuccessfully; - public: - DefaultRootSetFunc(); - ~DefaultRootSetFunc(); - - /** \return \b true if the class initialized successfully, \b - * false otherwise. Used to avoid throwing an exception, since - * APT classes generally don't. - */ - bool wasConstructedSuccessfully() const { return constructedSuccessfully; } + DefaultRootSetFunc() : Configuration::MatchAgainstConfig("APT::NeverRemove") {}; + virtual ~DefaultRootSetFunc() {}; - bool InRootSet(const pkgCache::PkgIterator &pkg); + bool InRootSet(const pkgCache::PkgIterator &pkg) { return pkg.end() == true && Match(pkg.Name()); }; }; struct StateCache diff --git a/debian/changelog b/debian/changelog index 06bde48fc..4500614a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,14 +16,17 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low * apt-pkg/depcache.cc: - SetCandidateVer for all pseudo packages - SetReInstall for the "all" package of a pseudo package + - use the new MatchAgainstConfig for the DefaultRootSetFunc * apt-pkg/contrib/error.{cc,h}: - complete rewrite but use the same API - add NOTICE and DEBUG as new types of a message - add a simple stack handling to be able to delay error handling * apt-pkg/aptconfiguration.cc: - show a deprecation notice for APT::Acquire::Translation + * apt-pkg/contrib/configuration.{cc,h}: + - add a wrapper to match strings against configurable regex patterns - -- David Kalnischkies <kalnischkies@gmail.com> Sat, 26 Jun 2010 09:01:40 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Sat, 26 Jun 2010 13:28:48 +0200 apt (0.7.26~exp7) experimental; urgency=low -- cgit v1.2.3 From 1408e219e76e577fb84ef1c48e58337b6569feec Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 26 Jun 2010 18:40:15 +0200 Subject: * apt-pkg/contrib/fileutl.cc: - show notice about ignored file instead of being always silent - add a Dir::Ignore-Files-Silently list option to control the notice * --- apt-pkg/contrib/fileutl.cc | 4 ++++ apt-pkg/init.cc | 5 +++++ debian/changelog | 6 +++++- doc/apt.conf.5.xml | 9 +++++++++ 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 16f7ce929..e95ddf562 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -281,6 +281,7 @@ std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> c } std::vector<string> List; + Configuration::MatchAgainstConfig SilentIgnore("Dir::Ignore-Files-Silently"); DIR *D = opendir(Dir.c_str()); if (D == 0) { @@ -306,6 +307,7 @@ std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> c { if (Debug == true) std::clog << "Bad file: " << Ent->d_name << " → no extension" << std::endl; + _error->Notice("Ignoring file '%s' in directory '%s' as it has no filename extension", Ent->d_name, Dir.c_str()); continue; } } @@ -313,6 +315,8 @@ std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> c { if (Debug == true) std::clog << "Bad file: " << Ent->d_name << " → bad extension »" << flExtension(Ent->d_name) << "«" << std::endl; + if (SilentIgnore.Match(Ent->d_name) == false) + _error->Notice("Ignoring file '%s' in directory '%s' as it has an invalid filename extension", Ent->d_name, Dir.c_str()); continue; } } diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 21472eb3b..7a332c86e 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -78,6 +78,11 @@ bool pkgInitConfig(Configuration &Cnf) Cnf.Set("Dir::Log::Terminal","term.log"); Cnf.Set("Dir::Log::History","history.log"); + Cnf.Set("Dir::Ignore-Files-Silently::", "~$"); + Cnf.Set("Dir::Ignore-Files-Silently::", "\\.disabled$"); + Cnf.Set("Dir::Ignore-Files-Silently::", "\\.bak$"); + Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$"); + // Translation Cnf.Set("APT::Acquire::Translation", "environment"); diff --git a/debian/changelog b/debian/changelog index 4500614a0..722e7ffc4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,8 +25,12 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low - show a deprecation notice for APT::Acquire::Translation * apt-pkg/contrib/configuration.{cc,h}: - add a wrapper to match strings against configurable regex patterns + * apt-pkg/contrib/fileutl.cc: + - show notice about ignored file instead of being always silent + - add a Dir::Ignore-Files-Silently list option to control the notice + * - -- David Kalnischkies <kalnischkies@gmail.com> Sat, 26 Jun 2010 13:28:48 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Sat, 26 Jun 2010 18:40:01 +0200 apt (0.7.26~exp7) experimental; urgency=low diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 0cf4bb663..39e2c8e6b 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -507,6 +507,15 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; will be looked up in <filename>/tmp/staging/var/lib/dpkg/status</filename>. </para> + + <para> + The <literal>Ignore-Files-Silently</literal> list can be used to specify + which files APT should silently ignore while parsing the files in the + fragment directories. Per default a file which end with <literal>.disabled</literal>, + <literal>~</literal>, <literal>.bak</literal> or <literal>.dpkg-[a-z]+</literal> + is silently ignored. As seen in the last default value these patterns can use regular + expression syntax. + </para> </refsect1> <refsect1><title>APT in DSelect -- cgit v1.2.3 From 5afa55c6703a71a198aac950db30ffc6ca49f269 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 26 Jun 2010 18:42:42 +0200 Subject: make the MMap Grow Error a fatal one as while in theory the code should never segfault it still tend to do it so better show it directly --- apt-pkg/contrib/mmap.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index d233e51bc..d71066243 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -297,7 +297,7 @@ unsigned long DynamicMMap::RawAllocate(unsigned long Size,unsigned long Aln) { if(!Grow()) { - _error->Error(_("Dynamic MMap ran out of room. Please increase the size " + _error->Fatal(_("Dynamic MMap ran out of room. Please increase the size " "of APT::Cache-Limit. Current value: %lu. (man 5 apt.conf)"), WorkSpace); return 0; } -- cgit v1.2.3 From c340d1851242e691e7e0baad18a662d6c7a62bc8 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 26 Jun 2010 19:04:20 +0200 Subject: do not override the user set quiet setting even if the target is not a tty --- cmdline/apt-cache.cc | 2 +- cmdline/apt-cdrom.cc | 2 +- cmdline/apt-get.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index a4ec63eed..a5b3141d7 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1868,7 +1868,7 @@ int main(int argc,const char *argv[]) /*{{{*/ } // Deal with stdout not being a tty - if (isatty(STDOUT_FILENO) && _config->FindI("quiet",0) < 1) + if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1) _config->Set("quiet","1"); // if (_config->FindB("APT::Cache::Generate",true) == false) diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index da2ffa390..d1268edf9 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -266,7 +266,7 @@ int main(int argc,const char *argv[]) /*{{{*/ return ShowHelp(); // Deal with stdout not being a tty - if (isatty(STDOUT_FILENO) && _config->FindI("quiet",0) < 1) + if (isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1) _config->Set("quiet","1"); // Match the operation diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 605eedb0f..e3477b6db 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2899,7 +2899,7 @@ int main(int argc,const char *argv[]) /*{{{*/ } // Deal with stdout not being a tty - if (!isatty(STDOUT_FILENO) && _config->FindI("quiet",0) < 1) + if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1) _config->Set("quiet","1"); // Setup the output streams -- cgit v1.2.3 From 320352e00477f3b0cfd12efd736bd08c7908fecc Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 26 Jun 2010 19:22:23 +0200 Subject: give the APT::Cache::Generate option her effect back --- cmdline/apt-cache.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index a5b3141d7..c790559e7 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1871,7 +1871,9 @@ int main(int argc,const char *argv[]) /*{{{*/ if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1) _config->Set("quiet","1"); -// if (_config->FindB("APT::Cache::Generate",true) == false) + if (_config->Exists("APT::Cache::Generate") == true) + _config->Set("pkgCacheFile::Generate", _config->FindB("APT::Cache::Generate", true)); + if (CmdL.DispatchArg(CmdsA,false) == false && _error->PendingError() == false) CmdL.DispatchArg(CmdsB); -- cgit v1.2.3 From 5c640e864f8b5f1c175682a94f6c6d0dff42d4bc Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 26 Jun 2010 20:49:47 +0200 Subject: always mark the all package if a pseudo package is marked for install --- apt-pkg/depcache.cc | 4 ++++ debian/changelog | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 8bca3e36e..c93993ab1 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1255,6 +1255,10 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, Update(Pkg); AddSizes(Pkg); + // always trigger the install of the all package for a pseudo package + if (P.CandidateVerIter(*Cache).Pseudo() == true) + MarkInstall(Pkg.Group().FindPkg("all"), AutoInst, Depth, FromUser, ForceImportantDeps); + if (AutoInst == false) return; diff --git a/debian/changelog b/debian/changelog index 722e7ffc4..fbe814d84 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low - SetCandidateVer for all pseudo packages - SetReInstall for the "all" package of a pseudo package - use the new MatchAgainstConfig for the DefaultRootSetFunc + - always mark the all package if a pseudo package is marked for install * apt-pkg/contrib/error.{cc,h}: - complete rewrite but use the same API - add NOTICE and DEBUG as new types of a message @@ -28,9 +29,8 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low * apt-pkg/contrib/fileutl.cc: - show notice about ignored file instead of being always silent - add a Dir::Ignore-Files-Silently list option to control the notice - * - -- David Kalnischkies Sat, 26 Jun 2010 18:40:01 +0200 + -- David Kalnischkies Sat, 26 Jun 2010 20:43:09 +0200 apt (0.7.26~exp7) experimental; urgency=low -- cgit v1.2.3 From d4af23c2d81116b8f7557ee795059bca126ae9f4 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sat, 26 Jun 2010 20:56:44 +0200 Subject: * apt-pkg/deb/deblistparser.cc: - Handle architecture wildcards (Closes: #547724). --- apt-pkg/deb/deblistparser.cc | 10 +++++++++- debian/changelog | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 83c5b8d2e..ddbd0d31a 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -19,6 +19,7 @@ #include #include +#include #include /*}}}*/ @@ -572,8 +573,15 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop, I++; } - if (stringcmp(arch,I,End) == 0) + if (stringcmp(arch,I,End) == 0) { Found = true; + } else { + std::string wildcard = SubstVar(string(I, End), "any", "*"); + if (fnmatch(wildcard.c_str(), arch.c_str(), 0) == 0) + Found = true; + else if (fnmatch(wildcard.c_str(), ("linux-" + arch).c_str(), 0) == 0) + Found = true; + } if (*End++ == ']') { I = End; diff --git a/debian/changelog b/debian/changelog index 037dfa7bd..8de7d18e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ apt (0.7.26~exp8) experimental; urgency=low * methods/ftp.h: - Handle different logins are on the same server (Closes: #586904). + * apt-pkg/deb/deblistparser.cc: + - Handle architecture wildcards (Closes: #547724). -- Julian Andres Klode Thu, 24 Jun 2010 10:56:39 +0200 -- cgit v1.2.3 From 7ecb5be707d7365df3af157a122b52667b96ace9 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sat, 26 Jun 2010 21:16:20 +0200 Subject: debian/changelog: Fix a typo --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8de7d18e3..105936177 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ apt (0.7.26~exp8) experimental; urgency=low * methods/ftp.h: - - Handle different logins are on the same server (Closes: #586904). + - Handle different logins on the same server (Closes: #586904). * apt-pkg/deb/deblistparser.cc: - Handle architecture wildcards (Closes: #547724). -- cgit v1.2.3 From 48c39e3246b72802a6f723eef1ce0c30e06be33d Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 26 Jun 2010 21:17:34 +0200 Subject: - only print errors if all tries to get a package by string failed * --- cmdline/cacheset.cc | 18 ++++++++++++------ debian/changelog | 4 +++- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/cmdline/cacheset.cc b/cmdline/cacheset.cc index 88a98fdbe..2b00187d8 100644 --- a/cmdline/cacheset.cc +++ b/cmdline/cacheset.cc @@ -200,15 +200,21 @@ PackageSet PackageSet::FromString(pkgCacheFile &Cache, std::string const &str, C pkgset.insert(Pkg); return pkgset; } + + _error->PushToStack(); + PackageSet pset = FromTask(Cache, str, helper); - if (pset.empty() == false) - return pset; + if (pset.empty() == true) { + pset = FromRegEx(Cache, str, helper); + if (pset.empty() == true) + pset = helper.canNotFindPackage(Cache, str); + } - pset = FromRegEx(Cache, str, helper); if (pset.empty() == false) - return pset; - - return helper.canNotFindPackage(Cache, str); + _error->RevertToStack(); + else + _error->MergeWithStack(); + return pset; } /*}}}*/ // GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ diff --git a/debian/changelog b/debian/changelog index fbe814d84..32a18cf59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low - get the candidate either from an already built depcache or use the policy which is a bit faster than depcache generation - get packages by task^ with FromTask() + - only print errors if all tries to get a package by string failed * cmdline/apt-get.cc: - use the cachsets in the install commands * apt-pkg/orderlist.cc: @@ -29,8 +30,9 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low * apt-pkg/contrib/fileutl.cc: - show notice about ignored file instead of being always silent - add a Dir::Ignore-Files-Silently list option to control the notice + * - -- David Kalnischkies Sat, 26 Jun 2010 20:43:09 +0200 + -- David Kalnischkies Sat, 26 Jun 2010 21:17:08 +0200 apt (0.7.26~exp7) experimental; urgency=low -- cgit v1.2.3 From 3b20aef1a2b5fd2fcd6f62a819edbdb19631fb98 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sat, 26 Jun 2010 23:01:49 +0200 Subject: apt-pkg/deb/deblistparser.cc: Fix bug in architecture wildcard support. Previously, linux-any was always matched, because the code simply appended linux- to the APT::Architecture value. Now, it does this only if the APT::Architecture value does not contain "-". --- apt-pkg/deb/deblistparser.cc | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index ddbd0d31a..00016679a 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -473,6 +473,14 @@ const char *debListParser::ConvertRelation(const char *I,unsigned int &Op) return I; } +/* + * CompleteArch: + * + * The complete architecture, consisting of -. + */ +static string CompleteArch(std::string& arch) { + return (arch.find("-") != string::npos) ? arch : "linux-" + arch; +} /*}}}*/ // ListParser::ParseDepends - Parse a dependency element /*{{{*/ // --------------------------------------------------------------------- @@ -546,6 +554,7 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop, if (ParseArchFlags == true) { string arch = _config->Find("APT::Architecture"); + string completeArch = CompleteArch(arch); // Parse an architecture if (I != Stop && *I == '[') @@ -577,9 +586,7 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop, Found = true; } else { std::string wildcard = SubstVar(string(I, End), "any", "*"); - if (fnmatch(wildcard.c_str(), arch.c_str(), 0) == 0) - Found = true; - else if (fnmatch(wildcard.c_str(), ("linux-" + arch).c_str(), 0) == 0) + if (fnmatch(wildcard.c_str(), completeArch.c_str(), 0) == 0) Found = true; } -- cgit v1.2.3 From 5143f361005775e3674f4f5871ad574cbe8ef705 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sun, 27 Jun 2010 21:04:53 +0200 Subject: deblistparser: Special-case *-armel, lpia and powerpcspe architectures. --- apt-pkg/deb/deblistparser.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 00016679a..6ede14c4d 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -479,6 +479,12 @@ const char *debListParser::ConvertRelation(const char *I,unsigned int &Op) * The complete architecture, consisting of -. */ static string CompleteArch(std::string& arch) { + if (arch == "armel") return "linux-arm"; + if (arch == "lpia") return "linux-i386"; + if (arch == "powerpcspe") return "linux-powerpc"; + if (arch == "uclibc-linux-armel") return "linux-arm"; + if (arch == "uclinux-armel") return "uclinux-arm"; + return (arch.find("-") != string::npos) ? arch : "linux-" + arch; } /*}}}*/ -- cgit v1.2.3 From ae4a4f91e90fb09a8de1699f18f3b28d095c4d73 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 28 Jun 2010 17:21:14 +0200 Subject: * apt-pkg/versionmatch.cc: - Support matching pins by regular expressions or glob() like patterns, regular expressions have to be put between to slashes; for example, /.*/. --- apt-pkg/versionmatch.cc | 58 +++++++++++++++++++++++++++++++++++++++---------- apt-pkg/versionmatch.h | 2 ++ debian/changelog | 4 ++++ 3 files changed, 52 insertions(+), 12 deletions(-) diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc index e5f0fafd2..72c9bff2d 100644 --- a/apt-pkg/versionmatch.cc +++ b/apt-pkg/versionmatch.cc @@ -18,6 +18,10 @@ #include #include +#include +#include +#include + /*}}}*/ // VersionMatch::pkgVersionMatch - Constructor /*{{{*/ @@ -162,6 +166,36 @@ pkgCache::VerIterator pkgVersionMatch::Find(pkgCache::PkgIterator Pkg) // This will be Ended by now. return Ver; } + +#ifndef FNM_CASEFOLD +#define FNM_CASEFOLD 0 +#endif + +bool pkgVersionMatch::ExpressionMatches(const char *pattern, const char *string) +{ + std::cerr << "MATCH " << pattern; + if (pattern[0] == '/') { + bool res = false; + size_t length = strlen(pattern); + if (pattern[length - 1] == '/') { + regex_t preg; + char *regex = strdup(pattern + 1); + regex[length - 2] = '\0'; + if (regcomp(&preg, regex, REG_EXTENDED | REG_ICASE) != 0) { + std::cerr << "E: Invalid regular expression: " << regex << "\n"; + } else if (regexec(&preg, string, 0, NULL, 0) == 0) { + res = true; + } + free(regex); + return res; + } + } + return fnmatch(pattern, string, FNM_CASEFOLD) == 0; +} +bool pkgVersionMatch::ExpressionMatches(const std::string& pattern, const char *string) +{ + return ExpressionMatches(pattern.c_str(), string); +} /*}}}*/ // VersionMatch::FileMatch - Match against an index file /*{{{*/ // --------------------------------------------------------------------- @@ -185,37 +219,37 @@ bool pkgVersionMatch::FileMatch(pkgCache::PkgFileIterator File) if (RelVerStr.empty() == false) if (File->Version == 0 || - MatchVer(File.Version(),RelVerStr,RelVerPrefixMatch) == false) + (MatchVer(File.Version(),RelVerStr,RelVerPrefixMatch) == false && + ExpressionMatches(RelVerStr, File.Version()) == false)) return false; if (RelOrigin.empty() == false) - if (File->Origin == 0 || - stringcasecmp(RelOrigin,File.Origin()) != 0) + if (File->Origin == 0 || !ExpressionMatches(RelOrigin,File.Origin())) return false; if (RelArchive.empty() == false) if (File->Archive == 0 || - stringcasecmp(RelArchive,File.Archive()) != 0) + !ExpressionMatches(RelArchive,File.Archive())) return false; if (RelCodename.empty() == false) if (File->Codename == 0 || - stringcasecmp(RelCodename,File.Codename()) != 0) + !ExpressionMatches(RelCodename,File.Codename())) return false; if (RelRelease.empty() == false) if ((File->Archive == 0 || - stringcasecmp(RelRelease,File.Archive()) != 0) && + !ExpressionMatches(RelRelease,File.Archive())) && (File->Codename == 0 || - stringcasecmp(RelRelease,File.Codename()) != 0)) + !ExpressionMatches(RelRelease,File.Codename()))) return false; if (RelLabel.empty() == false) if (File->Label == 0 || - stringcasecmp(RelLabel,File.Label()) != 0) + !ExpressionMatches(RelLabel,File.Label())) return false; if (RelComponent.empty() == false) if (File->Component == 0 || - stringcasecmp(RelComponent,File.Component()) != 0) + !ExpressionMatches(RelComponent,File.Component())) return false; if (RelArchitecture.empty() == false) if (File->Architecture == 0 || - stringcasecmp(RelArchitecture,File.Architecture()) != 0) + !ExpressionMatches(RelArchitecture,File.Architecture())) return false; return true; } @@ -223,12 +257,12 @@ bool pkgVersionMatch::FileMatch(pkgCache::PkgFileIterator File) if (Type == Origin) { if (OrSite.empty() == false) { - if (File->Site == 0 || OrSite != File.Site()) + if (File->Site == 0 || !ExpressionMatches(OrSite, File.Site())) return false; } else // so we are talking about file:// or status file if (strcmp(File.Site(),"") == 0 && File->Archive != 0) // skip the status file return false; - return (OrSite == File.Site()); /* both strings match */ + return (ExpressionMatches(OrSite, File.Site())); /* both strings match */ } return false; diff --git a/apt-pkg/versionmatch.h b/apt-pkg/versionmatch.h index a8da072ae..39639a23d 100644 --- a/apt-pkg/versionmatch.h +++ b/apt-pkg/versionmatch.h @@ -67,6 +67,8 @@ class pkgVersionMatch enum MatchType {None = 0,Version,Release,Origin} Type; bool MatchVer(const char *A,string B,bool Prefix); + bool ExpressionMatches(const char *pattern, const char *string); + bool ExpressionMatches(const std::string& pattern, const char *string); bool FileMatch(pkgCache::PkgFileIterator File); pkgCache::VerIterator Find(pkgCache::PkgIterator Pkg); diff --git a/debian/changelog b/debian/changelog index 105936177..659facb37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,10 @@ apt (0.7.26~exp8) experimental; urgency=low - Handle different logins on the same server (Closes: #586904). * apt-pkg/deb/deblistparser.cc: - Handle architecture wildcards (Closes: #547724). + * apt-pkg/versionmatch.cc: + - Support matching pins by regular expressions or glob() like patterns, + regular expressions have to be put between to slashes; for example, + /.*/. -- Julian Andres Klode Thu, 24 Jun 2010 10:56:39 +0200 -- cgit v1.2.3 From 05002864535069dbc35fd1c713ab072a5b6df65f Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 28 Jun 2010 17:29:11 +0200 Subject: Also support regular expressions and glob() patterns in "Pin: version". --- apt-pkg/versionmatch.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc index 72c9bff2d..2abb73e8d 100644 --- a/apt-pkg/versionmatch.cc +++ b/apt-pkg/versionmatch.cc @@ -155,6 +155,8 @@ pkgCache::VerIterator pkgVersionMatch::Find(pkgCache::PkgIterator Pkg) { if (MatchVer(Ver.VerStr(),VerStr,VerPrefixMatch) == true) return Ver; + if (ExpressionMatches(VerStr, Ver.VerStr()) == true) + return Ver; continue; } -- cgit v1.2.3 From 01934fb1fe79cddcc3cb4c79c99c3c30390fdef6 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 28 Jun 2010 17:30:40 +0200 Subject: Remove debugging stuff, this was not meant to be here. --- apt-pkg/versionmatch.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc index 2abb73e8d..65908f733 100644 --- a/apt-pkg/versionmatch.cc +++ b/apt-pkg/versionmatch.cc @@ -175,7 +175,6 @@ pkgCache::VerIterator pkgVersionMatch::Find(pkgCache::PkgIterator Pkg) bool pkgVersionMatch::ExpressionMatches(const char *pattern, const char *string) { - std::cerr << "MATCH " << pattern; if (pattern[0] == '/') { bool res = false; size_t length = strlen(pattern); -- cgit v1.2.3 From 4213f040ac8464d8826b64746c49c21c53a1ab12 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 28 Jun 2010 17:34:54 +0200 Subject: Use _error->Warning() instead of writing to std::cerr. --- apt-pkg/versionmatch.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc index 65908f733..a269338d6 100644 --- a/apt-pkg/versionmatch.cc +++ b/apt-pkg/versionmatch.cc @@ -183,7 +183,7 @@ bool pkgVersionMatch::ExpressionMatches(const char *pattern, const char *string) char *regex = strdup(pattern + 1); regex[length - 2] = '\0'; if (regcomp(&preg, regex, REG_EXTENDED | REG_ICASE) != 0) { - std::cerr << "E: Invalid regular expression: " << regex << "\n"; + _error->Warning("Invalid regular expression: %s", regex); } else if (regexec(&preg, string, 0, NULL, 0) == 0) { res = true; } -- cgit v1.2.3 From cec9f4f4bb39cc075acded3478d59d0f17d3ed89 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 28 Jun 2010 17:38:08 +0200 Subject: Also free regular expressions. --- apt-pkg/versionmatch.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc index a269338d6..093180f9b 100644 --- a/apt-pkg/versionmatch.cc +++ b/apt-pkg/versionmatch.cc @@ -188,6 +188,7 @@ bool pkgVersionMatch::ExpressionMatches(const char *pattern, const char *string) res = true; } free(regex); + regfree(&preg); return res; } } -- cgit v1.2.3 From bd631595620ca5b3c53ede4ef46c89399c26c5f3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 28 Jun 2010 22:13:17 +0200 Subject: - factor out code to get a single package FromName() - check in Grouped* first without modifier interpretation --- cmdline/cacheset.cc | 151 ++++++++++++++++++++++++++++++++++------------------ cmdline/cacheset.h | 15 +++++- debian/changelog | 4 +- 3 files changed, 116 insertions(+), 54 deletions(-) diff --git a/cmdline/cacheset.cc b/cmdline/cacheset.cc index 2b00187d8..42bc79693 100644 --- a/cmdline/cacheset.cc +++ b/cmdline/cacheset.cc @@ -25,11 +25,7 @@ namespace APT { // FromTask - Return all packages in the cache from a specific task /*{{{*/ PackageSet PackageSet::FromTask(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) { - PackageSet pkgset; - if (Cache.BuildCaches() == false || Cache.BuildDepCache() == false) - return pkgset; - - size_t archfound = pattern.find_last_of(':'); + size_t const archfound = pattern.find_last_of(':'); std::string arch = "native"; if (archfound != std::string::npos) { arch = pattern.substr(archfound+1); @@ -37,9 +33,13 @@ PackageSet PackageSet::FromTask(pkgCacheFile &Cache, std::string pattern, CacheS } if (pattern[pattern.length() -1] != '^') - return pkgset; + return APT::PackageSet(); pattern.erase(pattern.length()-1); + if (unlikely(Cache.GetPkgCache() == 0 || Cache.GetDepCache() == 0)) + return APT::PackageSet(); + + PackageSet pkgset; // get the records pkgRecords Recs(Cache); @@ -83,11 +83,9 @@ PackageSet PackageSet::FromTask(pkgCacheFile &Cache, std::string pattern, CacheS /*}}}*/ // FromRegEx - Return all packages in the cache matching a pattern /*{{{*/ PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) { - PackageSet pkgset; static const char * const isregex = ".?+*|[^$"; - if (pattern.find_first_of(isregex) == std::string::npos) - return pkgset; + return PackageSet(); size_t archfound = pattern.find_last_of(':'); std::string arch = "native"; @@ -105,9 +103,13 @@ PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, Cache char Error[300]; regerror(Res, &Pattern, Error, sizeof(Error)); _error->Error(_("Regex compilation error - %s"), Error); - return pkgset; + return PackageSet(); } + if (unlikely(Cache.GetPkgCache() == 0)) + return PackageSet(); + + PackageSet pkgset; for (pkgCache::GrpIterator Grp = Cache.GetPkgCache()->GrpBegin(); Grp.end() == false; ++Grp) { if (regexec(&Pattern, Grp.Name(), 0, 0, 0) != 0) @@ -135,6 +137,33 @@ PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, Cache return pkgset; } /*}}}*/ +// FromName - Returns the package defined by this string /*{{{*/ +pkgCache::PkgIterator PackageSet::FromName(pkgCacheFile &Cache, + std::string const &str, CacheSetHelper &helper) { + std::string pkg = str; + size_t archfound = pkg.find_last_of(':'); + std::string arch; + if (archfound != std::string::npos) { + arch = pkg.substr(archfound+1); + pkg.erase(archfound); + } + + if (Cache.GetPkgCache() == 0) + return pkgCache::PkgIterator(Cache, 0); + + pkgCache::PkgIterator Pkg(Cache, 0); + if (arch.empty() == true) { + pkgCache::GrpIterator Grp = Cache.GetPkgCache()->FindGrp(pkg); + if (Grp.end() == false) + Pkg = Grp.FindPreferredPkg(); + } else + Pkg = Cache.GetPkgCache()->FindPkg(pkg, arch); + + if (Pkg.end() == true) + return helper.canNotFindPkgName(Cache, str); + return Pkg; +} + /*}}}*/ // GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ std::map PackageSet::GroupedFromCommandLine( pkgCacheFile &Cache, const char **cmdline, @@ -144,6 +173,7 @@ std::map PackageSet::GroupedFromCommandLine( for (const char **I = cmdline; *I != 0; ++I) { unsigned short modID = fallback; std::string str = *I; + bool modifierPresent = false; for (std::list::const_iterator mod = mods.begin(); mod != mods.end(); ++mod) { size_t const alength = strlen(mod->Alias); @@ -160,8 +190,18 @@ std::map PackageSet::GroupedFromCommandLine( case PackageSet::Modifier::NONE: continue; } + modifierPresent = true; break; } + if (modifierPresent == true) { + bool const errors = helper.showErrors(false); + pkgCache::PkgIterator Pkg = FromName(Cache, *I, helper); + helper.showErrors(errors); + if (Pkg.end() == false) { + pkgsets[fallback].insert(Pkg); + continue; + } + } pkgsets[modID].insert(PackageSet::FromString(Cache, str, helper)); } return pkgsets; @@ -179,42 +219,26 @@ PackageSet PackageSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline /*}}}*/ // FromString - Return all packages matching a specific string /*{{{*/ PackageSet PackageSet::FromString(pkgCacheFile &Cache, std::string const &str, CacheSetHelper &helper) { - std::string pkg = str; - size_t archfound = pkg.find_last_of(':'); - std::string arch; - if (archfound != std::string::npos) { - arch = pkg.substr(archfound+1); - pkg.erase(archfound); - } - - pkgCache::PkgIterator Pkg; - if (arch.empty() == true) { - pkgCache::GrpIterator Grp = Cache.GetPkgCache()->FindGrp(pkg); - if (Grp.end() == false) - Pkg = Grp.FindPreferredPkg(); - } else - Pkg = Cache.GetPkgCache()->FindPkg(pkg, arch); - - if (Pkg.end() == false) { - PackageSet pkgset; - pkgset.insert(Pkg); - return pkgset; - } - _error->PushToStack(); - PackageSet pset = FromTask(Cache, str, helper); - if (pset.empty() == true) { - pset = FromRegEx(Cache, str, helper); - if (pset.empty() == true) - pset = helper.canNotFindPackage(Cache, str); + PackageSet pkgset; + pkgCache::PkgIterator Pkg = FromName(Cache, str, helper); + if (Pkg.end() == false) + pkgset.insert(Pkg); + else { + pkgset = FromTask(Cache, str, helper); + if (pkgset.empty() == true) { + pkgset = FromRegEx(Cache, str, helper); + if (pkgset.empty() == true) + pkgset = helper.canNotFindPackage(Cache, str); + } } - if (pset.empty() == false) + if (pkgset.empty() == false) _error->RevertToStack(); else _error->MergeWithStack(); - return pset; + return pkgset; } /*}}}*/ // GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ @@ -227,6 +251,7 @@ std::map VersionSet::GroupedFromCommandLine( unsigned short modID = fallback; VersionSet::Version select = VersionSet::NEWEST; std::string str = *I; + bool modifierPresent = false; for (std::list::const_iterator mod = mods.begin(); mod != mods.end(); ++mod) { if (modID == fallback && mod->ID == fallback) @@ -246,8 +271,19 @@ std::map VersionSet::GroupedFromCommandLine( case VersionSet::Modifier::NONE: continue; } + modifierPresent = true; break; } + + if (modifierPresent == true) { + bool const errors = helper.showErrors(false); + VersionSet const vset = VersionSet::FromString(Cache, std::string(*I), select, helper, true); + helper.showErrors(errors); + if (vset.empty() == false) { + versets[fallback].insert(vset); + continue; + } + } versets[modID].insert(VersionSet::FromString(Cache, str, select , helper)); } return versets; @@ -257,16 +293,15 @@ std::map VersionSet::GroupedFromCommandLine( APT::VersionSet VersionSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, APT::VersionSet::Version const &fallback, CacheSetHelper &helper) { VersionSet verset; - for (const char **I = cmdline; *I != 0; ++I) { - VersionSet vset = VersionSet::FromString(Cache, *I, fallback, helper); - verset.insert(vset.begin(), vset.end()); - } + for (const char **I = cmdline; *I != 0; ++I) + verset.insert(VersionSet::FromString(Cache, *I, fallback, helper)); return verset; } /*}}}*/ // FromString - Returns all versions spedcified by a string /*{{{*/ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, - APT::VersionSet::Version const &fallback, CacheSetHelper &helper) { + APT::VersionSet::Version const &fallback, CacheSetHelper &helper, + bool const &onlyFromName) { std::string ver; bool verIsRel = false; size_t const vertag = pkg.find_last_of("/="); @@ -275,7 +310,13 @@ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, verIsRel = (pkg[vertag] == '/'); pkg.erase(vertag); } - PackageSet pkgset = PackageSet::FromString(Cache, pkg.c_str(), helper); + PackageSet pkgset; + if (onlyFromName == false) + pkgset = PackageSet::FromString(Cache, pkg, helper); + else { + pkgset.insert(PackageSet::FromName(Cache, pkg, helper)); + } + VersionSet verset; for (PackageSet::const_iterator P = pkgset.begin(); P != pkgset.end(); ++P) { @@ -372,8 +413,8 @@ pkgCache::VerIterator VersionSet::getCandidateVer(pkgCacheFile &Cache, if (Cache.IsDepCacheBuilt() == true) Cand = Cache[Pkg].CandidateVerIter(Cache); else { - if (unlikely(Cache.BuildPolicy() == false)) - return pkgCache::VerIterator(*Cache); + if (unlikely(Cache.GetPolicy() == 0)) + return pkgCache::VerIterator(Cache); Cand = Cache.GetPolicy()->GetCandidateVer(Pkg); } if (Cand.end() == true) @@ -389,6 +430,14 @@ pkgCache::VerIterator VersionSet::getInstalledVer(pkgCacheFile &Cache, return Pkg.CurrentVer(); } /*}}}*/ +// canNotFindPkgName - handle the case no package has this name /*{{{*/ +pkgCache::PkgIterator CacheSetHelper::canNotFindPkgName(pkgCacheFile &Cache, + std::string const &str) { + if (ShowError == true) + _error->Error(_("Unable to locate package %s"), str.c_str()); + return pkgCache::PkgIterator(Cache, 0); +} + /*}}}*/ // canNotFindTask - handle the case no package is found for a task /*{{{*/ PackageSet CacheSetHelper::canNotFindTask(pkgCacheFile &Cache, std::string pattern) { if (ShowError == true) @@ -405,8 +454,6 @@ PackageSet CacheSetHelper::canNotFindRegEx(pkgCacheFile &Cache, std::string patt /*}}}*/ // canNotFindPackage - handle the case no package is found from a string/*{{{*/ PackageSet CacheSetHelper::canNotFindPackage(pkgCacheFile &Cache, std::string const &str) { - if (ShowError == true) - _error->Error(_("Unable to locate package %s"), str.c_str()); return PackageSet(); } /*}}}*/ @@ -431,7 +478,7 @@ pkgCache::VerIterator CacheSetHelper::canNotFindNewestVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { if (ShowError == true) _error->Error(_("Can't select newest version from package '%s' as it is purely virtual"), Pkg.FullName(true).c_str()); - return pkgCache::VerIterator(*Cache); + return pkgCache::VerIterator(Cache); } /*}}}*/ // canNotFindCandidateVer /*{{{*/ @@ -439,7 +486,7 @@ pkgCache::VerIterator CacheSetHelper::canNotFindCandidateVer(pkgCacheFile &Cache pkgCache::PkgIterator const &Pkg) { if (ShowError == true) _error->Error(_("Can't select candidate version from package %s as it has no candidate"), Pkg.FullName(true).c_str()); - return pkgCache::VerIterator(*Cache); + return pkgCache::VerIterator(Cache); } /*}}}*/ // canNotFindInstalledVer /*{{{*/ @@ -447,7 +494,7 @@ pkgCache::VerIterator CacheSetHelper::canNotFindInstalledVer(pkgCacheFile &Cache pkgCache::PkgIterator const &Pkg) { if (ShowError == true) _error->Error(_("Can't select installed version from package %s as it is not installed"), Pkg.FullName(true).c_str()); - return pkgCache::VerIterator(*Cache); + return pkgCache::VerIterator(Cache); } /*}}}*/ } diff --git a/cmdline/cacheset.h b/cmdline/cacheset.h index 9c9491020..21c42c511 100644 --- a/cmdline/cacheset.h +++ b/cmdline/cacheset.h @@ -40,6 +40,7 @@ public: /*{{{*/ virtual void showSelectedVersion(pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const Ver, string const &ver, bool const &verIsRel) {}; + virtual pkgCache::PkgIterator canNotFindPkgName(pkgCacheFile &Cache, std::string const &str); virtual PackageSet canNotFindTask(pkgCacheFile &Cache, std::string pattern); virtual PackageSet canNotFindRegEx(pkgCacheFile &Cache, std::string pattern); virtual PackageSet canNotFindPackage(pkgCacheFile &Cache, std::string const &str); @@ -146,6 +147,17 @@ public: /*{{{*/ return APT::PackageSet::FromString(Cache, string, helper); } + /** \brief returns a package specified by a string + + \param Cache the package is in + \param string String the package name should be extracted from + \param out stream to print various notices to */ + static pkgCache::PkgIterator FromName(pkgCacheFile &Cache, std::string const &string, CacheSetHelper &helper); + static pkgCache::PkgIterator FromName(pkgCacheFile &Cache, std::string const &string) { + CacheSetHelper helper; + return APT::PackageSet::FromName(Cache, string, helper); + } + /** \brief returns all packages specified on the commandline Get all package names from the commandline and executes regex's if needed. @@ -268,7 +280,8 @@ public: /*{{{*/ } static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg, - APT::VersionSet::Version const &fallback, CacheSetHelper &helper); + APT::VersionSet::Version const &fallback, CacheSetHelper &helper, + bool const &onlyFromName = false); static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg, APT::VersionSet::Version const &fallback) { CacheSetHelper helper; diff --git a/debian/changelog b/debian/changelog index 32a18cf59..d7c6b8d0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low or use the policy which is a bit faster than depcache generation - get packages by task^ with FromTask() - only print errors if all tries to get a package by string failed + - factor out code to get a single package FromName() + - check in Grouped* first without modifier interpretation * cmdline/apt-get.cc: - use the cachsets in the install commands * apt-pkg/orderlist.cc: @@ -32,7 +34,7 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low - add a Dir::Ignore-Files-Silently list option to control the notice * - -- David Kalnischkies Sat, 26 Jun 2010 21:17:08 +0200 + -- David Kalnischkies Mon, 28 Jun 2010 22:12:24 +0200 apt (0.7.26~exp7) experimental; urgency=low -- cgit v1.2.3 From 9055046760d4e276914e10b96c6065fb885f118b Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 29 Jun 2010 15:21:24 +0200 Subject: debian/control: Set Standards-Version to 3.9.0 --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 659facb37..3a0fcd83d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ apt (0.7.26~exp8) experimental; urgency=low - Support matching pins by regular expressions or glob() like patterns, regular expressions have to be put between to slashes; for example, /.*/. + * debian/control: + - Set Standards-Version to 3.9.0 -- Julian Andres Klode Thu, 24 Jun 2010 10:56:39 +0200 diff --git a/debian/control b/debian/control index 9ac0d582e..8bc43568f 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: APT Development Team Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , Luca Bruno , Julian Andres Klode -Standards-Version: 3.8.4 +Standards-Version: 3.9.0 Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen, intltool Build-Conflicts: autoconf2.13, automake1.4 -- cgit v1.2.3 From e67c08344dbb9ecd827658d74121fa9b66b28961 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 29 Jun 2010 17:14:45 +0200 Subject: for install, do all installs first and then the removes and vice versa --- cmdline/apt-get.cc | 92 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 54 insertions(+), 38 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index e3477b6db..7ba0e8e5c 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1640,24 +1640,27 @@ bool DoInstall(CommandLine &CmdL) unsigned int AutoMarkChanged = 0; pkgProblemResolver Fix(Cache); - unsigned short fallback = 0; + static const unsigned short MOD_REMOVE = 1; + static const unsigned short MOD_INSTALL = 2; + + unsigned short fallback = MOD_INSTALL; if (strcasecmp(CmdL.FileList[0],"remove") == 0) - fallback = 1; + fallback = MOD_REMOVE; else if (strcasecmp(CmdL.FileList[0], "purge") == 0) { _config->Set("APT::Get::Purge", true); - fallback = 1; + fallback = MOD_REMOVE; } else if (strcasecmp(CmdL.FileList[0], "autoremove") == 0) { _config->Set("APT::Get::AutomaticRemove", "true"); - fallback = 1; + fallback = MOD_REMOVE; } std::list mods; - mods.push_back(APT::VersionSet::Modifier(0, "+", + mods.push_back(APT::VersionSet::Modifier(MOD_INSTALL, "+", APT::VersionSet::Modifier::POSTFIX, APT::VersionSet::CANDINST)); - mods.push_back(APT::VersionSet::Modifier(1, "-", + mods.push_back(APT::VersionSet::Modifier(MOD_REMOVE, "-", APT::VersionSet::Modifier::POSTFIX, APT::VersionSet::INSTCAND)); CacheSetHelperAPTGet helper(c0out); std::map verset = APT::VersionSet::GroupedFromCommandLine(Cache, @@ -1666,41 +1669,54 @@ bool DoInstall(CommandLine &CmdL) if (_error->PendingError() == true) return false; + unsigned short order[] = { 0, 0, 0 }; + if (fallback == MOD_INSTALL) { + order[0] = MOD_INSTALL; + order[1] = MOD_REMOVE; + } else { + order[0] = MOD_REMOVE; + order[1] = MOD_INSTALL; + } + // new scope for the ActionGroup { pkgDepCache::ActionGroup group(Cache); - for (APT::VersionSet::const_iterator Ver = verset[0].begin(); - Ver != verset[0].end(); ++Ver) - { - pkgCache::PkgIterator Pkg = Ver.ParentPkg(); - Cache->SetCandidateVersion(Ver); - - if (TryToInstall(Pkg, Cache, Fix, false, BrokenFix) == false) - return false; - - // see if we need to fix the auto-mark flag - // e.g. apt-get install foo - // where foo is marked automatic - if (Cache[Pkg].Install() == false && - (Cache[Pkg].Flags & pkgCache::Flag::Auto) && - _config->FindB("APT::Get::ReInstall",false) == false && - _config->FindB("APT::Get::Only-Upgrade",false) == false && - _config->FindB("APT::Get::Download-Only",false) == false) - { - ioprintf(c1out,_("%s set to manually installed.\n"), - Pkg.FullName(true).c_str()); - Cache->MarkAuto(Pkg,false); - AutoMarkChanged++; - } - } - - for (APT::VersionSet::const_iterator Ver = verset[1].begin(); - Ver != verset[1].end(); ++Ver) + for (unsigned short i = 0; order[i] != 0; ++i) { - pkgCache::PkgIterator Pkg = Ver.ParentPkg(); + if (order[i] == MOD_INSTALL) + for (APT::VersionSet::const_iterator Ver = verset[MOD_INSTALL].begin(); + Ver != verset[MOD_INSTALL].end(); ++Ver) + { + pkgCache::PkgIterator Pkg = Ver.ParentPkg(); + Cache->SetCandidateVersion(Ver); + + if (TryToInstall(Pkg, Cache, Fix, false, BrokenFix) == false) + return false; + + // see if we need to fix the auto-mark flag + // e.g. apt-get install foo + // where foo is marked automatic + if (Cache[Pkg].Install() == false && + (Cache[Pkg].Flags & pkgCache::Flag::Auto) && + _config->FindB("APT::Get::ReInstall",false) == false && + _config->FindB("APT::Get::Only-Upgrade",false) == false && + _config->FindB("APT::Get::Download-Only",false) == false) + { + ioprintf(c1out,_("%s set to manually installed.\n"), + Pkg.FullName(true).c_str()); + Cache->MarkAuto(Pkg,false); + AutoMarkChanged++; + } + } + else if (order[i] == MOD_REMOVE) + for (APT::VersionSet::const_iterator Ver = verset[MOD_REMOVE].begin(); + Ver != verset[MOD_REMOVE].end(); ++Ver) + { + pkgCache::PkgIterator Pkg = Ver.ParentPkg(); - if (TryToInstall(Pkg, Cache, Fix, true, BrokenFix) == false) - return false; + if (TryToInstall(Pkg, Cache, Fix, true, BrokenFix) == false) + return false; + } } if (_error->PendingError() == true) @@ -1752,7 +1768,7 @@ bool DoInstall(CommandLine &CmdL) /* Print out a list of packages that are going to be installed extra to what the user asked */ - if (Cache->InstCount() != verset[0].size()) + if (Cache->InstCount() != verset[MOD_INSTALL].size()) { string List; string VersionsList; @@ -1879,7 +1895,7 @@ bool DoInstall(CommandLine &CmdL) // See if we need to prompt // FIXME: check if really the packages in the set are going to be installed - if (Cache->InstCount() == verset[0].size() && Cache->DelCount() == 0) + if (Cache->InstCount() == verset[MOD_INSTALL].size() && Cache->DelCount() == 0) return InstallPackages(Cache,false,false); return InstallPackages(Cache,false); -- cgit v1.2.3 From 3010fb0e069d2fd4c7a6ade4559bfb659bf8f2fb Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 29 Jun 2010 17:23:24 +0200 Subject: * apt-pkg/contrib/fileutl.cc: - Make FileFd replace files atomically in WriteTemp mode (for cache, etc). --- apt-pkg/contrib/fileutl.cc | 20 +++++++++++++++----- apt-pkg/contrib/fileutl.h | 3 ++- debian/changelog | 2 ++ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 16f7ce929..0b0739cda 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -27,6 +27,7 @@ #include #include +#include #include #include @@ -654,10 +655,11 @@ bool FileFd::Open(string FileName,OpenMode Mode, unsigned long Perms) case WriteEmpty: { - struct stat Buf; - if (lstat(FileName.c_str(),&Buf) == 0 && S_ISLNK(Buf.st_mode)) - unlink(FileName.c_str()); - iFd = open(FileName.c_str(),O_RDWR | O_CREAT | O_TRUNC,Perms); + Flags |= Replace; + char *name = strdup((FileName + ".XXXXXX").c_str()); + TemporaryFileName = string(mktemp(name)); + iFd = open(TemporaryFileName.c_str(),O_RDWR | O_CREAT | O_EXCL,Perms); + free(name); break; } @@ -839,11 +841,19 @@ bool FileFd::Close() if (iFd >= 0 && close(iFd) != 0) Res &= _error->Errno("close",_("Problem closing the file")); iFd = -1; - + + if ((Flags & Replace) == Replace) { + FileName = TemporaryFileName; // for the unlink() below. + if (rename(TemporaryFileName.c_str(), FileName.c_str()) != 0) + Res &= _error->Errno("rename",_("Problem renaming the file")); + } + if ((Flags & Fail) == Fail && (Flags & DelOnFail) == DelOnFail && FileName.empty() == false) if (unlink(FileName.c_str()) != 0) Res &= _error->WarningE("unlnk",_("Problem unlinking the file")); + + return Res; } /*}}}*/ diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 003bd9b83..528725f89 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -34,9 +34,10 @@ class FileFd int iFd; enum LocalFlags {AutoClose = (1<<0),Fail = (1<<1),DelOnFail = (1<<2), - HitEof = (1<<3)}; + HitEof = (1<<3), Replace = (1<<4) }; unsigned long Flags; string FileName; + string TemporaryFileName; public: enum OpenMode {ReadOnly,WriteEmpty,WriteExists,WriteAny,WriteTemp}; diff --git a/debian/changelog b/debian/changelog index 3a0fcd83d..1bf6815a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ apt (0.7.26~exp8) experimental; urgency=low - Support matching pins by regular expressions or glob() like patterns, regular expressions have to be put between to slashes; for example, /.*/. + * apt-pkg/contrib/fileutl.cc: + - Make FileFd replace files atomically in WriteTemp mode (for cache, etc). * debian/control: - Set Standards-Version to 3.9.0 -- cgit v1.2.3 From fd3b761e8cba6ed626639b50b1221246098c7b3a Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 29 Jun 2010 17:28:33 +0200 Subject: Fix the atomic replace. --- apt-pkg/contrib/fileutl.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 0b0739cda..0b62d1bd8 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -843,9 +843,9 @@ bool FileFd::Close() iFd = -1; if ((Flags & Replace) == Replace) { - FileName = TemporaryFileName; // for the unlink() below. if (rename(TemporaryFileName.c_str(), FileName.c_str()) != 0) Res &= _error->Errno("rename",_("Problem renaming the file")); + FileName = TemporaryFileName; // for the unlink() below. } if ((Flags & Fail) == Fail && (Flags & DelOnFail) == DelOnFail && -- cgit v1.2.3 From fb83c1d078b9f5e2e28a828c325dc62dcf060f2b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 29 Jun 2010 19:10:47 +0200 Subject: rename AddSelectedVersion() to a better public FromPackage() --- cmdline/cacheset.cc | 11 ++++++----- cmdline/cacheset.h | 14 +++++++++----- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/cmdline/cacheset.cc b/cmdline/cacheset.cc index 42bc79693..35ef74f9a 100644 --- a/cmdline/cacheset.cc +++ b/cmdline/cacheset.cc @@ -321,7 +321,7 @@ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, for (PackageSet::const_iterator P = pkgset.begin(); P != pkgset.end(); ++P) { if (vertag == string::npos) { - AddSelectedVersion(Cache, verset, P, fallback, helper); + verset.insert(VersionSet::FromPackage(Cache, P, fallback, helper)); continue; } pkgCache::VerIterator V; @@ -351,10 +351,10 @@ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, return verset; } /*}}}*/ -// AddSelectedVersion - add version from package based on fallback /*{{{*/ -void VersionSet::AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset, - pkgCache::PkgIterator const &P, VersionSet::Version const &fallback, - CacheSetHelper &helper) { +// FromPackage - versions from package based on fallback /*{{{*/ +VersionSet VersionSet::FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P, + VersionSet::Version const &fallback, CacheSetHelper &helper) { + VersionSet verset; pkgCache::VerIterator V; bool showErrors; switch(fallback) { @@ -404,6 +404,7 @@ void VersionSet::AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset, verset.insert(helper.canNotFindNewestVer(Cache, P)); break; } + return verset; } /*}}}*/ // getCandidateVer - Returns the candidate version of the given package /*{{{*/ diff --git a/cmdline/cacheset.h b/cmdline/cacheset.h index 21c42c511..bf863fb39 100644 --- a/cmdline/cacheset.h +++ b/cmdline/cacheset.h @@ -291,6 +291,15 @@ public: /*{{{*/ return APT::VersionSet::FromString(Cache, pkg, CANDINST); } + /** \brief returns all versions specified for the package + + \param Cache the package and versions are in + \param P the package in question + \param fallback the version(s) you want to get + \param helper the helper used for display and error handling */ + static VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P, + VersionSet::Version const &fallback, CacheSetHelper &helper); + struct Modifier { enum Position { NONE, PREFIX, POSTFIX }; unsigned short ID; @@ -330,11 +339,6 @@ protected: /*{{{*/ \param Pkg we want the installed version from this package */ static pkgCache::VerIterator getInstalledVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper); - - static void AddSelectedVersion(pkgCacheFile &Cache, VersionSet &verset, - pkgCache::PkgIterator const &P, VersionSet::Version const &fallback, - CacheSetHelper &helper); - /*}}}*/ }; /*}}}*/ } -- cgit v1.2.3 From cf28bcadb301d00f6534fea97ccf1fde63041e7b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 29 Jun 2010 19:21:35 +0200 Subject: if the package has no installed & candidate but is virtual see if only one package provides it - if it is only one use this package instead --- cmdline/apt-get.cc | 86 ++++++++++++++++++++++++++++++----------------------- cmdline/cacheset.cc | 8 +++++ cmdline/cacheset.h | 2 ++ 3 files changed, 59 insertions(+), 37 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 7ba0e8e5c..d3ddcbfe8 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1081,41 +1081,6 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, pkgProblemResolver &Fix,bool Remove,bool BrokenFix, bool AllowFail = true) { - /* This is a pure virtual package and there is a single available - candidate providing it. */ - if (Cache[Pkg].CandidateVer == 0 && Pkg->ProvidesList != 0) - { - pkgCache::PkgIterator Prov; - bool found_one = false; - - for (pkgCache::PrvIterator P = Pkg.ProvidesList(); P; P++) - { - pkgCache::VerIterator const PVer = P.OwnerVer(); - pkgCache::PkgIterator const PPkg = PVer.ParentPkg(); - - /* Ignore versions that are not a candidate. */ - if (Cache[PPkg].CandidateVer != PVer) - continue; - - if (found_one == false) - { - Prov = PPkg; - found_one = true; - } - else if (PPkg != Prov) - { - found_one = false; // we found at least two - break; - } - } - - if (found_one == true) - { - ioprintf(c1out,_("Note, selecting %s instead of %s\n"), - Prov.FullName(true).c_str(),Pkg.FullName(true).c_str()); - Pkg = Prov; - } - } // Handle the no-upgrade case if (_config->FindB("APT::Get::upgrade",true) == false && @@ -1601,13 +1566,13 @@ public: virtual void showTaskSelection(APT::PackageSet const &pkgset, string const &pattern) { for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) - ioprintf(out, _("Note, selecting %s for task '%s'\n"), + ioprintf(out, _("Note, selecting '%s' for task '%s'\n"), Pkg.FullName(true).c_str(), pattern.c_str()); explicitlyNamed = false; } virtual void showRegExSelection(APT::PackageSet const &pkgset, string const &pattern) { for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) - ioprintf(out, _("Note, selecting %s for regex '%s'\n"), + ioprintf(out, _("Note, selecting '%s' for regex '%s'\n"), Pkg.FullName(true).c_str(), pattern.c_str()); explicitlyNamed = false; } @@ -1618,6 +1583,53 @@ public: Ver.VerStr(), Ver.RelStr().c_str(), Pkg.FullName(true).c_str()); } + virtual APT::VersionSet canNotFindCandInstVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { + return tryVirtualPackage(Cache, Pkg, APT::VersionSet::CANDINST); + } + + virtual APT::VersionSet canNotFindInstCandVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { + return tryVirtualPackage(Cache, Pkg, APT::VersionSet::INSTCAND); + } + + APT::VersionSet tryVirtualPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg, + APT::VersionSet::Version const &select) { + /* This is a pure virtual package and there is a single available + candidate providing it. */ + if (unlikely(Cache[Pkg].CandidateVer != 0) || Pkg->ProvidesList == 0) { + if (select == APT::VersionSet::CANDINST) + return APT::CacheSetHelper::canNotFindCandInstVer(Cache, Pkg); + return APT::CacheSetHelper::canNotFindInstCandVer(Cache, Pkg); + } + + pkgCache::PkgIterator Prov; + bool found_one = false; + for (pkgCache::PrvIterator P = Pkg.ProvidesList(); P; ++P) { + pkgCache::VerIterator const PVer = P.OwnerVer(); + pkgCache::PkgIterator const PPkg = PVer.ParentPkg(); + + /* Ignore versions that are not a candidate. */ + if (Cache[PPkg].CandidateVer != PVer) + continue; + + if (found_one == false) { + Prov = PPkg; + found_one = true; + } else if (PPkg != Prov) { + found_one = false; // we found at least two + break; + } + } + + if (found_one == true) { + ioprintf(out, _("Note, selecting '%s' instead of '%s'\n"), + Prov.FullName(true).c_str(), Pkg.FullName(true).c_str()); + return APT::VersionSet::FromPackage(Cache, Prov, select, *this); + } + if (select == APT::VersionSet::CANDINST) + return APT::CacheSetHelper::canNotFindCandInstVer(Cache, Pkg); + return APT::CacheSetHelper::canNotFindInstCandVer(Cache, Pkg); + } + inline bool allPkgNamedExplicitly() const { return explicitlyNamed; } }; diff --git a/cmdline/cacheset.cc b/cmdline/cacheset.cc index 35ef74f9a..cc2860a22 100644 --- a/cmdline/cacheset.cc +++ b/cmdline/cacheset.cc @@ -474,6 +474,14 @@ VersionSet CacheSetHelper::canNotFindInstCandVer(pkgCacheFile &Cache, return VersionSet(); } /*}}}*/ +// canNotFindInstCandVer /*{{{*/ +VersionSet CacheSetHelper::canNotFindCandInstVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg) { + if (ShowError == true) + _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), Pkg.FullName(true).c_str()); + return VersionSet(); +} + /*}}}*/ // canNotFindNewestVer /*{{{*/ pkgCache::VerIterator CacheSetHelper::canNotFindNewestVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { diff --git a/cmdline/cacheset.h b/cmdline/cacheset.h index bf863fb39..2ca794f28 100644 --- a/cmdline/cacheset.h +++ b/cmdline/cacheset.h @@ -47,6 +47,8 @@ public: /*{{{*/ virtual VersionSet canNotFindAllVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg); virtual VersionSet canNotFindInstCandVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg); + virtual VersionSet canNotFindCandInstVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg); virtual pkgCache::VerIterator canNotFindNewestVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg); virtual pkgCache::VerIterator canNotFindCandidateVer(pkgCacheFile &Cache, -- cgit v1.2.3 From c8db3fff877f102dc6fb62c4e4c7f700160b68f5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 2 Jul 2010 07:06:53 +0200 Subject: add a ConstructedBy member to the PackageSet which can be used by the e.g. FromString to tell the caller if the string was an exact match or found by regex or task. The two later ones can match packages for which we want to ignore failures in the VersionSet --- cmdline/cacheset.cc | 26 ++++++++++++++++---------- cmdline/cacheset.h | 42 +++++++++++++++++++++++++++++++++++------- 2 files changed, 51 insertions(+), 17 deletions(-) diff --git a/cmdline/cacheset.cc b/cmdline/cacheset.cc index cc2860a22..4d6d6a87c 100644 --- a/cmdline/cacheset.cc +++ b/cmdline/cacheset.cc @@ -33,13 +33,13 @@ PackageSet PackageSet::FromTask(pkgCacheFile &Cache, std::string pattern, CacheS } if (pattern[pattern.length() -1] != '^') - return APT::PackageSet(); + return APT::PackageSet(TASK); pattern.erase(pattern.length()-1); if (unlikely(Cache.GetPkgCache() == 0 || Cache.GetDepCache() == 0)) - return APT::PackageSet(); + return APT::PackageSet(TASK); - PackageSet pkgset; + PackageSet pkgset(TASK); // get the records pkgRecords Recs(Cache); @@ -85,7 +85,7 @@ PackageSet PackageSet::FromTask(pkgCacheFile &Cache, std::string pattern, CacheS PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) { static const char * const isregex = ".?+*|[^$"; if (pattern.find_first_of(isregex) == std::string::npos) - return PackageSet(); + return PackageSet(REGEX); size_t archfound = pattern.find_last_of(':'); std::string arch = "native"; @@ -103,13 +103,13 @@ PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, Cache char Error[300]; regerror(Res, &Pattern, Error, sizeof(Error)); _error->Error(_("Regex compilation error - %s"), Error); - return PackageSet(); + return PackageSet(REGEX); } if (unlikely(Cache.GetPkgCache() == 0)) - return PackageSet(); + return PackageSet(REGEX); - PackageSet pkgset; + PackageSet pkgset(REGEX); for (pkgCache::GrpIterator Grp = Cache.GetPkgCache()->GrpBegin(); Grp.end() == false; ++Grp) { if (regexec(&Pattern, Grp.Name(), 0, 0, 0) != 0) @@ -318,8 +318,12 @@ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, } VersionSet verset; + bool errors = true; + if (pkgset.getConstructor() != PackageSet::UNKNOWN) + errors = helper.showErrors(false); for (PackageSet::const_iterator P = pkgset.begin(); P != pkgset.end(); ++P) { + helper.canNotFindCandidateVer(Cache, P); if (vertag == string::npos) { verset.insert(VersionSet::FromPackage(Cache, P, fallback, helper)); continue; @@ -348,6 +352,8 @@ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, helper.showSelectedVersion(P, V, ver, verIsRel); verset.insert(V); } + if (pkgset.getConstructor() != PackageSet::UNKNOWN) + helper.showErrors(errors); return verset; } /*}}}*/ @@ -487,7 +493,7 @@ pkgCache::VerIterator CacheSetHelper::canNotFindNewestVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { if (ShowError == true) _error->Error(_("Can't select newest version from package '%s' as it is purely virtual"), Pkg.FullName(true).c_str()); - return pkgCache::VerIterator(Cache); + return pkgCache::VerIterator(Cache, 0); } /*}}}*/ // canNotFindCandidateVer /*{{{*/ @@ -495,7 +501,7 @@ pkgCache::VerIterator CacheSetHelper::canNotFindCandidateVer(pkgCacheFile &Cache pkgCache::PkgIterator const &Pkg) { if (ShowError == true) _error->Error(_("Can't select candidate version from package %s as it has no candidate"), Pkg.FullName(true).c_str()); - return pkgCache::VerIterator(Cache); + return pkgCache::VerIterator(Cache, 0); } /*}}}*/ // canNotFindInstalledVer /*{{{*/ @@ -503,7 +509,7 @@ pkgCache::VerIterator CacheSetHelper::canNotFindInstalledVer(pkgCacheFile &Cache pkgCache::PkgIterator const &Pkg) { if (ShowError == true) _error->Error(_("Can't select installed version from package %s as it is not installed"), Pkg.FullName(true).c_str()); - return pkgCache::VerIterator(Cache); + return pkgCache::VerIterator(Cache, 0); } /*}}}*/ } diff --git a/cmdline/cacheset.h b/cmdline/cacheset.h index 2ca794f28..c8c3dd096 100644 --- a/cmdline/cacheset.h +++ b/cmdline/cacheset.h @@ -117,7 +117,7 @@ public: /*{{{*/ packages chosen cause of the given task. \param Cache the packages are in \param pattern name of the task - \param out stream to print the notice to */ + \param helper responsible for error and message handling */ static APT::PackageSet FromTask(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper); static APT::PackageSet FromTask(pkgCacheFile &Cache, std::string const &pattern) { CacheSetHelper helper; @@ -131,7 +131,7 @@ public: /*{{{*/ packages chosen cause of the given package. \param Cache the packages are in \param pattern regular expression for package names - \param out stream to print the notice to */ + \param helper responsible for error and message handling */ static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper); static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string const &pattern) { CacheSetHelper helper; @@ -142,7 +142,7 @@ public: /*{{{*/ \param Cache the packages are in \param string String the package name(s) should be extracted from - \param out stream to print various notices to */ + \param helper responsible for error and message handling */ static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string, CacheSetHelper &helper); static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string) { CacheSetHelper helper; @@ -153,7 +153,7 @@ public: /*{{{*/ \param Cache the package is in \param string String the package name should be extracted from - \param out stream to print various notices to */ + \param helper responsible for error and message handling */ static pkgCache::PkgIterator FromName(pkgCacheFile &Cache, std::string const &string, CacheSetHelper &helper); static pkgCache::PkgIterator FromName(pkgCacheFile &Cache, std::string const &string) { CacheSetHelper helper; @@ -166,7 +166,7 @@ public: /*{{{*/ No special package command is supported, just plain names. \param Cache the packages are in \param cmdline Command line the package names should be extracted from - \param out stream to print various notices to */ + \param helper responsible for error and message handling */ static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, CacheSetHelper &helper); static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { CacheSetHelper helper; @@ -181,6 +181,17 @@ public: /*{{{*/ Modifier (unsigned short const &id, const char * const alias, Position const &pos) : ID(id), Alias(alias), Pos(pos) {}; }; + /** \brief group packages by a action modifiers + + At some point it is needed to get from the same commandline + different package sets grouped by a modifier. Take + apt-get install apt awesome- + as an example. + \param Cache the packages are in + \param cmdline Command line the package names should be extracted from + \param mods list of modifiers the method should accept + \param fallback the default modifier group for a package + \param helper responsible for error and message handling */ static std::map GroupedFromCommandLine( pkgCacheFile &Cache, const char **cmdline, std::list const &mods, @@ -193,6 +204,15 @@ public: /*{{{*/ return APT::PackageSet::GroupedFromCommandLine(Cache, cmdline, mods, fallback, helper); } + + enum Constructor { UNKNOWN, REGEX, TASK }; + Constructor getConstructor() const { return ConstructedBy; }; + + PackageSet() : ConstructedBy(UNKNOWN) {}; + PackageSet(Constructor const &by) : ConstructedBy(by) {}; + /*}}}*/ +private: /*{{{*/ + Constructor ConstructedBy; /*}}}*/ }; /*}}}*/ class VersionSet : public std::set { /*{{{*/ @@ -269,7 +289,7 @@ public: /*{{{*/ non specifically requested and executes regex's if needed on names. \param Cache the packages and versions are in \param cmdline Command line the versions should be extracted from - \param out stream to print various notices to */ + \param helper responsible for error and message handling */ static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, APT::VersionSet::Version const &fallback, CacheSetHelper &helper); static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, @@ -299,8 +319,16 @@ public: /*{{{*/ \param P the package in question \param fallback the version(s) you want to get \param helper the helper used for display and error handling */ - static VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P, + static APT::VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P, VersionSet::Version const &fallback, CacheSetHelper &helper); + static APT::VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P, + APT::VersionSet::Version const &fallback) { + CacheSetHelper helper; + return APT::VersionSet::FromPackage(Cache, P, fallback, helper); + } + static APT::VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P) { + return APT::VersionSet::FromPackage(Cache, P, CANDINST); + } struct Modifier { enum Position { NONE, PREFIX, POSTFIX }; -- cgit v1.2.3 From b8ad551295c70a882b629ee94668e8ea527d1a7d Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 3 Jul 2010 20:09:17 +0200 Subject: Refactor TryToInstall to look a bit saner by splitting the Remove and the Virtual packages part out of the loop. The function still exists unchanged as TryToInstallBuildDep through for the BuildDep installation method --- cmdline/apt-get.cc | 229 ++++++++++++++++++++++++++++++++++++++++------------ cmdline/cacheset.cc | 1 - 2 files changed, 177 insertions(+), 53 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index d3ddcbfe8..d17300943 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1073,11 +1073,11 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, return true; } /*}}}*/ -// TryToInstall - Try to install a single package /*{{{*/ +// TryToInstallBuildDep - Try to install a single package /*{{{*/ // --------------------------------------------------------------------- /* This used to be inlined in DoInstall, but with the advent of regex package name matching it was split out.. */ -bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, +bool TryToInstallBuildDep(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, pkgProblemResolver &Fix,bool Remove,bool BrokenFix, bool AllowFail = true) { @@ -1552,6 +1552,93 @@ bool DoUpgrade(CommandLine &CmdL) return InstallPackages(Cache,true); } /*}}}*/ +// TryToInstall - Mark a package for installation /*{{{*/ +struct TryToInstall { + pkgCacheFile* Cache; + pkgProblemResolver* Fix; + bool FixBroken; + unsigned long AutoMarkChanged; + + TryToInstall(pkgCacheFile &Cache, pkgProblemResolver &PM, bool const &FixBroken) : Cache(&Cache), Fix(&PM), + FixBroken(FixBroken), AutoMarkChanged(0) {}; + + void operator() (pkgCache::VerIterator const &Ver) { + pkgCache::PkgIterator Pkg = Ver.ParentPkg(); + Cache->GetDepCache()->SetCandidateVersion(Ver); + pkgDepCache::StateCache &State = (*Cache)[Pkg]; + + // Handle the no-upgrade case + if (_config->FindB("APT::Get::upgrade",true) == false && Pkg->CurrentVer != 0) + ioprintf(c1out,_("Skipping %s, it is already installed and upgrade is not set.\n"), + Pkg.FullName(true).c_str()); + // Ignore request for install if package would be new + else if (_config->FindB("APT::Get::Only-Upgrade", false) == true && Pkg->CurrentVer == 0) + ioprintf(c1out,_("Skipping %s, it is not installed and only upgrades are requested.\n"), + Pkg.FullName(true).c_str()); + else { + Fix->Clear(Pkg); + Fix->Protect(Pkg); + Cache->GetDepCache()->MarkInstall(Pkg,false); + + if (State.Install() == false) { + if (_config->FindB("APT::Get::ReInstall",false) == true) { + if (Pkg->CurrentVer == 0 || Pkg.CurrentVer().Downloadable() == false) + ioprintf(c1out,_("Reinstallation of %s is not possible, it cannot be downloaded.\n"), + Pkg.FullName(true).c_str()); + else + Cache->GetDepCache()->SetReInstall(Pkg, true); + } else + ioprintf(c1out,_("%s is already the newest version.\n"), + Pkg.FullName(true).c_str()); + } + + // Install it with autoinstalling enabled (if we not respect the minial + // required deps or the policy) + if ((State.InstBroken() == true || State.InstPolicyBroken() == true) && FixBroken == false) + Cache->GetDepCache()->MarkInstall(Pkg,true); + } + + // see if we need to fix the auto-mark flag + // e.g. apt-get install foo + // where foo is marked automatic + if (State.Install() == false && + (State.Flags & pkgCache::Flag::Auto) && + _config->FindB("APT::Get::ReInstall",false) == false && + _config->FindB("APT::Get::Only-Upgrade",false) == false && + _config->FindB("APT::Get::Download-Only",false) == false) + { + ioprintf(c1out,_("%s set to manually installed.\n"), + Pkg.FullName(true).c_str()); + Cache->GetDepCache()->MarkAuto(Pkg,false); + AutoMarkChanged++; + } + } +}; + /*}}}*/ +// TryToRemove - Mark a package for removal /*{{{*/ +struct TryToRemove { + pkgCacheFile* Cache; + pkgProblemResolver* Fix; + bool FixBroken; + unsigned long AutoMarkChanged; + + TryToRemove(pkgCacheFile &Cache, pkgProblemResolver &PM) : Cache(&Cache), Fix(&PM) {}; + + void operator() (pkgCache::VerIterator const &Ver) + { + pkgCache::PkgIterator Pkg = Ver.ParentPkg(); + + Fix->Clear(Pkg); + Fix->Protect(Pkg); + Fix->Remove(Pkg); + + if (Pkg->CurrentVer == 0) + ioprintf(c1out,_("Package %s is not installed, so not removed\n"),Pkg.FullName(true).c_str()); + else + Cache->GetDepCache()->MarkDelete(Pkg,_config->FindB("APT::Get::Purge",false)); + } +}; + /*}}}*/ // CacheSetHelperAPTGet - responsible for message telling from the CacheSets/*{{{*/ class CacheSetHelperAPTGet : public APT::CacheSetHelper { /** \brief stream message should be printed to */ @@ -1559,6 +1646,8 @@ class CacheSetHelperAPTGet : public APT::CacheSetHelper { /** \brief were things like Task or RegEx used to select packages? */ bool explicitlyNamed; + APT::PackageSet virtualPkgs; + public: CacheSetHelperAPTGet(std::ostream &out) : APT::CacheSetHelper(true), out(out) { explicitlyNamed = true; @@ -1583,23 +1672,85 @@ public: Ver.VerStr(), Ver.RelStr().c_str(), Pkg.FullName(true).c_str()); } - virtual APT::VersionSet canNotFindCandInstVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { - return tryVirtualPackage(Cache, Pkg, APT::VersionSet::CANDINST); + void showVirtualPackageErrors(pkgCacheFile &Cache) { + for (APT::PackageSet::const_iterator Pkg = virtualPkgs.begin(); + Pkg != virtualPkgs.end(); ++Pkg) { + if (Pkg->ProvidesList != 0) { + ioprintf(c1out,_("Package %s is a virtual package provided by:\n"), + Pkg.FullName(true).c_str()); + + pkgCache::PrvIterator I = Pkg.ProvidesList(); + unsigned short provider = 0; + for (; I.end() == false; ++I) { + pkgCache::PkgIterator Pkg = I.OwnerPkg(); + + if (Cache[Pkg].CandidateVerIter(Cache) == I.OwnerVer()) { + out << " " << Pkg.FullName(true) << " " << I.OwnerVer().VerStr(); + if (Cache[Pkg].Install() == true && Cache[Pkg].NewInstall() == false) + out << _(" [Installed]"); + out << endl; + ++provider; + } + } + // if we found no candidate which provide this package, show non-candidates + if (provider == 0) + for (I = Pkg.ProvidesList(); I.end() == false; I++) + out << " " << I.OwnerPkg().FullName(true) << " " << I.OwnerVer().VerStr() + << _(" [Not candidate version]") << endl; + else + out << _("You should explicitly select one to install.") << endl; + } else { + ioprintf(out, + _("Package %s is not available, but is referred to by another package.\n" + "This may mean that the package is missing, has been obsoleted, or\n" + "is only available from another source\n"),Pkg.FullName(true).c_str()); + + string List; + string VersionsList; + SPtrArray Seen = new bool[Cache.GetPkgCache()->Head().PackageCount]; + memset(Seen,0,Cache.GetPkgCache()->Head().PackageCount*sizeof(*Seen)); + for (pkgCache::DepIterator Dep = Pkg.RevDependsList(); + Dep.end() == false; Dep++) { + if (Dep->Type != pkgCache::Dep::Replaces) + continue; + if (Seen[Dep.ParentPkg()->ID] == true) + continue; + Seen[Dep.ParentPkg()->ID] = true; + List += Dep.ParentPkg().FullName(true) + " "; + //VersionsList += string(Dep.ParentPkg().CurVersion) + "\n"; ??? + } + ShowList(out,_("However the following packages replace it:"),List,VersionsList); + } + out << std::endl; + } } - virtual APT::VersionSet canNotFindInstCandVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { - return tryVirtualPackage(Cache, Pkg, APT::VersionSet::INSTCAND); + virtual pkgCache::VerIterator canNotFindCandidateVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { + APT::VersionSet const verset = tryVirtualPackage(Cache, Pkg, APT::VersionSet::CANDIDATE); + if (verset.empty() == false) + return *(verset.begin()); + if (ShowError == true) { + _error->Error(_("Package '%s' has no installation candidate"),Pkg.FullName(true).c_str()); + virtualPkgs.insert(Pkg); + } + return pkgCache::VerIterator(Cache, 0); + } + + virtual pkgCache::VerIterator canNotFindNewestVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { + APT::VersionSet const verset = tryVirtualPackage(Cache, Pkg, APT::VersionSet::NEWEST); + if (verset.empty() == false) + return *(verset.begin()); + if (ShowError == true) + ioprintf(out, _("Virtual packages like '%s' can't be removed\n"), Pkg.FullName(true).c_str()); + return pkgCache::VerIterator(Cache, 0); } APT::VersionSet tryVirtualPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg, APT::VersionSet::Version const &select) { /* This is a pure virtual package and there is a single available candidate providing it. */ - if (unlikely(Cache[Pkg].CandidateVer != 0) || Pkg->ProvidesList == 0) { - if (select == APT::VersionSet::CANDINST) - return APT::CacheSetHelper::canNotFindCandInstVer(Cache, Pkg); - return APT::CacheSetHelper::canNotFindInstCandVer(Cache, Pkg); - } + if (unlikely(Cache[Pkg].CandidateVer != 0) || Pkg->ProvidesList == 0) + return APT::VersionSet(); pkgCache::PkgIterator Prov; bool found_one = false; @@ -1625,9 +1776,7 @@ public: Prov.FullName(true).c_str(), Pkg.FullName(true).c_str()); return APT::VersionSet::FromPackage(Cache, Prov, select, *this); } - if (select == APT::VersionSet::CANDINST) - return APT::CacheSetHelper::canNotFindCandInstVer(Cache, Pkg); - return APT::CacheSetHelper::canNotFindInstCandVer(Cache, Pkg); + return APT::VersionSet(); } inline bool allPkgNamedExplicitly() const { return explicitlyNamed; } @@ -1649,7 +1798,6 @@ bool DoInstall(CommandLine &CmdL) if (Cache->BrokenCount() != 0) BrokenFix = true; - unsigned int AutoMarkChanged = 0; pkgProblemResolver Fix(Cache); static const unsigned short MOD_REMOVE = 1; @@ -1671,15 +1819,18 @@ bool DoInstall(CommandLine &CmdL) std::list mods; mods.push_back(APT::VersionSet::Modifier(MOD_INSTALL, "+", - APT::VersionSet::Modifier::POSTFIX, APT::VersionSet::CANDINST)); + APT::VersionSet::Modifier::POSTFIX, APT::VersionSet::CANDIDATE)); mods.push_back(APT::VersionSet::Modifier(MOD_REMOVE, "-", - APT::VersionSet::Modifier::POSTFIX, APT::VersionSet::INSTCAND)); + APT::VersionSet::Modifier::POSTFIX, APT::VersionSet::NEWEST)); CacheSetHelperAPTGet helper(c0out); std::map verset = APT::VersionSet::GroupedFromCommandLine(Cache, CmdL.FileList + 1, mods, fallback, helper); if (_error->PendingError() == true) + { + helper.showVirtualPackageErrors(Cache); return false; + } unsigned short order[] = { 0, 0, 0 }; if (fallback == MOD_INSTALL) { @@ -1690,45 +1841,19 @@ bool DoInstall(CommandLine &CmdL) order[1] = MOD_INSTALL; } + TryToInstall InstallAction(Cache, Fix, BrokenFix); + TryToRemove RemoveAction(Cache, Fix); + // new scope for the ActionGroup { pkgDepCache::ActionGroup group(Cache); + for (unsigned short i = 0; order[i] != 0; ++i) { if (order[i] == MOD_INSTALL) - for (APT::VersionSet::const_iterator Ver = verset[MOD_INSTALL].begin(); - Ver != verset[MOD_INSTALL].end(); ++Ver) - { - pkgCache::PkgIterator Pkg = Ver.ParentPkg(); - Cache->SetCandidateVersion(Ver); - - if (TryToInstall(Pkg, Cache, Fix, false, BrokenFix) == false) - return false; - - // see if we need to fix the auto-mark flag - // e.g. apt-get install foo - // where foo is marked automatic - if (Cache[Pkg].Install() == false && - (Cache[Pkg].Flags & pkgCache::Flag::Auto) && - _config->FindB("APT::Get::ReInstall",false) == false && - _config->FindB("APT::Get::Only-Upgrade",false) == false && - _config->FindB("APT::Get::Download-Only",false) == false) - { - ioprintf(c1out,_("%s set to manually installed.\n"), - Pkg.FullName(true).c_str()); - Cache->MarkAuto(Pkg,false); - AutoMarkChanged++; - } - } + InstallAction = std::for_each(verset[MOD_INSTALL].begin(), verset[MOD_INSTALL].end(), InstallAction); else if (order[i] == MOD_REMOVE) - for (APT::VersionSet::const_iterator Ver = verset[MOD_REMOVE].begin(); - Ver != verset[MOD_REMOVE].end(); ++Ver) - { - pkgCache::PkgIterator Pkg = Ver.ParentPkg(); - - if (TryToInstall(Pkg, Cache, Fix, true, BrokenFix) == false) - return false; - } + RemoveAction = std::for_each(verset[MOD_REMOVE].begin(), verset[MOD_REMOVE].end(), RemoveAction); } if (_error->PendingError() == true) @@ -1899,7 +2024,7 @@ bool DoInstall(CommandLine &CmdL) // if nothing changed in the cache, but only the automark information // we write the StateFile here, otherwise it will be written in // cache.commit() - if (AutoMarkChanged > 0 && + if (InstallAction.AutoMarkChanged > 0 && Cache->DelCount() == 0 && Cache->InstCount() == 0 && Cache->BadCount() == 0 && _config->FindB("APT::Get::Simulate",false) == false) @@ -2521,7 +2646,7 @@ bool DoBuildDep(CommandLine &CmdL) */ if (IV.end() == false && Cache->VS().CheckDep(IV.VerStr(),(*D).Op,(*D).Version.c_str()) == true) - TryToInstall(Pkg,Cache,Fix,true,false); + TryToInstallBuildDep(Pkg,Cache,Fix,true,false); } else // BuildDep || BuildDepIndep { @@ -2637,7 +2762,7 @@ bool DoBuildDep(CommandLine &CmdL) if (_config->FindB("Debug::BuildDeps",false) == true) cout << " Trying to install " << (*D).Package << endl; - if (TryToInstall(Pkg,Cache,Fix,false,false) == true) + if (TryToInstallBuildDep(Pkg,Cache,Fix,false,false) == true) { // We successfully installed something; skip remaining alternatives skipAlternatives = hasAlternatives; diff --git a/cmdline/cacheset.cc b/cmdline/cacheset.cc index 4d6d6a87c..b96b60450 100644 --- a/cmdline/cacheset.cc +++ b/cmdline/cacheset.cc @@ -323,7 +323,6 @@ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, errors = helper.showErrors(false); for (PackageSet::const_iterator P = pkgset.begin(); P != pkgset.end(); ++P) { - helper.canNotFindCandidateVer(Cache, P); if (vertag == string::npos) { verset.insert(VersionSet::FromPackage(Cache, P, fallback, helper)); continue; -- cgit v1.2.3 From 21d4c9f192b5af9c8edb39356712aac853881348 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 3 Jul 2010 23:55:12 +0200 Subject: reorder classes a bit and make TryToInstallBuildDep use them --- cmdline/apt-get.cc | 610 ++++++++++++++++++++++------------------------------- 1 file changed, 250 insertions(+), 360 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index d17300943..38b93e7e5 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -609,6 +609,240 @@ void Stats(ostream &out,pkgDepCache &Dep) Dep.BadCount()); } /*}}}*/ +// CacheSetHelperAPTGet - responsible for message telling from the CacheSets/*{{{*/ +class CacheSetHelperAPTGet : public APT::CacheSetHelper { + /** \brief stream message should be printed to */ + std::ostream &out; + /** \brief were things like Task or RegEx used to select packages? */ + bool explicitlyNamed; + + APT::PackageSet virtualPkgs; + +public: + CacheSetHelperAPTGet(std::ostream &out) : APT::CacheSetHelper(true), out(out) { + explicitlyNamed = true; + } + + virtual void showTaskSelection(APT::PackageSet const &pkgset, string const &pattern) { + for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) + ioprintf(out, _("Note, selecting '%s' for task '%s'\n"), + Pkg.FullName(true).c_str(), pattern.c_str()); + explicitlyNamed = false; + } + virtual void showRegExSelection(APT::PackageSet const &pkgset, string const &pattern) { + for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) + ioprintf(out, _("Note, selecting '%s' for regex '%s'\n"), + Pkg.FullName(true).c_str(), pattern.c_str()); + explicitlyNamed = false; + } + virtual void showSelectedVersion(pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const Ver, + string const &ver, bool const &verIsRel) { + if (ver != Ver.VerStr()) + ioprintf(out, _("Selected version '%s' (%s) for '%s'\n"), + Ver.VerStr(), Ver.RelStr().c_str(), Pkg.FullName(true).c_str()); + } + + bool showVirtualPackageErrors(pkgCacheFile &Cache) { + if (virtualPkgs.empty() == true) + return true; + for (APT::PackageSet::const_iterator Pkg = virtualPkgs.begin(); + Pkg != virtualPkgs.end(); ++Pkg) { + if (Pkg->ProvidesList != 0) { + ioprintf(c1out,_("Package %s is a virtual package provided by:\n"), + Pkg.FullName(true).c_str()); + + pkgCache::PrvIterator I = Pkg.ProvidesList(); + unsigned short provider = 0; + for (; I.end() == false; ++I) { + pkgCache::PkgIterator Pkg = I.OwnerPkg(); + + if (Cache[Pkg].CandidateVerIter(Cache) == I.OwnerVer()) { + out << " " << Pkg.FullName(true) << " " << I.OwnerVer().VerStr(); + if (Cache[Pkg].Install() == true && Cache[Pkg].NewInstall() == false) + out << _(" [Installed]"); + out << endl; + ++provider; + } + } + // if we found no candidate which provide this package, show non-candidates + if (provider == 0) + for (I = Pkg.ProvidesList(); I.end() == false; I++) + out << " " << I.OwnerPkg().FullName(true) << " " << I.OwnerVer().VerStr() + << _(" [Not candidate version]") << endl; + else + out << _("You should explicitly select one to install.") << endl; + } else { + ioprintf(out, + _("Package %s is not available, but is referred to by another package.\n" + "This may mean that the package is missing, has been obsoleted, or\n" + "is only available from another source\n"),Pkg.FullName(true).c_str()); + + string List; + string VersionsList; + SPtrArray Seen = new bool[Cache.GetPkgCache()->Head().PackageCount]; + memset(Seen,0,Cache.GetPkgCache()->Head().PackageCount*sizeof(*Seen)); + for (pkgCache::DepIterator Dep = Pkg.RevDependsList(); + Dep.end() == false; Dep++) { + if (Dep->Type != pkgCache::Dep::Replaces) + continue; + if (Seen[Dep.ParentPkg()->ID] == true) + continue; + Seen[Dep.ParentPkg()->ID] = true; + List += Dep.ParentPkg().FullName(true) + " "; + //VersionsList += string(Dep.ParentPkg().CurVersion) + "\n"; ??? + } + ShowList(out,_("However the following packages replace it:"),List,VersionsList); + } + out << std::endl; + } + return false; + } + + virtual pkgCache::VerIterator canNotFindCandidateVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { + APT::VersionSet const verset = tryVirtualPackage(Cache, Pkg, APT::VersionSet::CANDIDATE); + if (verset.empty() == false) + return *(verset.begin()); + if (ShowError == true) { + _error->Error(_("Package '%s' has no installation candidate"),Pkg.FullName(true).c_str()); + virtualPkgs.insert(Pkg); + } + return pkgCache::VerIterator(Cache, 0); + } + + virtual pkgCache::VerIterator canNotFindNewestVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { + APT::VersionSet const verset = tryVirtualPackage(Cache, Pkg, APT::VersionSet::NEWEST); + if (verset.empty() == false) + return *(verset.begin()); + if (ShowError == true) + ioprintf(out, _("Virtual packages like '%s' can't be removed\n"), Pkg.FullName(true).c_str()); + return pkgCache::VerIterator(Cache, 0); + } + + APT::VersionSet tryVirtualPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg, + APT::VersionSet::Version const &select) { + /* This is a pure virtual package and there is a single available + candidate providing it. */ + if (unlikely(Cache[Pkg].CandidateVer != 0) || Pkg->ProvidesList == 0) + return APT::VersionSet(); + + pkgCache::PkgIterator Prov; + bool found_one = false; + for (pkgCache::PrvIterator P = Pkg.ProvidesList(); P; ++P) { + pkgCache::VerIterator const PVer = P.OwnerVer(); + pkgCache::PkgIterator const PPkg = PVer.ParentPkg(); + + /* Ignore versions that are not a candidate. */ + if (Cache[PPkg].CandidateVer != PVer) + continue; + + if (found_one == false) { + Prov = PPkg; + found_one = true; + } else if (PPkg != Prov) { + found_one = false; // we found at least two + break; + } + } + + if (found_one == true) { + ioprintf(out, _("Note, selecting '%s' instead of '%s'\n"), + Prov.FullName(true).c_str(), Pkg.FullName(true).c_str()); + return APT::VersionSet::FromPackage(Cache, Prov, select, *this); + } + return APT::VersionSet(); + } + + inline bool allPkgNamedExplicitly() const { return explicitlyNamed; } + +}; + /*}}}*/ +// TryToInstall - Mark a package for installation /*{{{*/ +struct TryToInstall { + pkgCacheFile* Cache; + pkgProblemResolver* Fix; + bool FixBroken; + unsigned long AutoMarkChanged; + + TryToInstall(pkgCacheFile &Cache, pkgProblemResolver &PM, bool const &FixBroken) : Cache(&Cache), Fix(&PM), + FixBroken(FixBroken), AutoMarkChanged(0) {}; + + void operator() (pkgCache::VerIterator const &Ver) { + pkgCache::PkgIterator Pkg = Ver.ParentPkg(); + Cache->GetDepCache()->SetCandidateVersion(Ver); + pkgDepCache::StateCache &State = (*Cache)[Pkg]; + + // Handle the no-upgrade case + if (_config->FindB("APT::Get::upgrade",true) == false && Pkg->CurrentVer != 0) + ioprintf(c1out,_("Skipping %s, it is already installed and upgrade is not set.\n"), + Pkg.FullName(true).c_str()); + // Ignore request for install if package would be new + else if (_config->FindB("APT::Get::Only-Upgrade", false) == true && Pkg->CurrentVer == 0) + ioprintf(c1out,_("Skipping %s, it is not installed and only upgrades are requested.\n"), + Pkg.FullName(true).c_str()); + else { + Fix->Clear(Pkg); + Fix->Protect(Pkg); + Cache->GetDepCache()->MarkInstall(Pkg,false); + + if (State.Install() == false) { + if (_config->FindB("APT::Get::ReInstall",false) == true) { + if (Pkg->CurrentVer == 0 || Pkg.CurrentVer().Downloadable() == false) + ioprintf(c1out,_("Reinstallation of %s is not possible, it cannot be downloaded.\n"), + Pkg.FullName(true).c_str()); + else + Cache->GetDepCache()->SetReInstall(Pkg, true); + } else + ioprintf(c1out,_("%s is already the newest version.\n"), + Pkg.FullName(true).c_str()); + } + + // Install it with autoinstalling enabled (if we not respect the minial + // required deps or the policy) + if ((State.InstBroken() == true || State.InstPolicyBroken() == true) && FixBroken == false) + Cache->GetDepCache()->MarkInstall(Pkg,true); + } + + // see if we need to fix the auto-mark flag + // e.g. apt-get install foo + // where foo is marked automatic + if (State.Install() == false && + (State.Flags & pkgCache::Flag::Auto) && + _config->FindB("APT::Get::ReInstall",false) == false && + _config->FindB("APT::Get::Only-Upgrade",false) == false && + _config->FindB("APT::Get::Download-Only",false) == false) + { + ioprintf(c1out,_("%s set to manually installed.\n"), + Pkg.FullName(true).c_str()); + Cache->GetDepCache()->MarkAuto(Pkg,false); + AutoMarkChanged++; + } + } +}; + /*}}}*/ +// TryToRemove - Mark a package for removal /*{{{*/ +struct TryToRemove { + pkgCacheFile* Cache; + pkgProblemResolver* Fix; + bool FixBroken; + unsigned long AutoMarkChanged; + + TryToRemove(pkgCacheFile &Cache, pkgProblemResolver &PM) : Cache(&Cache), Fix(&PM) {}; + + void operator() (pkgCache::VerIterator const &Ver) + { + pkgCache::PkgIterator Pkg = Ver.ParentPkg(); + + Fix->Clear(Pkg); + Fix->Protect(Pkg); + Fix->Remove(Pkg); + + if (Pkg->CurrentVer == 0) + ioprintf(c1out,_("Package %s is not installed, so not removed\n"),Pkg.FullName(true).c_str()); + else + Cache->GetDepCache()->MarkDelete(Pkg,_config->FindB("APT::Get::Purge",false)); + } +}; + /*}}}*/ // CacheFile::NameComp - QSort compare by name /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -1077,143 +1311,30 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, // --------------------------------------------------------------------- /* This used to be inlined in DoInstall, but with the advent of regex package name matching it was split out.. */ -bool TryToInstallBuildDep(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, +bool TryToInstallBuildDep(pkgCache::PkgIterator Pkg,pkgCacheFile &Cache, pkgProblemResolver &Fix,bool Remove,bool BrokenFix, bool AllowFail = true) { - - // Handle the no-upgrade case - if (_config->FindB("APT::Get::upgrade",true) == false && - Pkg->CurrentVer != 0) - { - if (AllowFail == true) - ioprintf(c1out,_("Skipping %s, it is already installed and upgrade is not set.\n"), - Pkg.FullName(true).c_str()); - return true; - } - - // Ignore request for install if package would be new - if (_config->FindB("APT::Get::Only-Upgrade", false) == true && - Pkg->CurrentVer == 0) - { - if (AllowFail == true) - ioprintf(c1out,_("Skipping %s, it is not installed and only upgrades are requested.\n"), - Pkg.Name()); - return true; - } - - // Check if there is something at all to install - pkgDepCache::StateCache &State = Cache[Pkg]; - if (Remove == true && Pkg->CurrentVer == 0) - { - Fix.Clear(Pkg); - Fix.Protect(Pkg); - Fix.Remove(Pkg); - - /* We want to continue searching for regex hits, so we return false here - otherwise this is not really an error. */ - if (AllowFail == false) - return false; - - ioprintf(c1out,_("Package %s is not installed, so not removed\n"),Pkg.FullName(true).c_str()); - return true; - } - - if (State.CandidateVer == 0 && Remove == false) + if (Cache[Pkg].CandidateVer == 0 && Pkg->ProvidesList != 0) { - if (AllowFail == false) - return false; - - if (Pkg->ProvidesList != 0) - { - ioprintf(c1out,_("Package %s is a virtual package provided by:\n"), - Pkg.FullName(true).c_str()); - - pkgCache::PrvIterator I = Pkg.ProvidesList(); - unsigned short provider = 0; - for (; I.end() == false; I++) - { - pkgCache::PkgIterator Pkg = I.OwnerPkg(); - - if (Cache[Pkg].CandidateVerIter(Cache) == I.OwnerVer()) - { - c1out << " " << Pkg.FullName(true) << " " << I.OwnerVer().VerStr(); - if (Cache[Pkg].Install() == true && Cache[Pkg].NewInstall() == false) - c1out << _(" [Installed]"); - c1out << endl; - ++provider; - } - } - // if we found no candidate which provide this package, show non-candidates - if (provider == 0) - for (I = Pkg.ProvidesList(); I.end() == false; I++) - c1out << " " << I.OwnerPkg().FullName(true) << " " << I.OwnerVer().VerStr() - << _(" [Not candidate version]") << endl; - else - c1out << _("You should explicitly select one to install.") << endl; - } - else - { - ioprintf(c1out, - _("Package %s is not available, but is referred to by another package.\n" - "This may mean that the package is missing, has been obsoleted, or\n" - "is only available from another source\n"),Pkg.FullName(true).c_str()); - - string List; - string VersionsList; - SPtrArray Seen = new bool[Cache.Head().PackageCount]; - memset(Seen,0,Cache.Head().PackageCount*sizeof(*Seen)); - pkgCache::DepIterator Dep = Pkg.RevDependsList(); - for (; Dep.end() == false; Dep++) - { - if (Dep->Type != pkgCache::Dep::Replaces) - continue; - if (Seen[Dep.ParentPkg()->ID] == true) - continue; - Seen[Dep.ParentPkg()->ID] = true; - List += Dep.ParentPkg().FullName(true) + " "; - //VersionsList += string(Dep.ParentPkg().CurVersion) + "\n"; ??? - } - ShowList(c1out,_("However the following packages replace it:"),List,VersionsList); - } - - _error->Error(_("Package %s has no installation candidate"),Pkg.FullName(true).c_str()); - return false; + CacheSetHelperAPTGet helper(c1out); + helper.showErrors(AllowFail == false); + pkgCache::VerIterator Ver = helper.canNotFindNewestVer(Cache, Pkg); + if (Ver.end() == false) + Pkg = Ver.ParentPkg(); + else if (helper.showVirtualPackageErrors(Cache) == false) + return AllowFail; } - Fix.Clear(Pkg); - Fix.Protect(Pkg); if (Remove == true) { - Fix.Remove(Pkg); - Cache.MarkDelete(Pkg,_config->FindB("APT::Get::Purge",false)); - return true; - } - - // Install it - Cache.MarkInstall(Pkg,false); - if (State.Install() == false) - { - if (_config->FindB("APT::Get::ReInstall",false) == true) - { - if (Pkg->CurrentVer == 0 || Pkg.CurrentVer().Downloadable() == false) - ioprintf(c1out,_("Reinstallation of %s is not possible, it cannot be downloaded.\n"), - Pkg.FullName(true).c_str()); - else - Cache.SetReInstall(Pkg,true); - } - else - { - if (AllowFail == true) - ioprintf(c1out,_("%s is already the newest version.\n"), - Pkg.FullName(true).c_str()); - } - } - - // Install it with autoinstalling enabled (if we not respect the minial - // required deps or the policy) - if ((State.InstBroken() == true || State.InstPolicyBroken() == true) && BrokenFix == false) - Cache.MarkInstall(Pkg,true); + TryToRemove RemoveAction(Cache, Fix); + RemoveAction(Pkg.VersionList()); + } else if (Cache[Pkg].CandidateVer != 0) { + TryToInstall InstallAction(Cache, Fix, BrokenFix); + InstallAction(Cache[Pkg].CandidateVerIter(Cache)); + } else + return AllowFail; return true; } @@ -1552,237 +1673,6 @@ bool DoUpgrade(CommandLine &CmdL) return InstallPackages(Cache,true); } /*}}}*/ -// TryToInstall - Mark a package for installation /*{{{*/ -struct TryToInstall { - pkgCacheFile* Cache; - pkgProblemResolver* Fix; - bool FixBroken; - unsigned long AutoMarkChanged; - - TryToInstall(pkgCacheFile &Cache, pkgProblemResolver &PM, bool const &FixBroken) : Cache(&Cache), Fix(&PM), - FixBroken(FixBroken), AutoMarkChanged(0) {}; - - void operator() (pkgCache::VerIterator const &Ver) { - pkgCache::PkgIterator Pkg = Ver.ParentPkg(); - Cache->GetDepCache()->SetCandidateVersion(Ver); - pkgDepCache::StateCache &State = (*Cache)[Pkg]; - - // Handle the no-upgrade case - if (_config->FindB("APT::Get::upgrade",true) == false && Pkg->CurrentVer != 0) - ioprintf(c1out,_("Skipping %s, it is already installed and upgrade is not set.\n"), - Pkg.FullName(true).c_str()); - // Ignore request for install if package would be new - else if (_config->FindB("APT::Get::Only-Upgrade", false) == true && Pkg->CurrentVer == 0) - ioprintf(c1out,_("Skipping %s, it is not installed and only upgrades are requested.\n"), - Pkg.FullName(true).c_str()); - else { - Fix->Clear(Pkg); - Fix->Protect(Pkg); - Cache->GetDepCache()->MarkInstall(Pkg,false); - - if (State.Install() == false) { - if (_config->FindB("APT::Get::ReInstall",false) == true) { - if (Pkg->CurrentVer == 0 || Pkg.CurrentVer().Downloadable() == false) - ioprintf(c1out,_("Reinstallation of %s is not possible, it cannot be downloaded.\n"), - Pkg.FullName(true).c_str()); - else - Cache->GetDepCache()->SetReInstall(Pkg, true); - } else - ioprintf(c1out,_("%s is already the newest version.\n"), - Pkg.FullName(true).c_str()); - } - - // Install it with autoinstalling enabled (if we not respect the minial - // required deps or the policy) - if ((State.InstBroken() == true || State.InstPolicyBroken() == true) && FixBroken == false) - Cache->GetDepCache()->MarkInstall(Pkg,true); - } - - // see if we need to fix the auto-mark flag - // e.g. apt-get install foo - // where foo is marked automatic - if (State.Install() == false && - (State.Flags & pkgCache::Flag::Auto) && - _config->FindB("APT::Get::ReInstall",false) == false && - _config->FindB("APT::Get::Only-Upgrade",false) == false && - _config->FindB("APT::Get::Download-Only",false) == false) - { - ioprintf(c1out,_("%s set to manually installed.\n"), - Pkg.FullName(true).c_str()); - Cache->GetDepCache()->MarkAuto(Pkg,false); - AutoMarkChanged++; - } - } -}; - /*}}}*/ -// TryToRemove - Mark a package for removal /*{{{*/ -struct TryToRemove { - pkgCacheFile* Cache; - pkgProblemResolver* Fix; - bool FixBroken; - unsigned long AutoMarkChanged; - - TryToRemove(pkgCacheFile &Cache, pkgProblemResolver &PM) : Cache(&Cache), Fix(&PM) {}; - - void operator() (pkgCache::VerIterator const &Ver) - { - pkgCache::PkgIterator Pkg = Ver.ParentPkg(); - - Fix->Clear(Pkg); - Fix->Protect(Pkg); - Fix->Remove(Pkg); - - if (Pkg->CurrentVer == 0) - ioprintf(c1out,_("Package %s is not installed, so not removed\n"),Pkg.FullName(true).c_str()); - else - Cache->GetDepCache()->MarkDelete(Pkg,_config->FindB("APT::Get::Purge",false)); - } -}; - /*}}}*/ -// CacheSetHelperAPTGet - responsible for message telling from the CacheSets/*{{{*/ -class CacheSetHelperAPTGet : public APT::CacheSetHelper { - /** \brief stream message should be printed to */ - std::ostream &out; - /** \brief were things like Task or RegEx used to select packages? */ - bool explicitlyNamed; - - APT::PackageSet virtualPkgs; - -public: - CacheSetHelperAPTGet(std::ostream &out) : APT::CacheSetHelper(true), out(out) { - explicitlyNamed = true; - } - - virtual void showTaskSelection(APT::PackageSet const &pkgset, string const &pattern) { - for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) - ioprintf(out, _("Note, selecting '%s' for task '%s'\n"), - Pkg.FullName(true).c_str(), pattern.c_str()); - explicitlyNamed = false; - } - virtual void showRegExSelection(APT::PackageSet const &pkgset, string const &pattern) { - for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) - ioprintf(out, _("Note, selecting '%s' for regex '%s'\n"), - Pkg.FullName(true).c_str(), pattern.c_str()); - explicitlyNamed = false; - } - virtual void showSelectedVersion(pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const Ver, - string const &ver, bool const &verIsRel) { - if (ver != Ver.VerStr()) - ioprintf(out, _("Selected version '%s' (%s) for '%s'\n"), - Ver.VerStr(), Ver.RelStr().c_str(), Pkg.FullName(true).c_str()); - } - - void showVirtualPackageErrors(pkgCacheFile &Cache) { - for (APT::PackageSet::const_iterator Pkg = virtualPkgs.begin(); - Pkg != virtualPkgs.end(); ++Pkg) { - if (Pkg->ProvidesList != 0) { - ioprintf(c1out,_("Package %s is a virtual package provided by:\n"), - Pkg.FullName(true).c_str()); - - pkgCache::PrvIterator I = Pkg.ProvidesList(); - unsigned short provider = 0; - for (; I.end() == false; ++I) { - pkgCache::PkgIterator Pkg = I.OwnerPkg(); - - if (Cache[Pkg].CandidateVerIter(Cache) == I.OwnerVer()) { - out << " " << Pkg.FullName(true) << " " << I.OwnerVer().VerStr(); - if (Cache[Pkg].Install() == true && Cache[Pkg].NewInstall() == false) - out << _(" [Installed]"); - out << endl; - ++provider; - } - } - // if we found no candidate which provide this package, show non-candidates - if (provider == 0) - for (I = Pkg.ProvidesList(); I.end() == false; I++) - out << " " << I.OwnerPkg().FullName(true) << " " << I.OwnerVer().VerStr() - << _(" [Not candidate version]") << endl; - else - out << _("You should explicitly select one to install.") << endl; - } else { - ioprintf(out, - _("Package %s is not available, but is referred to by another package.\n" - "This may mean that the package is missing, has been obsoleted, or\n" - "is only available from another source\n"),Pkg.FullName(true).c_str()); - - string List; - string VersionsList; - SPtrArray Seen = new bool[Cache.GetPkgCache()->Head().PackageCount]; - memset(Seen,0,Cache.GetPkgCache()->Head().PackageCount*sizeof(*Seen)); - for (pkgCache::DepIterator Dep = Pkg.RevDependsList(); - Dep.end() == false; Dep++) { - if (Dep->Type != pkgCache::Dep::Replaces) - continue; - if (Seen[Dep.ParentPkg()->ID] == true) - continue; - Seen[Dep.ParentPkg()->ID] = true; - List += Dep.ParentPkg().FullName(true) + " "; - //VersionsList += string(Dep.ParentPkg().CurVersion) + "\n"; ??? - } - ShowList(out,_("However the following packages replace it:"),List,VersionsList); - } - out << std::endl; - } - } - - virtual pkgCache::VerIterator canNotFindCandidateVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { - APT::VersionSet const verset = tryVirtualPackage(Cache, Pkg, APT::VersionSet::CANDIDATE); - if (verset.empty() == false) - return *(verset.begin()); - if (ShowError == true) { - _error->Error(_("Package '%s' has no installation candidate"),Pkg.FullName(true).c_str()); - virtualPkgs.insert(Pkg); - } - return pkgCache::VerIterator(Cache, 0); - } - - virtual pkgCache::VerIterator canNotFindNewestVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { - APT::VersionSet const verset = tryVirtualPackage(Cache, Pkg, APT::VersionSet::NEWEST); - if (verset.empty() == false) - return *(verset.begin()); - if (ShowError == true) - ioprintf(out, _("Virtual packages like '%s' can't be removed\n"), Pkg.FullName(true).c_str()); - return pkgCache::VerIterator(Cache, 0); - } - - APT::VersionSet tryVirtualPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg, - APT::VersionSet::Version const &select) { - /* This is a pure virtual package and there is a single available - candidate providing it. */ - if (unlikely(Cache[Pkg].CandidateVer != 0) || Pkg->ProvidesList == 0) - return APT::VersionSet(); - - pkgCache::PkgIterator Prov; - bool found_one = false; - for (pkgCache::PrvIterator P = Pkg.ProvidesList(); P; ++P) { - pkgCache::VerIterator const PVer = P.OwnerVer(); - pkgCache::PkgIterator const PPkg = PVer.ParentPkg(); - - /* Ignore versions that are not a candidate. */ - if (Cache[PPkg].CandidateVer != PVer) - continue; - - if (found_one == false) { - Prov = PPkg; - found_one = true; - } else if (PPkg != Prov) { - found_one = false; // we found at least two - break; - } - } - - if (found_one == true) { - ioprintf(out, _("Note, selecting '%s' instead of '%s'\n"), - Prov.FullName(true).c_str(), Pkg.FullName(true).c_str()); - return APT::VersionSet::FromPackage(Cache, Prov, select, *this); - } - return APT::VersionSet(); - } - - inline bool allPkgNamedExplicitly() const { return explicitlyNamed; } - -}; - /*}}}*/ // DoInstall - Install packages from the command line /*{{{*/ // --------------------------------------------------------------------- /* Install named packages */ -- cgit v1.2.3 From 2fbfb111312257fa5fc29b0c2ed386fb712f960e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 4 Jul 2010 00:32:52 +0200 Subject: prefer the Policy if it is built instead of the DepCache and if DepCache is not available as fallback built the Policy --- cmdline/apt-get.cc | 3 +++ cmdline/cacheset.cc | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 38b93e7e5..9a6c12ee0 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -768,6 +768,9 @@ struct TryToInstall { void operator() (pkgCache::VerIterator const &Ver) { pkgCache::PkgIterator Pkg = Ver.ParentPkg(); + +std::clog << "INSTALL " << Pkg << " VER " << Ver.VerStr() << std::endl; + Cache->GetDepCache()->SetCandidateVersion(Ver); pkgDepCache::StateCache &State = (*Cache)[Pkg]; diff --git a/cmdline/cacheset.cc b/cmdline/cacheset.cc index b96b60450..78c9d3f6c 100644 --- a/cmdline/cacheset.cc +++ b/cmdline/cacheset.cc @@ -416,12 +416,13 @@ VersionSet VersionSet::FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator co pkgCache::VerIterator VersionSet::getCandidateVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper) { pkgCache::VerIterator Cand; - if (Cache.IsDepCacheBuilt() == true) - Cand = Cache[Pkg].CandidateVerIter(Cache); - else { + if (Cache.IsPolicyBuilt() == true || Cache.IsDepCacheBuilt() == false) + { if (unlikely(Cache.GetPolicy() == 0)) return pkgCache::VerIterator(Cache); Cand = Cache.GetPolicy()->GetCandidateVer(Pkg); + } else { + Cand = Cache[Pkg].CandidateVerIter(Cache); } if (Cand.end() == true) return helper.canNotFindCandidateVer(Cache, Pkg); -- cgit v1.2.3 From e841200b9389ffc90e290310207bcb47e8a52be2 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 4 Jul 2010 14:23:20 +0200 Subject: * apt-pkg/policy.h: - add another round of const& madness as the previous round accidently NOT override the virtual GetCandidateVer() method (Closes: #587725) --- apt-pkg/algorithms.h | 2 +- apt-pkg/cacheiterators.h | 32 ++++++++++++++++---------------- apt-pkg/depcache.cc | 4 ++-- apt-pkg/depcache.h | 6 +++--- apt-pkg/pkgcache.cc | 12 ++++++------ apt-pkg/policy.h | 2 +- debian/changelog | 4 +++- 7 files changed, 32 insertions(+), 30 deletions(-) diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h index cee30b679..cf4a98c4f 100644 --- a/apt-pkg/algorithms.h +++ b/apt-pkg/algorithms.h @@ -48,7 +48,7 @@ class pkgSimulate : public pkgPackageManager /*{{{*/ pkgDepCache *Cache; public: - virtual VerIterator GetCandidateVer(PkgIterator Pkg) + virtual VerIterator GetCandidateVer(PkgIterator const &Pkg) { return (*Cache)[Pkg].CandidateVerIter(*Cache); } diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 51bf6819e..dfe5707e1 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -105,13 +105,13 @@ class pkgCache::GrpIterator: public Iterator { inline const char *Name() const {return S->Name == 0?0:Owner->StrP + S->Name;}; inline PkgIterator PackageList() const; - PkgIterator FindPkg(string Arch = "any"); + PkgIterator FindPkg(string Arch = "any") const; /** \brief find the package with the "best" architecture The best architecture is either the "native" or the first in the list of Architectures which is not an end-Pointer */ - PkgIterator FindPreferredPkg(); - PkgIterator NextPkg(PkgIterator const &Pkg); + PkgIterator FindPreferredPkg() const; + PkgIterator NextPkg(PkgIterator const &Pkg) const; // Constructors inline GrpIterator(pkgCache &Owner, Group *Trg) : Iterator(Owner, Trg), HashIndex(0) { @@ -272,17 +272,17 @@ class pkgCache::DepIterator : public Iterator { // Accessors inline const char *TargetVer() const {return S->Version == 0?0:Owner->StrP + S->Version;}; - inline PkgIterator TargetPkg() {return PkgIterator(*Owner,Owner->PkgP + S->Package);}; - inline PkgIterator SmartTargetPkg() {PkgIterator R(*Owner,0);SmartTargetPkg(R);return R;}; - inline VerIterator ParentVer() {return VerIterator(*Owner,Owner->VerP + S->ParentVer);}; - inline PkgIterator ParentPkg() {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->ParentVer].ParentPkg);}; - inline bool Reverse() {return Type == DepRev;}; - bool IsCritical(); + inline PkgIterator TargetPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->Package);}; + inline PkgIterator SmartTargetPkg() const {PkgIterator R(*Owner,0);SmartTargetPkg(R);return R;}; + inline VerIterator ParentVer() const {return VerIterator(*Owner,Owner->VerP + S->ParentVer);}; + inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->ParentVer].ParentPkg);}; + inline bool Reverse() const {return Type == DepRev;}; + bool IsCritical() const; void GlobOr(DepIterator &Start,DepIterator &End); - Version **AllTargets(); - bool SmartTargetPkg(PkgIterator &Result); - inline const char *CompType() {return Owner->CompType(S->CompareOp);}; - inline const char *DepType() {return Owner->DepType(S->Type);}; + Version **AllTargets() const; + bool SmartTargetPkg(PkgIterator &Result) const; + inline const char *CompType() const {return Owner->CompType(S->CompareOp);}; + inline const char *DepType() const {return Owner->DepType(S->Type);}; inline DepIterator(pkgCache &Owner, Dependency *Trg, Version* = 0) : Iterator(Owner, Trg), Type(DepVer) { @@ -315,9 +315,9 @@ class pkgCache::PrvIterator : public Iterator { // Accessors inline const char *Name() const {return Owner->StrP + Owner->PkgP[S->ParentPkg].Name;}; inline const char *ProvideVersion() const {return S->ProvideVersion == 0?0:Owner->StrP + S->ProvideVersion;}; - inline PkgIterator ParentPkg() {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);}; - inline VerIterator OwnerVer() {return VerIterator(*Owner,Owner->VerP + S->Version);}; - inline PkgIterator OwnerPkg() {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->Version].ParentPkg);}; + inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + S->ParentPkg);}; + inline VerIterator OwnerVer() const {return VerIterator(*Owner,Owner->VerP + S->Version);}; + inline PkgIterator OwnerPkg() const {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[S->Version].ParentPkg);}; inline PrvIterator() : Iterator(), Type(PrvVer) {}; diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index c93993ab1..05127fe18 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1585,7 +1585,7 @@ const char *pkgDepCache::StateCache::StripEpoch(const char *Ver) // --------------------------------------------------------------------- /* The default just returns the highest available version that is not a source and automatic. */ -pkgCache::VerIterator pkgDepCache::Policy::GetCandidateVer(PkgIterator Pkg) +pkgCache::VerIterator pkgDepCache::Policy::GetCandidateVer(PkgIterator const &Pkg) { /* Not source/not automatic versions cannot be a candidate version unless they are already installed */ @@ -1620,7 +1620,7 @@ pkgCache::VerIterator pkgDepCache::Policy::GetCandidateVer(PkgIterator Pkg) // Policy::IsImportantDep - True if the dependency is important /*{{{*/ // --------------------------------------------------------------------- /* */ -bool pkgDepCache::Policy::IsImportantDep(DepIterator Dep) +bool pkgDepCache::Policy::IsImportantDep(DepIterator const &Dep) { if(Dep.IsCritical()) return true; diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 66c099b80..45276dc95 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -256,8 +256,8 @@ class pkgDepCache : protected pkgCache::Namespace { public: - virtual VerIterator GetCandidateVer(PkgIterator Pkg); - virtual bool IsImportantDep(DepIterator Dep); + virtual VerIterator GetCandidateVer(PkgIterator const &Pkg); + virtual bool IsImportantDep(DepIterator const &Dep); virtual ~Policy() {}; }; @@ -334,7 +334,7 @@ class pkgDepCache : protected pkgCache::Namespace inline pkgVersioningSystem &VS() {return *Cache->VS;}; // Policy implementation - inline VerIterator GetCandidateVer(PkgIterator Pkg) {return LocalPolicy->GetCandidateVer(Pkg);}; + inline VerIterator GetCandidateVer(PkgIterator const &Pkg) {return LocalPolicy->GetCandidateVer(Pkg);}; inline bool IsImportantDep(DepIterator Dep) {return LocalPolicy->IsImportantDep(Dep);}; inline Policy &GetPolicy() {return *LocalPolicy;}; diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 30bb41470..68aa83d0c 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -307,7 +307,7 @@ const char *pkgCache::Priority(unsigned char Prio) // GrpIterator::FindPkg - Locate a package by arch /*{{{*/ // --------------------------------------------------------------------- /* Returns an End-Pointer on error, pointer to the package otherwise */ -pkgCache::PkgIterator pkgCache::GrpIterator::FindPkg(string Arch) { +pkgCache::PkgIterator pkgCache::GrpIterator::FindPkg(string Arch) const { if (unlikely(IsGood() == false || S->FirstPackage == 0)) return PkgIterator(*Owner, 0); @@ -346,7 +346,7 @@ pkgCache::PkgIterator pkgCache::GrpIterator::FindPkg(string Arch) { // GrpIterator::FindPreferredPkg - Locate the "best" package /*{{{*/ // --------------------------------------------------------------------- /* Returns an End-Pointer on error, pointer to the package otherwise */ -pkgCache::PkgIterator pkgCache::GrpIterator::FindPreferredPkg() { +pkgCache::PkgIterator pkgCache::GrpIterator::FindPreferredPkg() const { pkgCache::PkgIterator Pkg = FindPkg("native"); if (Pkg.end() == false) return Pkg; @@ -367,7 +367,7 @@ pkgCache::PkgIterator pkgCache::GrpIterator::FindPreferredPkg() { /* Returns an End-Pointer on error, pointer to the package otherwise. We can't simply ++ to the next as the next package of the last will be from a different group (with the same hash value) */ -pkgCache::PkgIterator pkgCache::GrpIterator::NextPkg(pkgCache::PkgIterator const &LastPkg) { +pkgCache::PkgIterator pkgCache::GrpIterator::NextPkg(pkgCache::PkgIterator const &LastPkg) const { if (unlikely(IsGood() == false || S->FirstPackage == 0 || LastPkg.end() == true)) return PkgIterator(*Owner, 0); @@ -504,7 +504,7 @@ std::string pkgCache::PkgIterator::FullName(bool const &Pretty) const // --------------------------------------------------------------------- /* Currently critical deps are defined as depends, predepends and conflicts (including dpkg's Breaks fields). */ -bool pkgCache::DepIterator::IsCritical() +bool pkgCache::DepIterator::IsCritical() const { if (S->Type == pkgCache::Dep::Conflicts || S->Type == pkgCache::Dep::DpkgBreaks || @@ -528,7 +528,7 @@ bool pkgCache::DepIterator::IsCritical() In Conjunction with the DepCache the value of Result may not be super-good since the policy may have made it uninstallable. Using AllTargets is better in this case. */ -bool pkgCache::DepIterator::SmartTargetPkg(PkgIterator &Result) +bool pkgCache::DepIterator::SmartTargetPkg(PkgIterator &Result) const { Result = TargetPkg(); @@ -577,7 +577,7 @@ bool pkgCache::DepIterator::SmartTargetPkg(PkgIterator &Result) provides. It includes every possible package-version that could satisfy the dependency. The last item in the list has a 0. The resulting pointer must be delete [] 'd */ -pkgCache::Version **pkgCache::DepIterator::AllTargets() +pkgCache::Version **pkgCache::DepIterator::AllTargets() const { Version **Res = 0; unsigned long Size =0; diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h index 28cb3ccbb..f8b2678de 100644 --- a/apt-pkg/policy.h +++ b/apt-pkg/policy.h @@ -76,7 +76,7 @@ class pkgPolicy : public pkgDepCache::Policy // Things for the cache interface. virtual pkgCache::VerIterator GetCandidateVer(pkgCache::PkgIterator const &Pkg); - virtual bool IsImportantDep(pkgCache::DepIterator Dep) {return pkgDepCache::Policy::IsImportantDep(Dep);}; + virtual bool IsImportantDep(pkgCache::DepIterator const &Dep) {return pkgDepCache::Policy::IsImportantDep(Dep);}; bool InitDefaults(); pkgPolicy(pkgCache *Owner); diff --git a/debian/changelog b/debian/changelog index d7c6b8d0c..0b1ca3cf1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,7 +32,9 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low * apt-pkg/contrib/fileutl.cc: - show notice about ignored file instead of being always silent - add a Dir::Ignore-Files-Silently list option to control the notice - * + * apt-pkg/policy.h: + - add another round of const& madness as the previous round accidently + NOT override the virtual GetCandidateVer() method (Closes: #587725) -- David Kalnischkies Mon, 28 Jun 2010 22:12:24 +0200 -- cgit v1.2.3 From dcfa253fa4b3c563b3ed085c40d3336933840d55 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 4 Jul 2010 17:04:07 +0200 Subject: clean deblistparser a bit by get the Architectures at one place instead of distributed in a few methods --- apt-pkg/deb/deblistparser.cc | 23 ++++++++++------------- apt-pkg/deb/deblistparser.h | 4 +++- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 83c5b8d2e..d1931f909 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -38,6 +38,8 @@ debListParser::debListParser(FileFd *File, string const &Arch) : Tags(File), Arch(Arch) { if (Arch == "native") this->Arch = _config->Find("APT::Architecture"); + Architectures = APT::Configuration::getArchitectures(); + MultiArchEnabled = Architectures.size() > 1; } /*}}}*/ // ListParser::UniqFindTagWrite - Find the tag and write a unq string /*{{{*/ @@ -155,10 +157,9 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver) to a NOP in the download/install step - this package will ensure that it is downloaded only one time and installed only one time -- even if the architecture bound versions coming in and out on regular basis. */ - bool const static multiArch = APT::Configuration::getArchitectures().size() > 1; if (strcmp(Ver.Arch(true),"all") == 0) return true; - else if (multiArch == true) + else if (MultiArchEnabled == true) { // our pseudo packages have no size to not confuse the fetcher Ver->Size = 0; @@ -620,9 +621,6 @@ bool debListParser::ParseDepends(pkgCache::VerIterator Ver, if (Section.Find(Tag,Start,Stop) == false) return true; - static std::vector const archs = APT::Configuration::getArchitectures(); - static bool const multiArch = archs.size() <= 1; - string Package; string const pkgArch = Ver.Arch(true); string Version; @@ -634,13 +632,13 @@ bool debListParser::ParseDepends(pkgCache::VerIterator Ver, if (Start == 0) return _error->Error("Problem parsing dependency %s",Tag); - if (multiArch == true && + if (MultiArchEnabled == true && (Type == pkgCache::Dep::Conflicts || Type == pkgCache::Dep::DpkgBreaks || Type == pkgCache::Dep::Replaces)) { - for (std::vector::const_iterator a = archs.begin(); - a != archs.end(); ++a) + for (std::vector::const_iterator a = Architectures.begin(); + a != Architectures.end(); ++a) if (NewDepends(Ver,Package,*a,Version,Op,Type) == false) return false; } @@ -692,14 +690,13 @@ bool debListParser::ParseProvides(pkgCache::VerIterator Ver) if (Ver->MultiArch != pkgCache::Version::Foreign) return true; - std::vector const archs = APT::Configuration::getArchitectures(); - if (archs.size() <= 1) + if (MultiArchEnabled == false) return true; string const Package = Ver.ParentPkg().Name(); string const Version = Ver.VerStr(); - for (std::vector::const_iterator a = archs.begin(); - a != archs.end(); ++a) + for (std::vector::const_iterator a = Architectures.begin(); + a != Architectures.end(); ++a) { if (NewProvides(Ver, Package, *a, Version) == false) return false; @@ -739,7 +736,7 @@ bool debListParser::Step() if (Architecture.empty() == true) return true; - if (Arch.empty() == true) + if (Arch.empty() == true || MultiArchEnabled == false) { if (APT::Configuration::checkArchitecture(Architecture) == true) return true; diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 8da051530..6c81d9fa0 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -32,7 +32,9 @@ class debListParser : public pkgCacheGenerator::ListParser pkgTagSection Section; unsigned long iOffset; string Arch; - + std::vector Architectures; + bool MultiArchEnabled; + unsigned long UniqFindTagWrite(const char *Tag); bool ParseStatus(pkgCache::PkgIterator Pkg,pkgCache::VerIterator Ver); bool ParseDepends(pkgCache::VerIterator Ver,const char *Tag, -- cgit v1.2.3 From 6806db8ac030ab7401b7b8b8324c62bb7b4a0275 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 5 Jul 2010 11:34:35 +0200 Subject: make the specify order of packages irrelevant (half-close #196021) --- cmdline/apt-get.cc | 23 ++++++++++++++++++----- debian/changelog | 1 + 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 9a6c12ee0..7cf760c27 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -762,6 +762,7 @@ struct TryToInstall { pkgProblemResolver* Fix; bool FixBroken; unsigned long AutoMarkChanged; + APT::PackageSet doAutoInstallLater; TryToInstall(pkgCacheFile &Cache, pkgProblemResolver &PM, bool const &FixBroken) : Cache(&Cache), Fix(&PM), FixBroken(FixBroken), AutoMarkChanged(0) {}; @@ -769,8 +770,6 @@ struct TryToInstall { void operator() (pkgCache::VerIterator const &Ver) { pkgCache::PkgIterator Pkg = Ver.ParentPkg(); -std::clog << "INSTALL " << Pkg << " VER " << Ver.VerStr() << std::endl; - Cache->GetDepCache()->SetCandidateVersion(Ver); pkgDepCache::StateCache &State = (*Cache)[Pkg]; @@ -801,8 +800,8 @@ std::clog << "INSTALL " << Pkg << " VER " << Ver.VerStr() << std::endl; // Install it with autoinstalling enabled (if we not respect the minial // required deps or the policy) - if ((State.InstBroken() == true || State.InstPolicyBroken() == true) && FixBroken == false) - Cache->GetDepCache()->MarkInstall(Pkg,true); + if (FixBroken == false) + doAutoInstallLater.insert(Pkg); } // see if we need to fix the auto-mark flag @@ -820,6 +819,17 @@ std::clog << "INSTALL " << Pkg << " VER " << Ver.VerStr() << std::endl; AutoMarkChanged++; } } + + void doAutoInstall() { + for (APT::PackageSet::const_iterator P = doAutoInstallLater.begin(); + P != doAutoInstallLater.end(); ++P) { + pkgDepCache::StateCache &State = (*Cache)[P]; + if (State.InstBroken() == false && State.InstPolicyBroken() == false) + continue; + Cache->GetDepCache()->MarkInstall(P, true); + } + doAutoInstallLater.clear(); + } }; /*}}}*/ // TryToRemove - Mark a package for removal /*{{{*/ @@ -1336,6 +1346,7 @@ bool TryToInstallBuildDep(pkgCache::PkgIterator Pkg,pkgCacheFile &Cache, } else if (Cache[Pkg].CandidateVer != 0) { TryToInstall InstallAction(Cache, Fix, BrokenFix); InstallAction(Cache[Pkg].CandidateVerIter(Cache)); + InstallAction.doAutoInstall(); } else return AllowFail; @@ -1743,8 +1754,10 @@ bool DoInstall(CommandLine &CmdL) for (unsigned short i = 0; order[i] != 0; ++i) { - if (order[i] == MOD_INSTALL) + if (order[i] == MOD_INSTALL) { InstallAction = std::for_each(verset[MOD_INSTALL].begin(), verset[MOD_INSTALL].end(), InstallAction); + InstallAction.doAutoInstall(); + } else if (order[i] == MOD_REMOVE) RemoveAction = std::for_each(verset[MOD_REMOVE].begin(), verset[MOD_REMOVE].end(), RemoveAction); } diff --git a/debian/changelog b/debian/changelog index 0b1ca3cf1..a76bd0f0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low - check in Grouped* first without modifier interpretation * cmdline/apt-get.cc: - use the cachsets in the install commands + - make the specify order of packages irrelevant (half-close #196021) * apt-pkg/orderlist.cc: - untouched packages are never missing * apt-pkg/packagemanager.cc: -- cgit v1.2.3 From 3b5272950a1ac62178f7b8a0144c4c52e194be40 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 5 Jul 2010 11:42:57 +0200 Subject: Try to use NotEquals for the MultiArch Breaks dependencies instead of Less and Greater -> half the dependencies :) --- apt-pkg/pkgcachegen.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 5649cd6f8..05c01494b 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -572,10 +572,7 @@ bool pkgCacheGenerator::FinishCache(OpProgress *Progress) OldDepLast); // Breaks: ${self}:other (!= ${binary:Version}) NewDepends(D, V, V.VerStr(), - pkgCache::Dep::Less, pkgCache::Dep::DpkgBreaks, - OldDepLast); - NewDepends(D, V, V.VerStr(), - pkgCache::Dep::Greater, pkgCache::Dep::DpkgBreaks, + pkgCache::Dep::NotEquals, pkgCache::Dep::DpkgBreaks, OldDepLast); if (V->MultiArch == pkgCache::Version::All) { -- cgit v1.2.3 From 9643d533f38fa35b345755201eebfd227aa5adbb Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 5 Jul 2010 12:00:46 +0200 Subject: fix typos and add a proper Closes tag after the unmerge in debbugs --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index a76bd0f0d..51c75dad0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,7 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low - check in Grouped* first without modifier interpretation * cmdline/apt-get.cc: - use the cachsets in the install commands - - make the specify order of packages irrelevant (half-close #196021) + - make the specify order of packages irrelevant (Closes: #196021) * apt-pkg/orderlist.cc: - untouched packages are never missing * apt-pkg/packagemanager.cc: @@ -34,8 +34,8 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low - show notice about ignored file instead of being always silent - add a Dir::Ignore-Files-Silently list option to control the notice * apt-pkg/policy.h: - - add another round of const& madness as the previous round accidently - NOT override the virtual GetCandidateVer() method (Closes: #587725) + - add another round of const& madness as the previous round accidentally + NOT overrides the virtual GetCandidateVer() method (Closes: #587725) -- David Kalnischkies Mon, 28 Jun 2010 22:12:24 +0200 -- cgit v1.2.3 From af5cf9299fb60c255d4c1c30ca9a97e7e6acfef0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 5 Jul 2010 12:12:40 +0200 Subject: extends the ParseDepends testcase to have a look also at the Wildcards --- test/libapt/parsedepends_test.cc | 68 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/test/libapt/parsedepends_test.cc b/test/libapt/parsedepends_test.cc index b7befa561..7b496878d 100644 --- a/test/libapt/parsedepends_test.cc +++ b/test/libapt/parsedepends_test.cc @@ -21,6 +21,12 @@ int main(int argc,char *argv[]) { "apt (>= 0.7.25), " "not-for-me [ !dsk ], " "only-for-me [ dsk ], " + "any-for-me [ any ], " + "not-for-darwin [ !darwin-any ], " + "cpu-for-me [ any-dsk ], " + "os-for-me [ linux-any ], " + "cpu-not-for-me [ any-amd64 ], " + "os-not-for-me [ kfreebsd-any ], " "overlord-dev:any (= 7.15.3~) | overlord-dev:native (>> 7.15.5), " ; @@ -100,6 +106,68 @@ test: Start++; } + if (ParseArchFlags == true) { + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + equals("any-for-me", Package); + equals("", Version); + equals(Null | pkgCache::Dep::NoOp, Op); + } else { + equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch)); + Start = strstr(Start, ","); + Start++; + } + + if (ParseArchFlags == true) { + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + equals("not-for-darwin", Package); + equals("", Version); + equals(Null | pkgCache::Dep::NoOp, Op); + } else { + equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch)); + Start = strstr(Start, ","); + Start++; + } + + if (ParseArchFlags == true) { + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + equals("cpu-for-me", Package); + equals("", Version); + equals(Null | pkgCache::Dep::NoOp, Op); + } else { + equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch)); + Start = strstr(Start, ","); + Start++; + } + + if (ParseArchFlags == true) { + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + equals("os-for-me", Package); + equals("", Version); + equals(Null | pkgCache::Dep::NoOp, Op); + } else { + equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch)); + Start = strstr(Start, ","); + Start++; + } + + if (ParseArchFlags == true) { + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + equals("", Package); // cpu-not-for-me + } else { + equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch)); + Start = strstr(Start, ","); + Start++; + } + + if (ParseArchFlags == true) { + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); + equals("", Package); // os-not-for-me + } else { + equals(true, 0 == debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch)); + Start = strstr(Start, ","); + Start++; + } + Start = debListParser::ParseDepends(Start, End, Package, Version, Op, ParseArchFlags, StripMultiArch); if (StripMultiArch == true) equals("overlord-dev", Package); -- cgit v1.2.3 From 7e58ab0c0db9e5f27ae91251bf692bf79a046534 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 6 Jul 2010 10:21:45 +0200 Subject: wrap the mmap actions in the CacheGenerator in their own methods to be able to react on condition changes later then we can move mmap --- apt-pkg/pkgcachegen.cc | 53 ++++++++++++++++++++++++++++++++------------------ apt-pkg/pkgcachegen.h | 12 ++++++++---- 2 files changed, 42 insertions(+), 23 deletions(-) diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 05c01494b..6a9da4a92 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -61,8 +61,8 @@ pkgCacheGenerator::pkgCacheGenerator(DynamicMMap *pMap,OpProgress *Prog) : // Starting header *Cache.HeaderP = pkgCache::Header(); - Cache.HeaderP->VerSysName = Map.WriteString(_system->VS->Label); - Cache.HeaderP->Architecture = Map.WriteString(_config->Find("APT::Architecture")); + Cache.HeaderP->VerSysName = WriteStringInMap(_system->VS->Label); + Cache.HeaderP->Architecture = WriteStringInMap(_config->Find("APT::Architecture")); Cache.ReMap(); } else @@ -96,6 +96,21 @@ pkgCacheGenerator::~pkgCacheGenerator() Map.Sync(0,sizeof(pkgCache::Header)); } /*}}}*/ +// CacheGenerator::WriteStringInMap /*{{{*/ +unsigned long pkgCacheGenerator::WriteStringInMap(const char *String, + const unsigned long &Len) { + return Map.WriteString(String, Len); +} + /*}}}*/ +// CacheGenerator::WriteStringInMap /*{{{*/ +unsigned long pkgCacheGenerator::WriteStringInMap(const char *String) { + return Map.WriteString(String); +} + /*}}}*/ +unsigned long pkgCacheGenerator::AllocateInMap(const unsigned long &size) {/*{{{*/ + return Map.Allocate(size); +} + /*}}}*/ // CacheGenerator::MergeList - Merge the package list /*{{{*/ // --------------------------------------------------------------------- /* This provides the generation of the entries in the cache. Each loop @@ -342,12 +357,12 @@ bool pkgCacheGenerator::NewGroup(pkgCache::GrpIterator &Grp, const string &Name) return true; // Get a structure - unsigned long const Group = Map.Allocate(sizeof(pkgCache::Group)); + unsigned long const Group = AllocateInMap(sizeof(pkgCache::Group)); if (unlikely(Group == 0)) return false; Grp = pkgCache::GrpIterator(Cache, Cache.GrpP + Group); - Grp->Name = Map.WriteString(Name); + Grp->Name = WriteStringInMap(Name); if (unlikely(Grp->Name == 0)) return false; @@ -374,7 +389,7 @@ bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name return true; // Get a structure - unsigned long const Package = Map.Allocate(sizeof(pkgCache::Package)); + unsigned long const Package = AllocateInMap(sizeof(pkgCache::Package)); if (unlikely(Package == 0)) return false; Pkg = pkgCache::PkgIterator(Cache,Cache.PkgP + Package); @@ -418,7 +433,7 @@ bool pkgCacheGenerator::NewFileVer(pkgCache::VerIterator &Ver, return true; // Get a structure - unsigned long VerFile = Map.Allocate(sizeof(pkgCache::VerFile)); + unsigned long VerFile = AllocateInMap(sizeof(pkgCache::VerFile)); if (VerFile == 0) return 0; @@ -449,7 +464,7 @@ unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver, unsigned long Next) { // Get a structure - unsigned long Version = Map.Allocate(sizeof(pkgCache::Version)); + unsigned long Version = AllocateInMap(sizeof(pkgCache::Version)); if (Version == 0) return 0; @@ -457,7 +472,7 @@ unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver, Ver = pkgCache::VerIterator(Cache,Cache.VerP + Version); Ver->NextVer = Next; Ver->ID = Cache.HeaderP->VersionCount++; - Ver->VerStr = Map.WriteString(VerStr); + Ver->VerStr = WriteStringInMap(VerStr); if (Ver->VerStr == 0) return 0; @@ -474,7 +489,7 @@ bool pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator &Desc, return true; // Get a structure - unsigned long DescFile = Map.Allocate(sizeof(pkgCache::DescFile)); + unsigned long DescFile = AllocateInMap(sizeof(pkgCache::DescFile)); if (DescFile == 0) return false; @@ -507,7 +522,7 @@ map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc, map_ptrloc Next) { // Get a structure - map_ptrloc Description = Map.Allocate(sizeof(pkgCache::Description)); + map_ptrloc Description = AllocateInMap(sizeof(pkgCache::Description)); if (Description == 0) return 0; @@ -515,8 +530,8 @@ map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc, Desc = pkgCache::DescIterator(Cache,Cache.DescP + Description); Desc->NextDesc = Next; Desc->ID = Cache.HeaderP->DescriptionCount++; - Desc->language_code = Map.WriteString(Lang); - Desc->md5sum = Map.WriteString(md5sum.Value()); + Desc->language_code = WriteStringInMap(Lang); + Desc->md5sum = WriteStringInMap(md5sum.Value()); if (Desc->language_code == 0 || Desc->md5sum == 0) return 0; @@ -607,7 +622,7 @@ bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg, map_ptrloc *OldDepLast) { // Get a structure - unsigned long const Dependency = Map.Allocate(sizeof(pkgCache::Dependency)); + unsigned long const Dependency = AllocateInMap(sizeof(pkgCache::Dependency)); if (unlikely(Dependency == 0)) return false; @@ -625,7 +640,7 @@ bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg, if (I->Version != 0 && I.TargetVer() == Version) Dep->Version = I->Version;*/ if (Dep->Version == 0) - if (unlikely((Dep->Version = Map.WriteString(Version)) == 0)) + if (unlikely((Dep->Version = WriteStringInMap(Version)) == 0)) return false; } @@ -699,7 +714,7 @@ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver, return true; // Get a structure - unsigned long const Provides = Owner->Map.Allocate(sizeof(pkgCache::Provides)); + unsigned long const Provides = Owner->AllocateInMap(sizeof(pkgCache::Provides)); if (unlikely(Provides == 0)) return false; Cache.HeaderP->ProvidesCount++; @@ -734,12 +749,12 @@ bool pkgCacheGenerator::SelectFile(const string &File,const string &Site, unsigned long Flags) { // Get some space for the structure - CurrentFile = Cache.PkgFileP + Map.Allocate(sizeof(*CurrentFile)); + CurrentFile = Cache.PkgFileP + AllocateInMap(sizeof(*CurrentFile)); if (CurrentFile == Cache.PkgFileP) return false; // Fill it in - CurrentFile->FileName = Map.WriteString(File); + CurrentFile->FileName = WriteStringInMap(File); CurrentFile->Site = WriteUniqString(Site); CurrentFile->NextFile = Cache.HeaderP->FileList; CurrentFile->Flags = Flags; @@ -791,7 +806,7 @@ unsigned long pkgCacheGenerator::WriteUniqString(const char *S, } // Get a structure - unsigned long Item = Map.Allocate(sizeof(pkgCache::StringItem)); + unsigned long Item = AllocateInMap(sizeof(pkgCache::StringItem)); if (Item == 0) return 0; @@ -799,7 +814,7 @@ unsigned long pkgCacheGenerator::WriteUniqString(const char *S, pkgCache::StringItem *ItemP = Cache.StringItemP + Item; ItemP->NextItem = I - Cache.StringItemP; *Last = Item; - ItemP->String = Map.WriteString(S,Size); + ItemP->String = WriteStringInMap(S,Size); if (ItemP->String == 0) return 0; diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index ff0941e0c..a88c49451 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -31,9 +31,13 @@ class pkgIndexFile; class pkgCacheGenerator /*{{{*/ { private: - + pkgCache::StringItem *UniqHash[26]; - + unsigned long WriteStringInMap(std::string const &String) { return WriteStringInMap(String.c_str()); }; + unsigned long WriteStringInMap(const char *String); + unsigned long WriteStringInMap(const char *String, const unsigned long &Len); + unsigned long AllocateInMap(const unsigned long &size); + public: class ListParser; @@ -103,8 +107,8 @@ class pkgCacheGenerator::ListParser inline unsigned long WriteUniqString(string S) {return Owner->WriteUniqString(S);}; inline unsigned long WriteUniqString(const char *S,unsigned int Size) {return Owner->WriteUniqString(S,Size);}; - inline unsigned long WriteString(const string &S) {return Owner->Map.WriteString(S);}; - inline unsigned long WriteString(const char *S,unsigned int Size) {return Owner->Map.WriteString(S,Size);}; + inline unsigned long WriteString(const string &S) {return Owner->WriteStringInMap(S);}; + inline unsigned long WriteString(const char *S,unsigned int Size) {return Owner->WriteStringInMap(S,Size);}; bool NewDepends(pkgCache::VerIterator Ver,const string &Package, const string &Arch, const string &Version,unsigned int Op, unsigned int Type); -- cgit v1.2.3 From d13c2d3f7b10e558301a05948e91ac4a60160793 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Tue, 6 Jul 2010 12:48:06 +0200 Subject: FileFd(): Drop file name extension check in ReadOnlyGzip mode Drop the ".gz" extension check in FileFd::Open() in ReadOnlyGzip mode, to not depend on a particular file extension. This allows rewriting the gzip method using internal decompression (on ".decomp" files). This requires a zlib bug workaround in FileFd::Close(): When opening an empty file with gzdopen(), gzclose() fails with Z_BUF_ERROR. Do not count this as a failure. --- apt-pkg/contrib/fileutl.cc | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 2b91a46f7..0d2d3f356 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -608,7 +608,7 @@ bool FileFd::Open(string FileName,OpenMode Mode, unsigned long Perms) case ReadOnlyGzip: iFd = open(FileName.c_str(),O_RDONLY); - if (iFd > 0 && FileName.compare(FileName.size()-3, 3, ".gz") == 0) { + if (iFd > 0) { gz = gzdopen (iFd, "r"); if (gz == NULL) { close (iFd); @@ -827,8 +827,16 @@ bool FileFd::Close() { bool Res = true; if ((Flags & AutoClose) == AutoClose) - if ((gz != NULL && gzclose(gz) != 0) || (gz == NULL && iFd > 0 && close(iFd) != 0)) - Res &= _error->Errno("close",_("Problem closing the file")); + { + if (gz != NULL) { + int e = gzclose(gz); + // gzdopen() on empty files always fails with "buffer error" here, ignore that + if (e != 0 && e != Z_BUF_ERROR) + Res &= _error->Errno("close",_("Problem closing the gzip file")); + } else + if (iFd > 0 && close(iFd) != 0) + Res &= _error->Errno("close",_("Problem closing the file")); + } iFd = -1; gz = NULL; -- cgit v1.2.3 From 127e6df37213a1fda0dd5b44182acf678ccbbf02 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Tue, 6 Jul 2010 13:14:57 +0200 Subject: methods/gzip.cc: With FileFd now being able to read gzipped files, there is no need for the gzip method any more to spawn an external gzip process. Rewrite it to use FileFd directly, which makes the code a lot simpler, and also using less memory and overhead. --- debian/changelog | 4 ++++ methods/gzip.cc | 63 +++++++------------------------------------------------- 2 files changed, 11 insertions(+), 56 deletions(-) diff --git a/debian/changelog b/debian/changelog index f3f2d3df4..6f3d2eb71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,10 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low - Fix return value of pkgAcqFile::Custom600Headers() in the non-index case, to avoid returning NULL and causing crashers in callers. This also fixes a compiler warning. + * methods/gzip.cc: With FileFd now being able to read gzipped files, there + is no need for the gzip method any more to spawn an external gzip process. + Rewrite it to use FileFd directly, which makes the code a lot simpler, and + also using less memory and overhead. -- Christian Perrier Tue, 11 May 2010 19:52:00 +0200 diff --git a/methods/gzip.cc b/methods/gzip.cc index f732c0b86..72e3ac909 100644 --- a/methods/gzip.cc +++ b/methods/gzip.cc @@ -23,8 +23,6 @@ #include /*}}}*/ -const char *Prog; - class GzipMethod : public pkgAcqMethod { virtual bool Fetch(FetchItem *Itm); @@ -43,14 +41,12 @@ bool GzipMethod::Fetch(FetchItem *Itm) URI Get = Itm->Uri; string Path = Get.Host + Get.Path; // To account for relative paths - string GzPathOption = "Dir::bin::"+string(Prog); - FetchResult Res; Res.Filename = Itm->DestFile; URIStart(Res); // Open the source and destination files - FileFd From(Path,FileFd::ReadOnly); + FileFd From(Path,FileFd::ReadOnlyGzip); // if the file is empty, just rename it and return if(From.Size() == 0) @@ -59,40 +55,12 @@ bool GzipMethod::Fetch(FetchItem *Itm) return true; } - int GzOut[2]; - if (pipe(GzOut) < 0) - return _error->Errno("pipe",_("Couldn't open pipe for %s"),Prog); - - // Fork gzip - pid_t Process = ExecFork(); - if (Process == 0) - { - close(GzOut[0]); - dup2(From.Fd(),STDIN_FILENO); - dup2(GzOut[1],STDOUT_FILENO); - From.Close(); - close(GzOut[1]); - SetCloseExec(STDIN_FILENO,false); - SetCloseExec(STDOUT_FILENO,false); - - const char *Args[3]; - string Tmp = _config->Find(GzPathOption,Prog); - Args[0] = Tmp.c_str(); - Args[1] = "-d"; - Args[2] = 0; - execvp(Args[0],(char **)Args); - _exit(100); - } - From.Close(); - close(GzOut[1]); - - FileFd FromGz(GzOut[0]); // For autoclose FileFd To(Itm->DestFile,FileFd::WriteEmpty); To.EraseOnFailure(); if (_error->PendingError() == true) return false; - // Read data from gzip, generate checksums and write + // Read data from source, generate checksums and write Hashes Hash; bool Failed = false; while (1) @@ -100,36 +68,23 @@ bool GzipMethod::Fetch(FetchItem *Itm) unsigned char Buffer[4*1024]; unsigned long Count; - Count = read(GzOut[0],Buffer,sizeof(Buffer)); - if (Count < 0 && errno == EINTR) - continue; - - if (Count < 0) + if (!From.Read(Buffer,sizeof(Buffer),&Count)) { - _error->Errno("read", _("Read error from %s process"),Prog); - Failed = true; - break; + To.OpFail(); + return false; } - if (Count == 0) break; - + Hash.Add(Buffer,Count); if (To.Write(Buffer,Count) == false) { Failed = true; - FromGz.Close(); break; } } - // Wait for gzip to finish - if (ExecWait(Process,_config->Find(GzPathOption,Prog).c_str(),false) == false) - { - To.OpFail(); - return false; - } - + From.Close(); To.Close(); if (Failed == true) @@ -165,9 +120,5 @@ int main(int argc, char *argv[]) setlocale(LC_ALL, ""); GzipMethod Mth; - - Prog = strrchr(argv[0],'/'); - Prog++; - return Mth.Run(); } -- cgit v1.2.3 From 24baab5c477bf1e57a0b169a7bac1d2e9ab0c974 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 7 Jul 2010 16:47:09 +0200 Subject: * apt-pkg/deb/dpkgpm.cc: - make the apt/term.log output unbuffered (thanks to Matt Zimmerman) --- apt-pkg/deb/dpkgpm.cc | 3 ++- debian/changelog | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 8abe3f5c6..2bbc7a4ba 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -582,7 +583,7 @@ bool pkgDPkgPM::OpenLog() term_out = fopen(logfile_name.c_str(),"a"); if (term_out == NULL) return _error->WarningE(_("Could not open file '%s'"), logfile_name.c_str()); - + setvbuf(term_out, NULL, _IONBF, 0); chmod(logfile_name.c_str(), 0600); fprintf(term_out, "\nLog started: %s\n", timestr); } diff --git a/debian/changelog b/debian/changelog index f4cdeeec5..27acd33c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,8 @@ apt (0.7.25.4) UNRELEASED; urgency=low - install html doxygen in libapt-pkg-doc as well * methods/http.cc: - code cleanup, add (some) doxygen strings + * apt-pkg/deb/dpkgpm.cc: + - make the apt/term.log output unbuffered (thanks to Matt Zimmerman) [ Robert Collins ] * Change the package index Info methods to allow apt-cache policy to be -- cgit v1.2.3 From 32b9a14cb4c6bdcddfe84c4451c225ced1a34bb7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 8 Jul 2010 11:10:46 +0200 Subject: use references instead of copies in the Cache generation methods --- apt-pkg/deb/deblistparser.cc | 16 ++++++++-------- apt-pkg/deb/deblistparser.h | 14 +++++++------- apt-pkg/pkgcachegen.cc | 9 +++++---- apt-pkg/pkgcachegen.h | 12 ++++++------ 4 files changed, 26 insertions(+), 25 deletions(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 24df57a5c..2cfeb23e9 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -106,7 +106,7 @@ string debListParser::Version() // ListParser::NewVersion - Fill in the version structure /*{{{*/ // --------------------------------------------------------------------- /* */ -bool debListParser::NewVersion(pkgCache::VerIterator Ver) +bool debListParser::NewVersion(pkgCache::VerIterator &Ver) { // Parse the section Ver->Section = UniqFindTagWrite("Section"); @@ -251,8 +251,8 @@ MD5SumValue debListParser::Description_md5() // --------------------------------------------------------------------- /* This is called to update the package with any new information that might be found in the section */ -bool debListParser::UsePackage(pkgCache::PkgIterator Pkg, - pkgCache::VerIterator Ver) +bool debListParser::UsePackage(pkgCache::PkgIterator &Pkg, + pkgCache::VerIterator &Ver) { if (Pkg->Section == 0) Pkg->Section = UniqFindTagWrite("Section"); @@ -332,8 +332,8 @@ unsigned short debListParser::VersionHash() Some of the above are obsolete (I think?) flag = hold-* and status = post-inst-failed, removal-failed at least. */ -bool debListParser::ParseStatus(pkgCache::PkgIterator Pkg, - pkgCache::VerIterator Ver) +bool debListParser::ParseStatus(pkgCache::PkgIterator &Pkg, + pkgCache::VerIterator &Ver) { const char *Start; const char *Stop; @@ -634,7 +634,7 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop, // --------------------------------------------------------------------- /* This is the higher level depends parser. It takes a tag and generates a complete depends tree for the given version. */ -bool debListParser::ParseDepends(pkgCache::VerIterator Ver, +bool debListParser::ParseDepends(pkgCache::VerIterator &Ver, const char *Tag,unsigned int Type) { const char *Start; @@ -674,7 +674,7 @@ bool debListParser::ParseDepends(pkgCache::VerIterator Ver, // ListParser::ParseProvides - Parse the provides list /*{{{*/ // --------------------------------------------------------------------- /* */ -bool debListParser::ParseProvides(pkgCache::VerIterator Ver) +bool debListParser::ParseProvides(pkgCache::VerIterator &Ver) { const char *Start; const char *Stop; @@ -779,7 +779,7 @@ bool debListParser::Step() // ListParser::LoadReleaseInfo - Load the release information /*{{{*/ // --------------------------------------------------------------------- /* */ -bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator FileI, +bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI, FileFd &File, string component) { pkgTagFile Tags(&File, File.Size() + 256); // XXX diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 6c81d9fa0..4bc1bd93c 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -36,10 +36,10 @@ class debListParser : public pkgCacheGenerator::ListParser bool MultiArchEnabled; unsigned long UniqFindTagWrite(const char *Tag); - bool ParseStatus(pkgCache::PkgIterator Pkg,pkgCache::VerIterator Ver); - bool ParseDepends(pkgCache::VerIterator Ver,const char *Tag, + bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver); + bool ParseDepends(pkgCache::VerIterator &Ver,const char *Tag, unsigned int Type); - bool ParseProvides(pkgCache::VerIterator Ver); + bool ParseProvides(pkgCache::VerIterator &Ver); static bool GrabWord(string Word,WordList *List,unsigned char &Out); public: @@ -51,19 +51,19 @@ class debListParser : public pkgCacheGenerator::ListParser virtual string Architecture(); virtual bool ArchitectureAll(); virtual string Version(); - virtual bool NewVersion(pkgCache::VerIterator Ver); + virtual bool NewVersion(pkgCache::VerIterator &Ver); virtual string Description(); virtual string DescriptionLanguage(); virtual MD5SumValue Description_md5(); virtual unsigned short VersionHash(); - virtual bool UsePackage(pkgCache::PkgIterator Pkg, - pkgCache::VerIterator Ver); + virtual bool UsePackage(pkgCache::PkgIterator &Pkg, + pkgCache::VerIterator &Ver); virtual unsigned long Offset() {return iOffset;}; virtual unsigned long Size() {return Section.size();}; virtual bool Step(); - bool LoadReleaseInfo(pkgCache::PkgFileIterator FileI,FileFd &File, + bool LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,FileFd &File, string section); static const char *ParseDepends(const char *Start,const char *Stop, diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 6a9da4a92..62e457734 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -157,13 +157,14 @@ bool pkgCacheGenerator::MergeList(ListParser &List, // we first process the package, then the descriptions // (this has the bonus that we get MMap error when we run out // of MMap space) - if (List.UsePackage(Pkg,pkgCache::VerIterator(Cache)) == false) + pkgCache::VerIterator Ver(Cache); + if (List.UsePackage(Pkg, Ver) == false) return _error->Error(_("Error occurred while processing %s (UsePackage1)"), PackageName.c_str()); // Find the right version to write the description MD5SumValue CurMd5 = List.Description_md5(); - pkgCache::VerIterator Ver = Pkg.VersionList(); + Ver = Pkg.VersionList(); map_ptrloc *LastVer = &Pkg->VersionList; for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++) @@ -668,7 +669,7 @@ bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg, // --------------------------------------------------------------------- /* This creates a Group and the Package to link this dependency to if needed and handles also the caching of the old endpoint */ -bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, +bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator &Ver, const string &PackageName, const string &Arch, const string &Version, @@ -702,7 +703,7 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, // ListParser::NewProvides - Create a Provides element /*{{{*/ // --------------------------------------------------------------------- /* */ -bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver, +bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator &Ver, const string &PkgName, const string &PkgArch, const string &Version) diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index a88c49451..8f7739165 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -109,10 +109,10 @@ class pkgCacheGenerator::ListParser inline unsigned long WriteUniqString(const char *S,unsigned int Size) {return Owner->WriteUniqString(S,Size);}; inline unsigned long WriteString(const string &S) {return Owner->WriteStringInMap(S);}; inline unsigned long WriteString(const char *S,unsigned int Size) {return Owner->WriteStringInMap(S,Size);}; - bool NewDepends(pkgCache::VerIterator Ver,const string &Package, const string &Arch, + bool NewDepends(pkgCache::VerIterator &Ver,const string &Package, const string &Arch, const string &Version,unsigned int Op, unsigned int Type); - bool NewProvides(pkgCache::VerIterator Ver,const string &PkgName, + bool NewProvides(pkgCache::VerIterator &Ver,const string &PkgName, const string &PkgArch, const string &Version); public: @@ -122,13 +122,13 @@ class pkgCacheGenerator::ListParser virtual string Architecture() = 0; virtual bool ArchitectureAll() = 0; virtual string Version() = 0; - virtual bool NewVersion(pkgCache::VerIterator Ver) = 0; + virtual bool NewVersion(pkgCache::VerIterator &Ver) = 0; virtual string Description() = 0; virtual string DescriptionLanguage() = 0; virtual MD5SumValue Description_md5() = 0; virtual unsigned short VersionHash() = 0; - virtual bool UsePackage(pkgCache::PkgIterator Pkg, - pkgCache::VerIterator Ver) = 0; + virtual bool UsePackage(pkgCache::PkgIterator &Pkg, + pkgCache::VerIterator &Ver) = 0; virtual unsigned long Offset() = 0; virtual unsigned long Size() = 0; @@ -136,7 +136,7 @@ class pkgCacheGenerator::ListParser inline bool HasFileDeps() {return FoundFileDeps;}; virtual bool CollectFileProvides(pkgCache &Cache, - pkgCache::VerIterator Ver) {return true;}; + pkgCache::VerIterator &Ver) {return true;}; ListParser() : FoundFileDeps(false) {}; virtual ~ListParser() {}; -- cgit v1.2.3 From a9fe592842bfa17d91f4904d7fb0e3af3adebb17 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 8 Jul 2010 15:28:53 +0200 Subject: * apt-pkg/pkgcachegen.{cc,h}: - make the used MMap moveable (and therefore dynamic resizeable) by applying (some) mad pointer magic (Closes: #195018) --- apt-pkg/cacheiterators.h | 6 ++ apt-pkg/contrib/mmap.cc | 27 ++++-- apt-pkg/deb/debindexfile.cc | 1 + apt-pkg/pkgcache.cc | 5 +- apt-pkg/pkgcache.h | 2 +- apt-pkg/pkgcachegen.cc | 229 ++++++++++++++++++++++++++++++++------------ apt-pkg/pkgcachegen.h | 30 ++++-- debian/changelog | 3 + 8 files changed, 226 insertions(+), 77 deletions(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index dfe5707e1..eb8dee5e3 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -75,6 +75,12 @@ template class pkgCache::Iterator : inline bool IsGood() const { return S && Owner && ! end();}; inline unsigned long Index() const {return S - OwnerPointer();}; + void ReOwn(pkgCache &newOwner, void const * const oldMap, void const * const newMap) { + if (S == 0) + return; + S += (Str*)(newMap) - (Str*)(oldMap); + } + // Constructors - look out for the variable assigning inline Iterator() : S(0), Owner(0) {}; inline Iterator(pkgCache &Owner,Str *T = 0) : S(T), Owner(&Owner) {}; diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index d71066243..aa184b130 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -225,22 +225,22 @@ DynamicMMap::DynamicMMap(unsigned long Flags,unsigned long const &WorkSpace, // disable Moveable if we don't grow if (Grow == 0) - Flags &= ~Moveable; + this->Flags &= ~Moveable; #ifndef __linux__ // kfreebsd doesn't have mremap, so we use the fallback - if ((Flags & Moveable) == Moveable) - Flags |= Fallback; + if ((this->Flags & Moveable) == Moveable) + this->Flags |= Fallback; #endif #ifdef _POSIX_MAPPED_FILES - if ((Flags & Fallback) != Fallback) { + if ((this->Flags & Fallback) != Fallback) { // Set the permissions. int Prot = PROT_READ; int Map = MAP_PRIVATE | MAP_ANONYMOUS; - if ((Flags & ReadOnly) != ReadOnly) + if ((this->Flags & ReadOnly) != ReadOnly) Prot |= PROT_WRITE; - if ((Flags & Public) == Public) + if ((this->Flags & Public) == Public) Map = MAP_SHARED | MAP_ANONYMOUS; // use anonymous mmap() to get the memory @@ -314,7 +314,7 @@ unsigned long DynamicMMap::Allocate(unsigned long ItemSize) // Look for a matching pool entry Pool *I; Pool *Empty = 0; - for (I = Pools; I != Pools + PoolCount; I++) + for (I = Pools; I != Pools + PoolCount; ++I) { if (I->ItemSize == 0) Empty = I; @@ -342,7 +342,11 @@ unsigned long DynamicMMap::Allocate(unsigned long ItemSize) { const unsigned long size = 20*1024; I->Count = size/ItemSize; + Pool* oldPools = Pools; Result = RawAllocate(size,ItemSize); + if (Pools != oldPools) + I += Pools - oldPools; + // Does the allocation failed ? if (Result == 0 && _error->PendingError()) return 0; @@ -365,7 +369,7 @@ unsigned long DynamicMMap::WriteString(const char *String, if (Len == (unsigned long)-1) Len = strlen(String); - unsigned long Result = RawAllocate(Len+1,0); + unsigned long const Result = RawAllocate(Len+1,0); if (Result == 0 && _error->PendingError()) return 0; @@ -395,16 +399,20 @@ bool DynamicMMap::Grow() { return _error->Error(_("Unable to increase the size of the MMap as the " "limit of %lu bytes is already reached."), Limit); - unsigned long const newSize = WorkSpace + 1024*1024; + unsigned long const newSize = WorkSpace + GrowFactor; if(Fd != 0) { Fd->Seek(newSize - 1); char C = 0; Fd->Write(&C,sizeof(C)); } + + unsigned long const poolOffset = Pools - ((Pool*) Base); + if ((Flags & Fallback) != Fallback) { #if defined(_POSIX_MAPPED_FILES) && defined(__linux__) #ifdef MREMAP_MAYMOVE + if ((Flags & Moveable) == Moveable) Base = mremap(Base, WorkSpace, newSize, MREMAP_MAYMOVE); else @@ -425,6 +433,7 @@ bool DynamicMMap::Grow() { return false; } + Pools =(Pool*) Base + poolOffset; WorkSpace = newSize; return true; } diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index 6d9e99497..5e6db3f38 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -277,6 +277,7 @@ bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const // Store the IMS information pkgCache::PkgFileIterator File = Gen.GetCurFile(); + pkgCacheGenerator::Dynamic DynFile(File); struct stat St; if (fstat(Pkg.Fd(),&St) != 0) return _error->Errno("fstat","Failed to stat"); diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 68aa83d0c..8af8ef7de 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -119,7 +119,7 @@ pkgCache::pkgCache(MMap *Map, bool DoMap) : Map(*Map) // Cache::ReMap - Reopen the cache file /*{{{*/ // --------------------------------------------------------------------- /* If the file is already closed then this will open it open it. */ -bool pkgCache::ReMap() +bool pkgCache::ReMap(bool const &Errorchecks) { // Apply the typecasts. HeaderP = (Header *)Map.Data(); @@ -135,6 +135,9 @@ bool pkgCache::ReMap() StringItemP = (StringItem *)Map.Data(); StrP = (char *)Map.Data(); + if (Errorchecks == false) + return true; + if (Map.Size() == 0 || HeaderP == 0) return _error->Error(_("Empty package cache")); diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 426bb9f13..799521784 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -174,7 +174,7 @@ class pkgCache /*{{{*/ StringItem *StringItemP; char *StrP; - virtual bool ReMap(); + virtual bool ReMap(bool const &Errorchecks = true); inline bool Sync() {return Map.Sync();}; inline MMap &GetMap() {return Map;}; inline void *DataEnd() {return ((unsigned char *)Map.Data()) + Map.Size();}; diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 62e457734..18bad6727 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -36,6 +36,7 @@ #include /*}}}*/ typedef vector::iterator FileIterator; +template std::set pkgCacheGenerator::Dynamic::toReMap; // CacheGenerator::pkgCacheGenerator - Constructor /*{{{*/ // --------------------------------------------------------------------- @@ -61,8 +62,12 @@ pkgCacheGenerator::pkgCacheGenerator(DynamicMMap *pMap,OpProgress *Prog) : // Starting header *Cache.HeaderP = pkgCache::Header(); - Cache.HeaderP->VerSysName = WriteStringInMap(_system->VS->Label); - Cache.HeaderP->Architecture = WriteStringInMap(_config->Find("APT::Architecture")); + map_ptrloc const idxVerSysName = WriteStringInMap(_system->VS->Label); + Cache.HeaderP->VerSysName = idxVerSysName; + map_ptrloc const idxArchitecture = WriteStringInMap(_config->Find("APT::Architecture")); + Cache.HeaderP->Architecture = idxArchitecture; + if (unlikely(idxVerSysName == 0 || idxArchitecture == 0)) + return; Cache.ReMap(); } else @@ -96,19 +101,65 @@ pkgCacheGenerator::~pkgCacheGenerator() Map.Sync(0,sizeof(pkgCache::Header)); } /*}}}*/ +void pkgCacheGenerator::ReMap(void const * const oldMap, void const * const newMap) {/*{{{*/ + if (oldMap == newMap) + return; + + Cache.ReMap(false); + + CurrentFile += (pkgCache::PackageFile*) newMap - (pkgCache::PackageFile*) oldMap; + + for (size_t i = 0; i < _count(UniqHash); ++i) + if (UniqHash[i] != 0) + UniqHash[i] += (pkgCache::StringItem*) newMap - (pkgCache::StringItem*) oldMap; + + for (std::set::const_iterator i = Dynamic::toReMap.begin(); + i != Dynamic::toReMap.end(); ++i) + (*i)->ReOwn(Cache, oldMap, newMap); + for (std::set::const_iterator i = Dynamic::toReMap.begin(); + i != Dynamic::toReMap.end(); ++i) + (*i)->ReOwn(Cache, oldMap, newMap); + for (std::set::const_iterator i = Dynamic::toReMap.begin(); + i != Dynamic::toReMap.end(); ++i) + (*i)->ReOwn(Cache, oldMap, newMap); + for (std::set::const_iterator i = Dynamic::toReMap.begin(); + i != Dynamic::toReMap.end(); ++i) + (*i)->ReOwn(Cache, oldMap, newMap); + for (std::set::const_iterator i = Dynamic::toReMap.begin(); + i != Dynamic::toReMap.end(); ++i) + (*i)->ReOwn(Cache, oldMap, newMap); + for (std::set::const_iterator i = Dynamic::toReMap.begin(); + i != Dynamic::toReMap.end(); ++i) + (*i)->ReOwn(Cache, oldMap, newMap); + for (std::set::const_iterator i = Dynamic::toReMap.begin(); + i != Dynamic::toReMap.end(); ++i) + (*i)->ReOwn(Cache, oldMap, newMap); +} /*}}}*/ // CacheGenerator::WriteStringInMap /*{{{*/ -unsigned long pkgCacheGenerator::WriteStringInMap(const char *String, +map_ptrloc pkgCacheGenerator::WriteStringInMap(const char *String, const unsigned long &Len) { - return Map.WriteString(String, Len); + void const * const oldMap = Map.Data(); + map_ptrloc const index = Map.WriteString(String, Len); + if (index != 0) + ReMap(oldMap, Map.Data()); + return index; } /*}}}*/ // CacheGenerator::WriteStringInMap /*{{{*/ -unsigned long pkgCacheGenerator::WriteStringInMap(const char *String) { - return Map.WriteString(String); +map_ptrloc pkgCacheGenerator::WriteStringInMap(const char *String) { + void const * const oldMap = Map.Data(); + map_ptrloc const index = Map.WriteString(String); + if (index != 0) + ReMap(oldMap, Map.Data()); + return index; } /*}}}*/ -unsigned long pkgCacheGenerator::AllocateInMap(const unsigned long &size) {/*{{{*/ - return Map.Allocate(size); +map_ptrloc pkgCacheGenerator::AllocateInMap(const unsigned long &size) {/*{{{*/ + void const * const oldMap = Map.Data(); + map_ptrloc const index = Map.Allocate(size); + if (index != 0) + ReMap(oldMap, Map.Data()); + return index; } /*}}}*/ // CacheGenerator::MergeList - Merge the package list /*{{{*/ @@ -142,6 +193,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List, { // Get a pointer to the package structure pkgCache::PkgIterator Pkg; + Dynamic DynPkg(Pkg); if (NewPackage(Pkg, PackageName, *arch) == false) return _error->Error(_("Error occurred while processing %s (NewPackage)"),PackageName.c_str()); Counter++; @@ -158,6 +210,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List, // (this has the bonus that we get MMap error when we run out // of MMap space) pkgCache::VerIterator Ver(Cache); + Dynamic DynVer(Ver); if (List.UsePackage(Pkg, Ver) == false) return _error->Error(_("Error occurred while processing %s (UsePackage1)"), PackageName.c_str()); @@ -165,11 +218,11 @@ bool pkgCacheGenerator::MergeList(ListParser &List, // Find the right version to write the description MD5SumValue CurMd5 = List.Description_md5(); Ver = Pkg.VersionList(); - map_ptrloc *LastVer = &Pkg->VersionList; - for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++) + for (; Ver.end() == false; ++Ver) { pkgCache::DescIterator Desc = Ver.DescriptionList(); + Dynamic DynDesc(Desc); map_ptrloc *LastDesc = &Ver->DescriptionList; bool duplicate=false; @@ -189,7 +242,11 @@ bool pkgCacheGenerator::MergeList(ListParser &List, if (MD5SumValue(Desc.md5()) == CurMd5) { // Add new description - *LastDesc = NewDescription(Desc, List.DescriptionLanguage(), CurMd5, *LastDesc); + void const * const oldMap = Map.Data(); + map_ptrloc const descindex = NewDescription(Desc, List.DescriptionLanguage(), CurMd5, *LastDesc); + if (oldMap != Map.Data()) + LastDesc += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap; + *LastDesc = descindex; Desc->ParentPkg = Pkg.Index(); if ((*LastDesc == 0 && _error->PendingError()) || NewFileDesc(Desc,List) == false) @@ -203,7 +260,9 @@ bool pkgCacheGenerator::MergeList(ListParser &List, } pkgCache::VerIterator Ver = Pkg.VersionList(); + Dynamic DynVer(Ver); map_ptrloc *LastVer = &Pkg->VersionList; + void const * oldMap = Map.Data(); int Res = 1; unsigned long const Hash = List.VersionHash(); for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++) @@ -242,21 +301,28 @@ bool pkgCacheGenerator::MergeList(ListParser &List, } // Add a new version - *LastVer = NewVersion(Ver,Version,*LastVer); + map_ptrloc const verindex = NewVersion(Ver,Version,*LastVer); + if (verindex == 0 && _error->PendingError()) + return _error->Error(_("Error occurred while processing %s (NewVersion%d)"), + PackageName.c_str(), 1); + + if (oldMap != Map.Data()) + LastVer += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap; + *LastVer = verindex; Ver->ParentPkg = Pkg.Index(); Ver->Hash = Hash; - if ((*LastVer == 0 && _error->PendingError()) || List.NewVersion(Ver) == false) - return _error->Error(_("Error occurred while processing %s (NewVersion1)"), - PackageName.c_str()); + if (List.NewVersion(Ver) == false) + return _error->Error(_("Error occurred while processing %s (NewVersion%d)"), + PackageName.c_str(), 2); if (List.UsePackage(Pkg,Ver) == false) return _error->Error(_("Error occurred while processing %s (UsePackage3)"), PackageName.c_str()); if (NewFileVer(Ver,List) == false) - return _error->Error(_("Error occurred while processing %s (NewVersion2)"), - PackageName.c_str()); + return _error->Error(_("Error occurred while processing %s (NewVersion%d)"), + PackageName.c_str(), 3); // Read only a single record and return if (OutVer != 0) @@ -269,13 +335,18 @@ bool pkgCacheGenerator::MergeList(ListParser &List, /* Record the Description data. Description data always exist in Packages and Translation-* files. */ pkgCache::DescIterator Desc = Ver.DescriptionList(); + Dynamic DynDesc(Desc); map_ptrloc *LastDesc = &Ver->DescriptionList; - + // Skip to the end of description set for (; Desc.end() == false; LastDesc = &Desc->NextDesc, Desc++); // Add new description - *LastDesc = NewDescription(Desc, List.DescriptionLanguage(), List.Description_md5(), *LastDesc); + oldMap = Map.Data(); + map_ptrloc const descindex = NewDescription(Desc, List.DescriptionLanguage(), List.Description_md5(), *LastDesc); + if (oldMap != Map.Data()) + LastDesc += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap; + *LastDesc = descindex; Desc->ParentPkg = Pkg.Index(); if ((*LastDesc == 0 && _error->PendingError()) || NewFileDesc(Desc,List) == false) @@ -322,6 +393,7 @@ bool pkgCacheGenerator::MergeFileProvides(ListParser &List) continue; pkgCache::PkgIterator Pkg = Cache.FindPkg(PackageName); + Dynamic DynPkg(Pkg); if (Pkg.end() == true) return _error->Error(_("Error occurred while processing %s (FindPkg)"), PackageName.c_str()); @@ -331,6 +403,7 @@ bool pkgCacheGenerator::MergeFileProvides(ListParser &List) unsigned long Hash = List.VersionHash(); pkgCache::VerIterator Ver = Pkg.VersionList(); + Dynamic DynVer(Ver); for (; Ver.end() == false; Ver++) { if (Ver->Hash == Hash && Version.c_str() == Ver.VerStr()) @@ -358,14 +431,15 @@ bool pkgCacheGenerator::NewGroup(pkgCache::GrpIterator &Grp, const string &Name) return true; // Get a structure - unsigned long const Group = AllocateInMap(sizeof(pkgCache::Group)); + map_ptrloc const Group = AllocateInMap(sizeof(pkgCache::Group)); if (unlikely(Group == 0)) return false; Grp = pkgCache::GrpIterator(Cache, Cache.GrpP + Group); - Grp->Name = WriteStringInMap(Name); - if (unlikely(Grp->Name == 0)) + map_ptrloc const idxName = WriteStringInMap(Name); + if (unlikely(idxName == 0)) return false; + Grp->Name = idxName; // Insert it into the hash table unsigned long const Hash = Cache.Hash(Name); @@ -382,6 +456,7 @@ bool pkgCacheGenerator::NewGroup(pkgCache::GrpIterator &Grp, const string &Name) bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name, const string &Arch) { pkgCache::GrpIterator Grp; + Dynamic DynGrp(Grp); if (unlikely(NewGroup(Grp, Name) == false)) return false; @@ -390,7 +465,7 @@ bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name return true; // Get a structure - unsigned long const Package = AllocateInMap(sizeof(pkgCache::Package)); + map_ptrloc const Package = AllocateInMap(sizeof(pkgCache::Package)); if (unlikely(Package == 0)) return false; Pkg = pkgCache::PkgIterator(Cache,Cache.PkgP + Package); @@ -416,9 +491,10 @@ bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name // Set the name, arch and the ID Pkg->Name = Grp->Name; Pkg->Group = Grp.Index(); - Pkg->Arch = WriteUniqString(Arch.c_str()); - if (unlikely(Pkg->Arch == 0)) + map_ptrloc const idxArch = WriteUniqString(Arch.c_str()); + if (unlikely(idxArch == 0)) return false; + Pkg->Arch = idxArch; Pkg->ID = Cache.HeaderP->PackageCount++; return true; @@ -434,7 +510,7 @@ bool pkgCacheGenerator::NewFileVer(pkgCache::VerIterator &Ver, return true; // Get a structure - unsigned long VerFile = AllocateInMap(sizeof(pkgCache::VerFile)); + map_ptrloc const VerFile = AllocateInMap(sizeof(pkgCache::VerFile)); if (VerFile == 0) return 0; @@ -465,7 +541,7 @@ unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver, unsigned long Next) { // Get a structure - unsigned long Version = AllocateInMap(sizeof(pkgCache::Version)); + map_ptrloc const Version = AllocateInMap(sizeof(pkgCache::Version)); if (Version == 0) return 0; @@ -473,9 +549,10 @@ unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver, Ver = pkgCache::VerIterator(Cache,Cache.VerP + Version); Ver->NextVer = Next; Ver->ID = Cache.HeaderP->VersionCount++; - Ver->VerStr = WriteStringInMap(VerStr); - if (Ver->VerStr == 0) + map_ptrloc const idxVerStr = WriteStringInMap(VerStr); + if (unlikely(idxVerStr == 0)) return 0; + Ver->VerStr = idxVerStr; return Version; } @@ -490,7 +567,7 @@ bool pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator &Desc, return true; // Get a structure - unsigned long DescFile = AllocateInMap(sizeof(pkgCache::DescFile)); + map_ptrloc const DescFile = AllocateInMap(sizeof(pkgCache::DescFile)); if (DescFile == 0) return false; @@ -523,7 +600,7 @@ map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc, map_ptrloc Next) { // Get a structure - map_ptrloc Description = AllocateInMap(sizeof(pkgCache::Description)); + map_ptrloc const Description = AllocateInMap(sizeof(pkgCache::Description)); if (Description == 0) return 0; @@ -531,10 +608,12 @@ map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc, Desc = pkgCache::DescIterator(Cache,Cache.DescP + Description); Desc->NextDesc = Next; Desc->ID = Cache.HeaderP->DescriptionCount++; - Desc->language_code = WriteStringInMap(Lang); - Desc->md5sum = WriteStringInMap(md5sum.Value()); - if (Desc->language_code == 0 || Desc->md5sum == 0) + map_ptrloc const idxlanguage_code = WriteStringInMap(Lang); + map_ptrloc const idxmd5sum = WriteStringInMap(md5sum.Value()); + if (unlikely(idxlanguage_code == 0 || idxmd5sum == 0)) return 0; + Desc->language_code = idxlanguage_code; + Desc->md5sum = idxmd5sum; return Description; } @@ -550,15 +629,22 @@ bool pkgCacheGenerator::FinishCache(OpProgress *Progress) if (archs.size() > 1) { // Create Conflicts in between the group - for (pkgCache::GrpIterator G = GetCache().GrpBegin(); G.end() != true; G++) + pkgCache::GrpIterator G = GetCache().GrpBegin(); + Dynamic DynG(G); + for (; G.end() != true; G++) { string const PkgName = G.Name(); - for (pkgCache::PkgIterator P = G.PackageList(); P.end() != true; P = G.NextPkg(P)) + pkgCache::PkgIterator P = G.PackageList(); + Dynamic DynP(P); + for (; P.end() != true; P = G.NextPkg(P)) { if (strcmp(P.Arch(),"all") == 0) continue; pkgCache::PkgIterator allPkg; - for (pkgCache::VerIterator V = P.VersionList(); V.end() != true; V++) + Dynamic DynallPkg(allPkg); + pkgCache::VerIterator V = P.VersionList(); + Dynamic DynV(V); + for (; V.end() != true; V++) { string const Arch = V.Arch(true); map_ptrloc *OldDepLast = NULL; @@ -578,6 +664,7 @@ bool pkgCacheGenerator::FinishCache(OpProgress *Progress) per group, therefore each group member conflicts with all other group members */ pkgCache::PkgIterator D = G.FindPkg(*A); + Dynamic DynD(D); if (D.end() == true) continue; if (coInstall == true) @@ -622,13 +709,15 @@ bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg, unsigned int const &Type, map_ptrloc *OldDepLast) { + void const * const oldMap = Map.Data(); // Get a structure - unsigned long const Dependency = AllocateInMap(sizeof(pkgCache::Dependency)); + map_ptrloc const Dependency = AllocateInMap(sizeof(pkgCache::Dependency)); if (unlikely(Dependency == 0)) return false; // Fill it in pkgCache::DepIterator Dep(Cache,Cache.DepP + Dependency); + Dynamic DynDep(Dep); Dep->ParentVer = Ver.Index(); Dep->Type = Type; Dep->CompareOp = Op; @@ -640,9 +729,12 @@ bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg, /* for (pkgCache::DepIterator I = Pkg.RevDependsList(); I.end() == false; I++) if (I->Version != 0 && I.TargetVer() == Version) Dep->Version = I->Version;*/ - if (Dep->Version == 0) - if (unlikely((Dep->Version = WriteStringInMap(Version)) == 0)) + if (Dep->Version == 0) { + map_ptrloc const index = WriteStringInMap(Version); + if (unlikely(index == 0)) return false; + Dep->Version = index; + } } // Link it to the package @@ -656,7 +748,8 @@ bool pkgCacheGenerator::NewDepends(pkgCache::PkgIterator &Pkg, OldDepLast = &Ver->DependsList; for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; D++) OldDepLast = &D->NextDepends; - } + } else if (oldMap != Map.Data()) + OldDepLast += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap; Dep->NextDepends = *OldDepLast; *OldDepLast = Dep.Index(); @@ -677,11 +770,13 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator &Ver, unsigned int Type) { pkgCache::GrpIterator Grp; + Dynamic DynGrp(Grp); if (unlikely(Owner->NewGroup(Grp, PackageName) == false)) return false; // Locate the target package pkgCache::PkgIterator Pkg = Grp.FindPkg(Arch); + Dynamic DynPkg(Pkg); if (Pkg.end() == true) { if (unlikely(Owner->NewPackage(Pkg, PackageName, Arch) == false)) return false; @@ -715,13 +810,14 @@ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator &Ver, return true; // Get a structure - unsigned long const Provides = Owner->AllocateInMap(sizeof(pkgCache::Provides)); + map_ptrloc const Provides = Owner->AllocateInMap(sizeof(pkgCache::Provides)); if (unlikely(Provides == 0)) return false; Cache.HeaderP->ProvidesCount++; // Fill it in pkgCache::PrvIterator Prv(Cache,Cache.ProvideP + Provides,Cache.PkgP); + Dynamic DynPrv(Prv); Prv->Version = Ver.Index(); Prv->NextPkgProv = Ver->ProvidesList; Ver->ProvidesList = Prv.Index(); @@ -730,6 +826,7 @@ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator &Ver, // Locate the target package pkgCache::PkgIterator Pkg; + Dynamic DynPkg(Pkg); if (unlikely(Owner->NewPackage(Pkg,PkgName, PkgArch) == false)) return false; @@ -750,24 +847,29 @@ bool pkgCacheGenerator::SelectFile(const string &File,const string &Site, unsigned long Flags) { // Get some space for the structure - CurrentFile = Cache.PkgFileP + AllocateInMap(sizeof(*CurrentFile)); - if (CurrentFile == Cache.PkgFileP) + map_ptrloc const idxFile = AllocateInMap(sizeof(*CurrentFile)); + if (unlikely(idxFile == 0)) return false; - + CurrentFile = Cache.PkgFileP + idxFile; + // Fill it in - CurrentFile->FileName = WriteStringInMap(File); - CurrentFile->Site = WriteUniqString(Site); + map_ptrloc const idxFileName = WriteStringInMap(File); + map_ptrloc const idxSite = WriteUniqString(Site); + if (unlikely(idxFileName == 0 || idxSite == 0)) + return false; + CurrentFile->FileName = idxFileName; + CurrentFile->Site = idxSite; CurrentFile->NextFile = Cache.HeaderP->FileList; CurrentFile->Flags = Flags; CurrentFile->ID = Cache.HeaderP->PackageFileCount; - CurrentFile->IndexType = WriteUniqString(Index.GetType()->Label); + map_ptrloc const idxIndexType = WriteUniqString(Index.GetType()->Label); + if (unlikely(idxIndexType == 0)) + return false; + CurrentFile->IndexType = idxIndexType; PkgFileName = File; Cache.HeaderP->FileList = CurrentFile - Cache.PkgFileP; Cache.HeaderP->PackageFileCount++; - if (CurrentFile->FileName == 0) - return false; - if (Progress != 0) Progress->SubProgress(Index.Size()); return true; @@ -807,18 +909,25 @@ unsigned long pkgCacheGenerator::WriteUniqString(const char *S, } // Get a structure - unsigned long Item = AllocateInMap(sizeof(pkgCache::StringItem)); + void const * const oldMap = Map.Data(); + map_ptrloc const Item = AllocateInMap(sizeof(pkgCache::StringItem)); if (Item == 0) return 0; + map_ptrloc const idxString = WriteStringInMap(S,Size); + if (unlikely(idxString == 0)) + return 0; + if (oldMap != Map.Data()) { + Last += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap; + I += (pkgCache::StringItem*) Map.Data() - (pkgCache::StringItem*) oldMap; + } + *Last = Item; + // Fill in the structure pkgCache::StringItem *ItemP = Cache.StringItemP + Item; ItemP->NextItem = I - Cache.StringItemP; - *Last = Item; - ItemP->String = WriteStringInMap(S,Size); - if (ItemP->String == 0) - return 0; - + ItemP->String = idxString; + Bucket = ItemP; return ItemP->String; } @@ -1072,7 +1181,7 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress unlink(CacheFile.c_str()); CacheF = new FileFd(CacheFile,FileFd::WriteEmpty); fchmod(CacheF->Fd(),0644); - Map = new DynamicMMap(*CacheF,MMap::Public,MapSize); + Map = new DynamicMMap(*CacheF,MMap::Public | MMap::Moveable, MapSize); if (_error->PendingError() == true) return false; if (Debug == true) @@ -1081,7 +1190,7 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress else { // Just build it in memory.. - Map = new DynamicMMap(0,MapSize); + Map = new DynamicMMap(MMap::Moveable, MapSize); if (Debug == true) std::clog << "Open memory Map (not filebased)" << std::endl; } @@ -1194,7 +1303,7 @@ bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **O if (_system->AddStatusFiles(Files) == false) return false; - SPtr Map = new DynamicMMap(0,MapSize); + SPtr Map = new DynamicMMap(MMap::Moveable, MapSize); unsigned long CurrentSize = 0; unsigned long TotalSize = 0; diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index 8f7739165..3bee1f958 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -23,6 +23,8 @@ #include #include +#include + class pkgSourceList; class OpProgress; class MMap; @@ -33,18 +35,32 @@ class pkgCacheGenerator /*{{{*/ private: pkgCache::StringItem *UniqHash[26]; - unsigned long WriteStringInMap(std::string const &String) { return WriteStringInMap(String.c_str()); }; - unsigned long WriteStringInMap(const char *String); - unsigned long WriteStringInMap(const char *String, const unsigned long &Len); - unsigned long AllocateInMap(const unsigned long &size); + map_ptrloc WriteStringInMap(std::string const &String) { return WriteStringInMap(String.c_str()); }; + map_ptrloc WriteStringInMap(const char *String); + map_ptrloc WriteStringInMap(const char *String, const unsigned long &Len); + map_ptrloc AllocateInMap(const unsigned long &size); public: class ListParser; friend class ListParser; - + + template class Dynamic { + Iter *I; + + public: + static std::set toReMap; + Dynamic(Iter &It) : I(&It) { + toReMap.insert(I); + } + + ~Dynamic() { + toReMap.erase(I); + } + }; + protected: - + DynamicMMap ⤅ pkgCache Cache; OpProgress *Progress; @@ -86,6 +102,8 @@ class pkgCacheGenerator /*{{{*/ MMap **OutMap = 0,bool AllowMem = false); static bool MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap); + void ReMap(void const * const oldMap, void const * const newMap); + pkgCacheGenerator(DynamicMMap *Map,OpProgress *Progress); ~pkgCacheGenerator(); }; diff --git a/debian/changelog b/debian/changelog index 878d5238a..dab703c6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,6 +37,9 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low * apt-pkg/policy.h: - add another round of const& madness as the previous round accidentally NOT overrides the virtual GetCandidateVer() method (Closes: #587725) + * apt-pkg/pkgcachegen.{cc,h}: + - make the used MMap moveable (and therefore dynamic resizeable) by + applying (some) mad pointer magic (Closes: #195018) [ Julian Andres Klode ] * methods/ftp.h: -- cgit v1.2.3 From dcdf1ef18b37c243fc707869149f7761d964915c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 9 Jul 2010 17:00:28 +0200 Subject: * doc/apt.conf.5.xml: - add and document APT::Cache-{Start,Grow,Limit} options for mmap control --- apt-pkg/contrib/mmap.cc | 2 ++ apt-pkg/pkgcachegen.cc | 22 ++++++++++++++++------ apt-pkg/pkgcachegen.h | 1 + debian/changelog | 4 +++- doc/apt.conf.5.xml | 17 ++++++++++++++--- doc/examples/configure-index | 4 +++- 6 files changed, 39 insertions(+), 11 deletions(-) diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index aa184b130..69fb61fca 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -398,6 +398,8 @@ bool DynamicMMap::Grow() { if (Limit != 0 && WorkSpace >= Limit) return _error->Error(_("Unable to increase the size of the MMap as the " "limit of %lu bytes is already reached."), Limit); + if (GrowFactor <= 0) + return _error->Error(_("Unable to increase size of the MMap as automatic growing is disabled by user.")); unsigned long const newSize = WorkSpace + GrowFactor; diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 18bad6727..7ca8fbfda 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -1094,6 +1094,18 @@ static bool BuildCache(pkgCacheGenerator &Gen, return true; } /*}}}*/ +DynamicMMap* pkgCacheGenerator::CreateDynamicMMap(FileFd *CacheF, unsigned long Flags) { + unsigned long const MapStart = _config->FindI("APT::Cache-Start", 24*1024*1024); + unsigned long const MapGrow = _config->FindI("APT::Cache-Grow", 1*1024*1024); + unsigned long const MapLimit = _config->FindI("APT::Cache-Limit", 0); + Flags |= MMap::Moveable; + if (_config->FindB("APT::Cache-Fallback", false) == true) + Flags |= MMap::Fallback; + if (CacheF != NULL) + return new DynamicMMap(*CacheF, Flags, MapStart, MapGrow, MapLimit); + else + return new DynamicMMap(Flags, MapStart, MapGrow, MapLimit); +} // CacheGenerator::MakeStatusCache - Construct the status cache /*{{{*/ // --------------------------------------------------------------------- /* This makes sure that the status cache (the cache that has all @@ -1109,7 +1121,6 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress MMap **OutMap,bool AllowMem) { bool const Debug = _config->FindB("Debug::pkgCacheGen", false); - unsigned long const MapSize = _config->FindI("APT::Cache-Limit",24*1024*1024); vector Files; for (vector::const_iterator i = List.begin(); @@ -1181,7 +1192,7 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress unlink(CacheFile.c_str()); CacheF = new FileFd(CacheFile,FileFd::WriteEmpty); fchmod(CacheF->Fd(),0644); - Map = new DynamicMMap(*CacheF,MMap::Public | MMap::Moveable, MapSize); + Map = CreateDynamicMMap(CacheF, MMap::Public); if (_error->PendingError() == true) return false; if (Debug == true) @@ -1190,7 +1201,7 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress else { // Just build it in memory.. - Map = new DynamicMMap(MMap::Moveable, MapSize); + Map = CreateDynamicMMap(NULL); if (Debug == true) std::clog << "Open memory Map (not filebased)" << std::endl; } @@ -1297,13 +1308,12 @@ __deprecated bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutM { return pkgCacheGenerator::MakeOnlyStatusCache(&Progress, OutMap); } bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap) { - unsigned long MapSize = _config->FindI("APT::Cache-Limit",20*1024*1024); vector Files; unsigned long EndOfSource = Files.size(); if (_system->AddStatusFiles(Files) == false) return false; - - SPtr Map = new DynamicMMap(MMap::Moveable, MapSize); + + SPtr Map = CreateDynamicMMap(NULL); unsigned long CurrentSize = 0; unsigned long TotalSize = 0; diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index 3bee1f958..20dd28030 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -101,6 +101,7 @@ class pkgCacheGenerator /*{{{*/ static bool MakeStatusCache(pkgSourceList &List,OpProgress *Progress, MMap **OutMap = 0,bool AllowMem = false); static bool MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap); + static DynamicMMap* CreateDynamicMMap(FileFd *CacheF, unsigned long Flags = 0); void ReMap(void const * const oldMap, void const * const newMap); diff --git a/debian/changelog b/debian/changelog index dab703c6b..f819908ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,6 +40,8 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low * apt-pkg/pkgcachegen.{cc,h}: - make the used MMap moveable (and therefore dynamic resizeable) by applying (some) mad pointer magic (Closes: #195018) + * doc/apt.conf.5.xml: + - add and document APT::Cache-{Start,Grow,Limit} options for mmap control [ Julian Andres Klode ] * methods/ftp.h: @@ -55,7 +57,7 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low * debian/control: - Set Standards-Version to 3.9.0 - -- David Kalnischkies Mon, 05 Jul 2010 12:05:30 +0200 + -- David Kalnischkies Fri, 09 Jul 2010 16:55:53 +0200 apt (0.7.26~exp7) experimental; urgency=low diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 39e2c8e6b..7b7290794 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -199,9 +199,20 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; anything that those packages depend on. - Cache-Limit - APT uses a fixed size memory mapped cache file to store the 'available' - information. This sets the size of that cache (in bytes). + Cache-Start, Cache-Grow and Cache-Limit + APT uses since version 0.7.26 a resizable memory mapped cache file to store the 'available' + information. Cache-Start acts as a hint to which size the Cache will grow + and is therefore the amount of memory APT will request at startup. The default value is + 20971520 bytes (~20 MB). Note that these amount of space need to be available for APT + otherwise it will likely fail ungracefully, so for memory restricted devices these value should + be lowered while on systems with a lot of configured sources this might be increased. + Cache-Grow defines in byte with the default of 1048576 (~1 MB) how much + the Cache size will be increased in the event the space defined by Cache-Start + is not enough. These value will be applied again and again until either the cache is big + enough to store all information or the size of the cache reaches the Cache-Limit. + The default of Cache-Limit is 0 which stands for no limit. + If Cache-Grow is set to 0 the automatic grow of the cache is disabled. + Build-Essential diff --git a/doc/examples/configure-index b/doc/examples/configure-index index fdec32c2c..26fb53fec 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -95,7 +95,9 @@ APT Clean-Installed "true"; Immediate-Configure "true"; // DO NOT turn this off, see the man page Force-LoopBreak "false"; // DO NOT turn this on, see the man page - Cache-Limit "4194304"; + Cache-Start "20971520"; + Cache-Grow "1048576"; + Cache-Limit "0"; Default-Release ""; // consider Recommends, Suggests as important dependencies that should -- cgit v1.2.3 From 7635093c1c015e385a9e72bdd8a089fd9d48ab57 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 9 Jul 2010 19:51:19 +0200 Subject: switch from std::set to std::vector as it is way more simple, a bit faster and still provides everything we need for the Cache generator --- apt-pkg/pkgcachegen.cc | 16 ++++++++-------- apt-pkg/pkgcachegen.h | 12 +++++------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 7ca8fbfda..1175d5129 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -36,7 +36,7 @@ #include /*}}}*/ typedef vector::iterator FileIterator; -template std::set pkgCacheGenerator::Dynamic::toReMap; +template std::vector pkgCacheGenerator::Dynamic::toReMap(6); // CacheGenerator::pkgCacheGenerator - Constructor /*{{{*/ // --------------------------------------------------------------------- @@ -113,25 +113,25 @@ void pkgCacheGenerator::ReMap(void const * const oldMap, void const * const newM if (UniqHash[i] != 0) UniqHash[i] += (pkgCache::StringItem*) newMap - (pkgCache::StringItem*) oldMap; - for (std::set::const_iterator i = Dynamic::toReMap.begin(); + for (std::vector::const_iterator i = Dynamic::toReMap.begin(); i != Dynamic::toReMap.end(); ++i) (*i)->ReOwn(Cache, oldMap, newMap); - for (std::set::const_iterator i = Dynamic::toReMap.begin(); + for (std::vector::const_iterator i = Dynamic::toReMap.begin(); i != Dynamic::toReMap.end(); ++i) (*i)->ReOwn(Cache, oldMap, newMap); - for (std::set::const_iterator i = Dynamic::toReMap.begin(); + for (std::vector::const_iterator i = Dynamic::toReMap.begin(); i != Dynamic::toReMap.end(); ++i) (*i)->ReOwn(Cache, oldMap, newMap); - for (std::set::const_iterator i = Dynamic::toReMap.begin(); + for (std::vector::const_iterator i = Dynamic::toReMap.begin(); i != Dynamic::toReMap.end(); ++i) (*i)->ReOwn(Cache, oldMap, newMap); - for (std::set::const_iterator i = Dynamic::toReMap.begin(); + for (std::vector::const_iterator i = Dynamic::toReMap.begin(); i != Dynamic::toReMap.end(); ++i) (*i)->ReOwn(Cache, oldMap, newMap); - for (std::set::const_iterator i = Dynamic::toReMap.begin(); + for (std::vector::const_iterator i = Dynamic::toReMap.begin(); i != Dynamic::toReMap.end(); ++i) (*i)->ReOwn(Cache, oldMap, newMap); - for (std::set::const_iterator i = Dynamic::toReMap.begin(); + for (std::vector::const_iterator i = Dynamic::toReMap.begin(); i != Dynamic::toReMap.end(); ++i) (*i)->ReOwn(Cache, oldMap, newMap); } /*}}}*/ diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index 20dd28030..ff198833a 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -23,7 +23,7 @@ #include #include -#include +#include class pkgSourceList; class OpProgress; @@ -46,16 +46,14 @@ class pkgCacheGenerator /*{{{*/ friend class ListParser; template class Dynamic { - Iter *I; - public: - static std::set toReMap; - Dynamic(Iter &It) : I(&It) { - toReMap.insert(I); + static std::vector toReMap; + Dynamic(Iter &I) { + toReMap.push_back(&I); } ~Dynamic() { - toReMap.erase(I); + toReMap.pop_back(); } }; -- cgit v1.2.3 From 5d062ce08e6125d9ef34d3e55d4a88c1937f4f21 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 9 Jul 2010 21:16:01 +0200 Subject: releasing version 0.7.26~exp8 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c4d18d70b..eebf4fd01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.7.26~exp8) UNRELEASED; urgency=low +apt (0.7.26~exp8) experimental; urgency=low [ David Kalnischkies ] * cmdline/cacheset.cc: @@ -59,7 +59,7 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low * debian/control: - Set Standards-Version to 3.9.0 - -- David Kalnischkies Mon, 05 Jul 2010 12:05:30 +0200 + -- Michael Vogt Fri, 09 Jul 2010 19:16:20 +0200 apt (0.7.26~exp7) experimental; urgency=low -- cgit v1.2.3 From 62d073d937742baf8621a11c3094e0320aa846cd Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 9 Jul 2010 21:46:42 +0200 Subject: check the state of the FileFd before renaming as otherwise the rename will be tried twice e.g. in an "apt-get update" run and every other piece of code closing the FileFd manual before the destructor will do it again. --- apt-pkg/contrib/fileutl.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 62d42e4da..8f7791a8a 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -843,19 +843,21 @@ bool FileFd::Close() bool Res = true; if ((Flags & AutoClose) == AutoClose) if (iFd >= 0 && close(iFd) != 0) - Res &= _error->Errno("close",_("Problem closing the file")); - iFd = -1; + Res &= _error->Errno("close",_("Problem closing the file %s"), FileName.c_str()); - if ((Flags & Replace) == Replace) { + if ((Flags & Replace) == Replace && iFd >= 0) { if (rename(TemporaryFileName.c_str(), FileName.c_str()) != 0) - Res &= _error->Errno("rename",_("Problem renaming the file")); + Res &= _error->Errno("rename",_("Problem renaming the file %s to %s"), TemporaryFileName.c_str(), FileName.c_str()); + FileName = TemporaryFileName; // for the unlink() below. } - + + iFd = -1; + if ((Flags & Fail) == Fail && (Flags & DelOnFail) == DelOnFail && FileName.empty() == false) if (unlink(FileName.c_str()) != 0) - Res &= _error->WarningE("unlnk",_("Problem unlinking the file")); + Res &= _error->WarningE("unlnk",_("Problem unlinking the file %s"), FileName.c_str()); return Res; -- cgit v1.2.3 From 137a73dc58b14f71a11da5940e099725f6dad8ef Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 9 Jul 2010 22:53:15 +0200 Subject: releasing version 0.7.26~exp9 --- debian/changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d2491606c..a4ee9a7f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -apt (0.7.26~exp9) UNRELEASEDexperimental; urgency=low +apt (0.7.26~exp9) experimental; urgency=low [ David Kalnischkies ] * doc/apt.conf.5.xml: - add and document APT::Cache-{Start,Grow,Limit} options for mmap control + * apt-pkg/contrib/fileutl.cc: + - do not fail von double close() -- Michael Vogt Fri, 09 Jul 2010 21:51:55 +0200 -- cgit v1.2.3 From 3c0929ecbeab50de9d38edc2eaebe92aeee65baf Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 10 Jul 2010 13:51:47 +0200 Subject: * apt-pkg/contrib/error.{cc,h}: - remove constness of va_list parameter to fix build on amd64 and co Thanks Eric Valette! (Closes: #588610) --- apt-pkg/contrib/error.cc | 9 ++++----- apt-pkg/contrib/error.h | 4 ++-- debian/changelog | 9 +++++++++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc index 8cee21c9c..fbb6e4636 100644 --- a/apt-pkg/contrib/error.cc +++ b/apt-pkg/contrib/error.cc @@ -94,11 +94,10 @@ bool GlobalError::DebugE(const char *Function,const char *Description,...) { /*}}}*/ // GlobalError::InsertErrno - formats an error message with the errno /*{{{*/ bool GlobalError::InsertErrno(MsgType type, const char* Function, - const char* Description, va_list const &args) { + const char* Description, va_list &args) { char S[400]; - vsnprintf(S,sizeof(S),Description,args); - snprintf(S + strlen(S),sizeof(S) - strlen(S), - " - %s (%i: %s)", Function, errno, strerror(errno)); + snprintf(S, sizeof(S), "%s - %s (%i: %s)", Description, + Function, errno, strerror(errno)); return Insert(type, S, args); } /*}}}*/ @@ -141,7 +140,7 @@ bool GlobalError::Debug(const char *Description,...) /*}}}*/ // GlobalError::Insert - Insert a new item at the end /*{{{*/ bool GlobalError::Insert(MsgType type, const char* Description, - va_list const &args) { + va_list &args) { char S[400]; vsnprintf(S,sizeof(S),Description,args); diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index 73735162d..e5517c2da 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -278,9 +278,9 @@ private: /*{{{*/ std::list Stacks; bool InsertErrno(MsgType type, const char* Function, - const char* Description, va_list const &args); + const char* Description, va_list &args); bool Insert(MsgType type, const char* Description, - va_list const &args); + va_list &args); /*}}}*/ }; /*}}}*/ diff --git a/debian/changelog b/debian/changelog index a4ee9a7f8..23a5f9351 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +apt (0.7.26~exp10) UNRELEASED; urgency=low + + [ David Kalnischkies ] + * apt-pkg/contrib/error.{cc,h}: + - remove constness of va_list parameter to fix build on amd64 and co + Thanks Eric Valette! (Closes: #588610) + + -- David Kalnischkies Sat, 10 Jul 2010 13:44:32 +0200 + apt (0.7.26~exp9) experimental; urgency=low [ David Kalnischkies ] -- cgit v1.2.3 From dd13742ef11a6a601a2e85afd9d80be92ed7513a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 11 Jul 2010 18:50:41 +0200 Subject: * apt-pkg/deb/debmetaindex.cc: - do not query each architecture for flat file archives --- apt-pkg/deb/debindexfile.cc | 8 ++++---- apt-pkg/deb/deblistparser.cc | 2 +- apt-pkg/deb/debmetaindex.cc | 14 ++++++++++++-- apt-pkg/pkgcachegen.cc | 2 ++ debian/changelog | 2 ++ 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index 7e9a973a4..ba5b3f266 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -184,8 +184,8 @@ string debPackagesIndex::ArchiveInfo(pkgCache::VerIterator Ver) const Res += " "; Res += Ver.ParentPkg().Name(); Res += " "; - Res += Ver.Arch(); - Res += " "; + if (Dist[Dist.size() - 1] != '/') + Res.append(Ver.Arch()).append(" "); Res += Ver.VerStr(); return Res; } @@ -219,8 +219,8 @@ string debPackagesIndex::Info(const char *Type) const else Info += Dist + '/' + Section; Info += " "; - Info += Architecture; - Info += " "; + if (Dist[Dist.size() - 1] != '/') + Info += Architecture + " "; Info += Type; return Info; } diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 2cfeb23e9..5fb737970 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -757,7 +757,7 @@ bool debListParser::Step() if (Architecture.empty() == true) return true; - if (Arch.empty() == true || MultiArchEnabled == false) + if (Arch.empty() == true || Arch == "any" || MultiArchEnabled == false) { if (APT::Configuration::checkArchitecture(Architecture) == true) return true; diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index 8df3ed18d..7366bd624 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -332,7 +332,12 @@ class debSLTypeDebian : public pkgSourceList::Type if (IsSrc == true) Deb->PushSectionEntry("source", new debReleaseIndex::debSectionEntry(Section, IsSrc)); else - Deb->PushSectionEntry(Archs, new debReleaseIndex::debSectionEntry(Section, IsSrc)); + { + if (Dist[Dist.size() - 1] == '/') + Deb->PushSectionEntry("any", new debReleaseIndex::debSectionEntry(Section, IsSrc)); + else + Deb->PushSectionEntry(Archs, new debReleaseIndex::debSectionEntry(Section, IsSrc)); + } return true; } } @@ -342,7 +347,12 @@ class debSLTypeDebian : public pkgSourceList::Type if (IsSrc == true) Deb->PushSectionEntry ("source", new debReleaseIndex::debSectionEntry(Section, IsSrc)); else - Deb->PushSectionEntry (Archs, new debReleaseIndex::debSectionEntry(Section, IsSrc)); + { + if (Dist[Dist.size() - 1] == '/') + Deb->PushSectionEntry ("any", new debReleaseIndex::debSectionEntry(Section, IsSrc)); + else + Deb->PushSectionEntry (Archs, new debReleaseIndex::debSectionEntry(Section, IsSrc)); + } List.push_back(Deb); return true; } diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 1175d5129..38f2d6a2a 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -1094,6 +1094,7 @@ static bool BuildCache(pkgCacheGenerator &Gen, return true; } /*}}}*/ +// CacheGenerator::CreateDynamicMMap - load an mmap with configuration options /*{{{*/ DynamicMMap* pkgCacheGenerator::CreateDynamicMMap(FileFd *CacheF, unsigned long Flags) { unsigned long const MapStart = _config->FindI("APT::Cache-Start", 24*1024*1024); unsigned long const MapGrow = _config->FindI("APT::Cache-Grow", 1*1024*1024); @@ -1106,6 +1107,7 @@ DynamicMMap* pkgCacheGenerator::CreateDynamicMMap(FileFd *CacheF, unsigned long else return new DynamicMMap(Flags, MapStart, MapGrow, MapLimit); } + /*}}}*/ // CacheGenerator::MakeStatusCache - Construct the status cache /*{{{*/ // --------------------------------------------------------------------- /* This makes sure that the status cache (the cache that has all diff --git a/debian/changelog b/debian/changelog index bc35468c3..b506fa433 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ apt (0.7.26~exp10) UNRELEASED; urgency=low * apt-pkg/contrib/error.{cc,h}: - remove constness of va_list parameter to fix build on amd64 and co Thanks Eric Valette! (Closes: #588610) + * apt-pkg/deb/debmetaindex.cc: + - do not query each architecture for flat file archives [ Martin Pitt ] * debian/rules: -- cgit v1.2.3 From ff1ad6fdb01ad8d477ab711e4f6fe006d622f3bc Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 11 Jul 2010 18:58:54 +0200 Subject: fix typo preventing display of architecture in Info() --- apt-pkg/deb/debmetaindex.cc | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index 7366bd624..717d0bcde 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -23,7 +23,7 @@ string debReleaseIndex::Info(const char *Type, string const &Section, string con else { Info += Dist + '/' + Section; - if (Arch.empty() == true) + if (Arch.empty() != true) Info += " " + Arch; } Info += " "; diff --git a/debian/changelog b/debian/changelog index b506fa433..b0efc72e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ apt (0.7.26~exp10) UNRELEASED; urgency=low Thanks Eric Valette! (Closes: #588610) * apt-pkg/deb/debmetaindex.cc: - do not query each architecture for flat file archives + - fix typo preventing display of architecture in Info() [ Martin Pitt ] * debian/rules: -- cgit v1.2.3 From f7a35f2e813cff49470b4c4cb5b79cf6277f97d9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 11 Jul 2010 19:19:35 +0200 Subject: rename ReOwn to ReMap in the cacheiterators --- apt-pkg/cacheiterators.h | 4 ++-- apt-pkg/pkgcachegen.cc | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index eb8dee5e3..1dcc34532 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -75,8 +75,8 @@ template class pkgCache::Iterator : inline bool IsGood() const { return S && Owner && ! end();}; inline unsigned long Index() const {return S - OwnerPointer();}; - void ReOwn(pkgCache &newOwner, void const * const oldMap, void const * const newMap) { - if (S == 0) + void ReMap(void const * const oldMap, void const * const newMap) { + if (Owner == 0 || S == 0) return; S += (Str*)(newMap) - (Str*)(oldMap); } diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 38f2d6a2a..75f2ffe45 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -115,25 +115,25 @@ void pkgCacheGenerator::ReMap(void const * const oldMap, void const * const newM for (std::vector::const_iterator i = Dynamic::toReMap.begin(); i != Dynamic::toReMap.end(); ++i) - (*i)->ReOwn(Cache, oldMap, newMap); + (*i)->ReMap(oldMap, newMap); for (std::vector::const_iterator i = Dynamic::toReMap.begin(); i != Dynamic::toReMap.end(); ++i) - (*i)->ReOwn(Cache, oldMap, newMap); + (*i)->ReMap(oldMap, newMap); for (std::vector::const_iterator i = Dynamic::toReMap.begin(); i != Dynamic::toReMap.end(); ++i) - (*i)->ReOwn(Cache, oldMap, newMap); + (*i)->ReMap(oldMap, newMap); for (std::vector::const_iterator i = Dynamic::toReMap.begin(); i != Dynamic::toReMap.end(); ++i) - (*i)->ReOwn(Cache, oldMap, newMap); + (*i)->ReMap(oldMap, newMap); for (std::vector::const_iterator i = Dynamic::toReMap.begin(); i != Dynamic::toReMap.end(); ++i) - (*i)->ReOwn(Cache, oldMap, newMap); + (*i)->ReMap(oldMap, newMap); for (std::vector::const_iterator i = Dynamic::toReMap.begin(); i != Dynamic::toReMap.end(); ++i) - (*i)->ReOwn(Cache, oldMap, newMap); + (*i)->ReMap(oldMap, newMap); for (std::vector::const_iterator i = Dynamic::toReMap.begin(); i != Dynamic::toReMap.end(); ++i) - (*i)->ReOwn(Cache, oldMap, newMap); + (*i)->ReMap(oldMap, newMap); } /*}}}*/ // CacheGenerator::WriteStringInMap /*{{{*/ map_ptrloc pkgCacheGenerator::WriteStringInMap(const char *String, -- cgit v1.2.3 From f5eb830c02cb0724cb1d2e70f56cd508583aaf9a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 11 Jul 2010 19:44:14 +0200 Subject: mark all "Hash Sum mismatch" strings as translateable --- apt-pkg/acquire-item.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 020efdfaa..a289fb7ba 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1710,7 +1710,7 @@ void pkgAcqFile::Done(string Message,unsigned long Size,string CalcHash, if(!ExpectedHash.empty() && ExpectedHash.toStr() != CalcHash) { Status = StatError; - ErrorText = "Hash Sum mismatch"; + ErrorText = _("Hash Sum mismatch"); Rename(DestFile,DestFile + ".FAILED"); return; } -- cgit v1.2.3 From b09663668c4d8203543e56b25db822ba55d21529 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 11 Jul 2010 21:57:51 +0200 Subject: * methods/bzip2.cc: - add a copycat of the old gzip.cc as we need it for bzip2 and lzma --- debian/changelog | 4 +- methods/bzip2.cc | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ methods/makefile | 20 ++++--- 3 files changed, 191 insertions(+), 10 deletions(-) create mode 100644 methods/bzip2.cc diff --git a/debian/changelog b/debian/changelog index b0efc72e5..cfac23251 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ apt (0.7.26~exp10) UNRELEASED; urgency=low * apt-pkg/deb/debmetaindex.cc: - do not query each architecture for flat file archives - fix typo preventing display of architecture in Info() + * methods/bzip2.cc: + - add a copycat of the old gzip.cc as we need it for bzip2 and lzma [ Martin Pitt ] * debian/rules: @@ -43,7 +45,7 @@ apt (0.7.26~exp10) UNRELEASED; urgency=low Rewrite it to use FileFd directly, which makes the code a lot simpler, and also using less memory and overhead. - -- David Kalnischkies Sat, 10 Jul 2010 13:44:32 +0200 + -- David Kalnischkies Sun, 11 Jul 2010 21:56:36 +0200 apt (0.7.26~exp9) experimental; urgency=low diff --git a/methods/bzip2.cc b/methods/bzip2.cc new file mode 100644 index 000000000..5da214bfc --- /dev/null +++ b/methods/bzip2.cc @@ -0,0 +1,177 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +/* ###################################################################### + + Bzip2 method - Take a file URI in and decompress it into the target + file. + + While the method is named "bzip2" it handles also other compression + types as it calls binaries based on the name of the method, + so it can also be used to handle gzip, lzma and others if named + correctly. + + ##################################################################### */ + /*}}}*/ +// Include Files /*{{{*/ +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + /*}}}*/ + +const char *Prog; + +class Bzip2Method : public pkgAcqMethod +{ + virtual bool Fetch(FetchItem *Itm); + + public: + + Bzip2Method() : pkgAcqMethod("1.1",SingleInstance | SendConfig) {}; +}; + + +// Bzip2Method::Fetch - Decompress the passed URI /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool Bzip2Method::Fetch(FetchItem *Itm) +{ + URI Get = Itm->Uri; + string Path = Get.Host + Get.Path; // To account for relative paths + + string GzPathOption = "Dir::bin::"+string(Prog); + + FetchResult Res; + Res.Filename = Itm->DestFile; + URIStart(Res); + + // Open the source and destination files + FileFd From(Path,FileFd::ReadOnly); + + // if the file is empty, just rename it and return + if(From.Size() == 0) + { + rename(Path.c_str(), Itm->DestFile.c_str()); + return true; + } + + int GzOut[2]; + if (pipe(GzOut) < 0) + return _error->Errno("pipe",_("Couldn't open pipe for %s"),Prog); + + // Fork bzip2 + pid_t Process = ExecFork(); + if (Process == 0) + { + close(GzOut[0]); + dup2(From.Fd(),STDIN_FILENO); + dup2(GzOut[1],STDOUT_FILENO); + From.Close(); + close(GzOut[1]); + SetCloseExec(STDIN_FILENO,false); + SetCloseExec(STDOUT_FILENO,false); + + const char *Args[3]; + string Tmp = _config->Find(GzPathOption,Prog); + Args[0] = Tmp.c_str(); + Args[1] = "-d"; + Args[2] = 0; + execvp(Args[0],(char **)Args); + _exit(100); + } + From.Close(); + close(GzOut[1]); + + FileFd FromGz(GzOut[0]); // For autoclose + FileFd To(Itm->DestFile,FileFd::WriteEmpty); + To.EraseOnFailure(); + if (_error->PendingError() == true) + return false; + + // Read data from bzip2, generate checksums and write + Hashes Hash; + bool Failed = false; + while (1) + { + unsigned char Buffer[4*1024]; + unsigned long Count; + + Count = read(GzOut[0],Buffer,sizeof(Buffer)); + if (Count < 0 && errno == EINTR) + continue; + + if (Count < 0) + { + _error->Errno("read", _("Read error from %s process"),Prog); + Failed = true; + break; + } + + if (Count == 0) + break; + + Hash.Add(Buffer,Count); + if (To.Write(Buffer,Count) == false) + { + Failed = true; + FromGz.Close(); + break; + } + } + + // Wait for bzip2 to finish + if (ExecWait(Process,_config->Find(GzPathOption,Prog).c_str(),false) == false) + { + To.OpFail(); + return false; + } + + To.Close(); + + if (Failed == true) + return false; + + // Transfer the modification times + struct stat Buf; + if (stat(Path.c_str(),&Buf) != 0) + return _error->Errno("stat",_("Failed to stat")); + + struct utimbuf TimeBuf; + TimeBuf.actime = Buf.st_atime; + TimeBuf.modtime = Buf.st_mtime; + if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0) + return _error->Errno("utime",_("Failed to set modification time")); + + if (stat(Itm->DestFile.c_str(),&Buf) != 0) + return _error->Errno("stat",_("Failed to stat")); + + // Return a Done response + Res.LastModified = Buf.st_mtime; + Res.Size = Buf.st_size; + Res.TakeHashes(Hash); + + URIDone(Res); + + return true; +} + /*}}}*/ + +int main(int argc, char *argv[]) +{ + setlocale(LC_ALL, ""); + + Bzip2Method Mth; + + Prog = strrchr(argv[0],'/'); + Prog++; + + return Mth.Run(); +} diff --git a/methods/makefile b/methods/makefile index eabe85cfd..d94a85340 100644 --- a/methods/makefile +++ b/methods/makefile @@ -86,9 +86,16 @@ LIB_MAKES = apt-pkg/makefile SOURCE = mirror.cc http.cc rfc2553emu.cc connect.cc include $(PROGRAM_H) -# SSH and bzip2 method symlink -binary: $(BIN)/ssh $(BIN)/bzip2 $(BIN)/lzma -veryclean: clean-$(BIN)/ssh clean-$(BIN)/bzip2 clean-$(BIN)/lzma +# The gzip method +PROGRAM=bzip2 +SLIBS = -lapt-pkg $(INTLLIBS) +LIB_MAKES = apt-pkg/makefile +SOURCE = bzip2.cc +include $(PROGRAM_H) + +# SSH and lzma method symlink +binary: $(BIN)/ssh $(BIN)/lzma +veryclean: clean-$(BIN)/ssh clean-$(BIN)/lzma $(BIN)/ssh: echo "Installing ssh method link" @@ -96,13 +103,8 @@ $(BIN)/ssh: clean-$(BIN)/ssh: -rm $(BIN)/ssh -$(BIN)/bzip2: - echo "Installing bzip2 method link" - ln -fs gzip $(BIN)/bzip2 $(BIN)/lzma: echo "Installing lzma method link" - ln -fs gzip $(BIN)/lzma -clean-$(BIN)/bzip2: - -rm $(BIN)/bzip2 + ln -fs bzip2 $(BIN)/lzma clean-$(BIN)/lzma: -rm $(BIN)/lzma -- cgit v1.2.3 From d10cef824604012516f26efaae8bab1f29a7820a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 11 Jul 2010 23:07:58 +0200 Subject: accidently prefilling the vectors results in segfaults --- apt-pkg/pkgcachegen.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 75f2ffe45..c9a9a753c 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -36,7 +36,7 @@ #include /*}}}*/ typedef vector::iterator FileIterator; -template std::vector pkgCacheGenerator::Dynamic::toReMap(6); +template std::vector pkgCacheGenerator::Dynamic::toReMap; // CacheGenerator::pkgCacheGenerator - Constructor /*{{{*/ // --------------------------------------------------------------------- -- cgit v1.2.3 From d3814b27a7ba26236835180c37de72e6afbdffb2 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 14 Jul 2010 22:59:43 +0200 Subject: * apt-pkg/depcache.cc: - handle "circular" conflicts for "all" packages correctly --- apt-pkg/depcache.cc | 8 ++++---- debian/changelog | 8 ++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 05127fe18..bc663a8e9 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -338,7 +338,7 @@ bool pkgDepCache::CheckDep(DepIterator Dep,int Type,PkgIterator &Res) /* Check simple depends. A depends -should- never self match but we allow it anyhow because dpkg does. Technically it is a packaging bug. Conflicts may never self match */ - if (Dep.TargetPkg() != Dep.ParentPkg() || + if (Dep.TargetPkg()->Group != Dep.ParentPkg()->Group || (Dep->Type != Dep::Conflicts && Dep->Type != Dep::DpkgBreaks && Dep->Type != Dep::Obsoletes)) { PkgIterator Pkg = Dep.TargetPkg(); @@ -367,9 +367,9 @@ bool pkgDepCache::CheckDep(DepIterator Dep,int Type,PkgIterator &Res) PkgIterator Pkg = Dep.ParentPkg(); for (; P.end() != true; P++) { - /* Provides may never be applied against the same package if it is - a conflicts. See the comment above. */ - if (P.OwnerPkg() == Pkg && + /* Provides may never be applied against the same package (or group) + if it is a conflicts. See the comment above. */ + if (P.OwnerPkg()->Group == Pkg->Group && (Dep->Type == Dep::Conflicts || Dep->Type == Dep::DpkgBreaks)) continue; diff --git a/debian/changelog b/debian/changelog index 0f87ce60f..76354aad7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.26~exp11) experimental; urgency=low + + [ David Kalnischkies ] + * apt-pkg/depcache.cc: + - handle "circular" conflicts for "all" packages correctly + + -- David Kalnischkies Wed, 14 Jul 2010 22:58:08 +0200 + apt (0.7.26~exp10) experimental; urgency=low [ David Kalnischkies ] -- cgit v1.2.3 From fe1af091b871f9af715d729e515f2e3a62802c6f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 16 Jul 2010 17:42:54 +0200 Subject: * cmdline/apt-cache.cc: - be able to omit dependency types in (r)depends (Closes: #319006) --- cmdline/apt-cache.cc | 77 ++++++++++++++++++++++++++++++++++++++++++---------- debian/changelog | 2 ++ doc/apt-cache.8.xml | 14 ++++++++++ 3 files changed, 78 insertions(+), 15 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 338be7029..557996693 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -569,9 +569,18 @@ bool Depends(CommandLine &CmdL) for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) Colours[Pkg->ID] = 1; - bool Recurse = _config->FindB("APT::Cache::RecurseDepends",false); - bool Installed = _config->FindB("APT::Cache::Installed",false); - bool Important = _config->FindB("APT::Cache::Important",false); + bool const Recurse = _config->FindB("APT::Cache::RecurseDepends", false); + bool const Installed = _config->FindB("APT::Cache::Installed", false); + bool const Important = _config->FindB("APT::Cache::Important", false); + bool const ShowDepType = _config->FindB("APT::Cache::ShowDependencyType",true); + bool const ShowPreDepends = _config->FindB("APT::Cache::ShowPre-Depends", true); + bool const ShowDepends = _config->FindB("APT::Cache::ShowDepends", true); + bool const ShowRecommends = _config->FindB("APT::Cache::ShowRecommends", Important == false); + bool const ShowSuggests = _config->FindB("APT::Cache::ShowSuggests", Important == false); + bool const ShowReplaces = _config->FindB("APT::Cache::ShowReplaces", Important == false); + bool const ShowConflicts = _config->FindB("APT::Cache::ShowConflicts", Important == false); + bool const ShowBreaks = _config->FindB("APT::Cache::ShowBreaks", Important == false); + bool const ShowEnhances = _config->FindB("APT::Cache::ShowEnhances", Important == false); bool DidSomething; do { @@ -594,12 +603,17 @@ bool Depends(CommandLine &CmdL) for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; D++) { - // Important deps only - if (Important == true) - if (D->Type != pkgCache::Dep::PreDepends && - D->Type != pkgCache::Dep::Depends) - continue; - + switch (D->Type) { + case pkgCache::Dep::PreDepends: if (!ShowPreDepends) continue; break; + case pkgCache::Dep::Depends: if (!ShowDepends) continue; break; + case pkgCache::Dep::Recommends: if (!ShowRecommends) continue; break; + case pkgCache::Dep::Suggests: if (!ShowSuggests) continue; break; + case pkgCache::Dep::Replaces: if (!ShowReplaces) continue; break; + case pkgCache::Dep::Conflicts: if (!ShowConflicts) continue; break; + case pkgCache::Dep::DpkgBreaks: if (!ShowBreaks) continue; break; + case pkgCache::Dep::Enhances: if (!ShowEnhances) continue; break; + } + pkgCache::PkgIterator Trg = D.TargetPkg(); if((Installed && Trg->CurrentVer != 0) || !Installed) @@ -611,10 +625,12 @@ bool Depends(CommandLine &CmdL) cout << " "; // Show the package + if (ShowDepType == true) + cout << D.DepType() << ": "; if (Trg->VersionList == 0) - cout << D.DepType() << ": <" << Trg.FullName(true) << ">" << endl; + cout << "<" << Trg.FullName(true) << ">" << endl; else - cout << D.DepType() << ": " << Trg.FullName(true) << endl; + cout << Trg.FullName(true) << endl; if (Recurse == true) Colours[D.TargetPkg()->ID]++; @@ -660,8 +676,18 @@ bool RDepends(CommandLine &CmdL) for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) Colours[Pkg->ID] = 1; - bool Recurse = _config->FindB("APT::Cache::RecurseDepends",false); - bool Installed = _config->FindB("APT::Cache::Installed",false); + bool const Recurse = _config->FindB("APT::Cache::RecurseDepends",false); + bool const Installed = _config->FindB("APT::Cache::Installed",false); + bool const Important = _config->FindB("APT::Cache::Important", false); + bool const ShowDepType = _config->FindB("APT::Cache::ShowDependencyType",false); + bool const ShowPreDepends = _config->FindB("APT::Cache::ShowPre-Depends", true); + bool const ShowDepends = _config->FindB("APT::Cache::ShowDepends", true); + bool const ShowRecommends = _config->FindB("APT::Cache::ShowRecommends", Important == false); + bool const ShowSuggests = _config->FindB("APT::Cache::ShowSuggests", Important == false); + bool const ShowReplaces = _config->FindB("APT::Cache::ShowReplaces", Important == false); + bool const ShowConflicts = _config->FindB("APT::Cache::ShowConflicts", Important == false); + bool const ShowBreaks = _config->FindB("APT::Cache::ShowBreaks", Important == false); + bool const ShowEnhances = _config->FindB("APT::Cache::ShowEnhances", Important == false); bool DidSomething; do { @@ -684,7 +710,18 @@ bool RDepends(CommandLine &CmdL) cout << "Reverse Depends:" << endl; for (pkgCache::DepIterator D = Pkg.RevDependsList(); D.end() == false; D++) - { + { + switch (D->Type) { + case pkgCache::Dep::PreDepends: if (!ShowPreDepends) continue; break; + case pkgCache::Dep::Depends: if (!ShowDepends) continue; break; + case pkgCache::Dep::Recommends: if (!ShowRecommends) continue; break; + case pkgCache::Dep::Suggests: if (!ShowSuggests) continue; break; + case pkgCache::Dep::Replaces: if (!ShowReplaces) continue; break; + case pkgCache::Dep::Conflicts: if (!ShowConflicts) continue; break; + case pkgCache::Dep::DpkgBreaks: if (!ShowBreaks) continue; break; + case pkgCache::Dep::Enhances: if (!ShowEnhances) continue; break; + } + // Show the package pkgCache::PkgIterator Trg = D.ParentPkg(); @@ -696,8 +733,10 @@ bool RDepends(CommandLine &CmdL) else cout << " "; + if (ShowDepType == true) + cout << D.DepType() << ": "; if (Trg->VersionList == 0) - cout << D.DepType() << ": <" << Trg.FullName(true) << ">" << endl; + cout << "<" << Trg.FullName(true) << ">" << endl; else cout << Trg.FullName(true) << endl; @@ -1820,6 +1859,14 @@ int main(int argc,const char *argv[]) /*{{{*/ {'c',"config-file",0,CommandLine::ConfigFile}, {'o',"option",0,CommandLine::ArbItem}, {0,"installed","APT::Cache::Installed",0}, + {0,"pre-depends","APT::Cache::ShowPreDepends",0}, + {0,"depends","APT::Cache::ShowDepends",0}, + {0,"recommends","APT::Cache::ShowRecommends",0}, + {0,"suggests","APT::Cache::ShowSuggests",0}, + {0,"replaces","APT::Cache::ShowReplaces",0}, + {0,"breaks","APT::Cache::ShowBreaks",0}, + {0,"conflicts","APT::Cache::ShowConflicts",0}, + {0,"enhances","APT::Cache::ShowEnhances",0}, {0,0,0,0}}; CommandLine::Dispatch CmdsA[] = {{"help",&ShowHelp}, {"add",&DoAdd}, diff --git a/debian/changelog b/debian/changelog index 76354aad7..128309b51 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ apt (0.7.26~exp11) experimental; urgency=low [ David Kalnischkies ] * apt-pkg/depcache.cc: - handle "circular" conflicts for "all" packages correctly + * cmdline/apt-cache.cc: + - be able to omit dependency types in (r)depends (Closes: #319006) -- David Kalnischkies Wed, 14 Jul 2010 22:58:08 +0200 diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 538de3c27..9a63421a8 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -309,6 +309,20 @@ Reverse Provides: Configuration Item: APT::Cache::Important. + + + + + + + + + Per default the depends and + rdepends print all dependencies. This can be twicked with + these flags which will omit the specified dependency type. + Configuration Item: APT::Cache::ShowDependencyType + e.g. APT::Cache::ShowRecommends. + Print full package records when searching. Configuration Item: APT::Cache::ShowFull. -- cgit v1.2.3 From 9ba5aa3b01f1f7c08c74f5d0a21971db221d30f1 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 17 Jul 2010 19:07:00 +0200 Subject: factor regex package name matches into newly created cachefilter classes --- apt-pkg/cachefilter.cc | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ apt-pkg/cachefilter.h | 29 +++++++++++++++++++++++++++ apt-pkg/makefile | 5 +++-- cmdline/cacheset.cc | 18 +++++------------ 4 files changed, 91 insertions(+), 15 deletions(-) create mode 100644 apt-pkg/cachefilter.cc create mode 100644 apt-pkg/cachefilter.h diff --git a/apt-pkg/cachefilter.cc b/apt-pkg/cachefilter.cc new file mode 100644 index 000000000..8f0725ea3 --- /dev/null +++ b/apt-pkg/cachefilter.cc @@ -0,0 +1,54 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +/** \file cachefilter.h + Collection of functor classes */ + /*}}}*/ +// Include Files /*{{{*/ +#include +#include +#include + +#include + +#include + +#include + /*}}}*/ +namespace APT { +namespace CacheFilter { +PackageNameMatchesRegEx::PackageNameMatchesRegEx(std::string const &Pattern) {/*{{{*/ + pattern = new regex_t; + int const Res = regcomp(pattern, Pattern.c_str(), REG_EXTENDED | REG_ICASE | REG_NOSUB); + if (Res == 0) + return; + + delete pattern; + pattern = NULL; + char Error[300]; + regerror(Res, pattern, Error, sizeof(Error)); + _error->Error(_("Regex compilation error - %s"), Error); +} + /*}}}*/ +bool PackageNameMatchesRegEx::operator() (pkgCache::PkgIterator const &Pkg) {/*{{{*/ + if (unlikely(pattern == NULL)) + return false; + else + return regexec(pattern, Pkg.Name(), 0, 0, 0) == 0; +} + /*}}}*/ +bool PackageNameMatchesRegEx::operator() (pkgCache::GrpIterator const &Grp) {/*{{{*/ + if (unlikely(pattern == NULL)) + return false; + else + return regexec(pattern, Grp.Name(), 0, 0, 0) == 0; +} + /*}}}*/ +PackageNameMatchesRegEx::~PackageNameMatchesRegEx() { /*{{{*/ + if (pattern == NULL) + return; + regfree(pattern); + delete pattern; +} + /*}}}*/ +} +} diff --git a/apt-pkg/cachefilter.h b/apt-pkg/cachefilter.h new file mode 100644 index 000000000..e7ab1723f --- /dev/null +++ b/apt-pkg/cachefilter.h @@ -0,0 +1,29 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +/** \file cachefilter.h + Collection of functor classes */ + /*}}}*/ +#ifndef APT_CACHEFILTER_H +#define APT_CACHEFILTER_H +// Include Files /*{{{*/ +#include + +#include + +#include + /*}}}*/ +namespace APT { +namespace CacheFilter { +// PackageNameMatchesRegEx /*{{{*/ +class PackageNameMatchesRegEx { + regex_t* pattern; +public: + PackageNameMatchesRegEx(std::string const &Pattern); + bool operator() (pkgCache::PkgIterator const &Pkg); + bool operator() (pkgCache::GrpIterator const &Grp); + ~PackageNameMatchesRegEx(); +}; + /*}}}*/ +} +} +#endif diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 2a7958536..e9e5651b0 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -35,14 +35,15 @@ SOURCE+= pkgcache.cc version.cc depcache.cc \ srcrecords.cc cachefile.cc versionmatch.cc policy.cc \ pkgsystem.cc indexfile.cc pkgcachegen.cc acquire-item.cc \ indexrecords.cc vendor.cc vendorlist.cc cdrom.cc indexcopy.cc \ - aptconfiguration.cc + aptconfiguration.cc cachefilter.cc HEADERS+= algorithms.h depcache.h pkgcachegen.h cacheiterators.h \ orderlist.h sourcelist.h packagemanager.h tagfile.h \ init.h pkgcache.h version.h progress.h pkgrecords.h \ acquire.h acquire-worker.h acquire-item.h acquire-method.h \ clean.h srcrecords.h cachefile.h versionmatch.h policy.h \ pkgsystem.h indexfile.h metaindex.h indexrecords.h vendor.h \ - vendorlist.h cdrom.h indexcopy.h aptconfiguration.h + vendorlist.h cdrom.h indexcopy.h aptconfiguration.h \ + cachefilter.h # Source code for the debian specific components # In theory the deb headers do not need to be exported.. diff --git a/cmdline/cacheset.cc b/cmdline/cacheset.cc index 78c9d3f6c..0b099f442 100644 --- a/cmdline/cacheset.cc +++ b/cmdline/cacheset.cc @@ -10,6 +10,7 @@ /*}}}*/ // Include Files /*{{{*/ #include +#include #include #include #include @@ -97,22 +98,14 @@ PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, Cache arch = "native"; } - regex_t Pattern; - int Res; - if ((Res = regcomp(&Pattern, pattern.c_str() , REG_EXTENDED | REG_ICASE | REG_NOSUB)) != 0) { - char Error[300]; - regerror(Res, &Pattern, Error, sizeof(Error)); - _error->Error(_("Regex compilation error - %s"), Error); - return PackageSet(REGEX); - } - if (unlikely(Cache.GetPkgCache() == 0)) return PackageSet(REGEX); + APT::CacheFilter::PackageNameMatchesRegEx regexfilter(pattern); + PackageSet pkgset(REGEX); - for (pkgCache::GrpIterator Grp = Cache.GetPkgCache()->GrpBegin(); Grp.end() == false; ++Grp) - { - if (regexec(&Pattern, Grp.Name(), 0, 0, 0) != 0) + for (pkgCache::GrpIterator Grp = Cache.GetPkgCache()->GrpBegin(); Grp.end() == false; ++Grp) { + if (regexfilter(Grp) == false) continue; pkgCache::PkgIterator Pkg = Grp.FindPkg(arch); if (Pkg.end() == true) { @@ -128,7 +121,6 @@ PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, Cache pkgset.insert(Pkg); } - regfree(&Pattern); if (pkgset.empty() == true) return helper.canNotFindRegEx(Cache, pattern); -- cgit v1.2.3 From 8fde723961709118837153cdf94f150c680e10e9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 17 Jul 2010 20:04:44 +0200 Subject: * apt-pkg/cacheset.cc: - move them back to the library as they look stable now --- apt-pkg/cacheset.cc | 506 ++++++++++++++++++++++++++++++++++++++++++++++++++ apt-pkg/cacheset.h | 375 +++++++++++++++++++++++++++++++++++++ apt-pkg/makefile | 4 +- cmdline/apt-cache.cc | 3 +- cmdline/apt-get.cc | 2 +- cmdline/cacheset.cc | 507 --------------------------------------------------- cmdline/cacheset.h | 375 ------------------------------------- cmdline/makefile | 4 +- debian/changelog | 4 +- 9 files changed, 890 insertions(+), 890 deletions(-) create mode 100644 apt-pkg/cacheset.cc create mode 100644 apt-pkg/cacheset.h delete mode 100644 cmdline/cacheset.cc delete mode 100644 cmdline/cacheset.h diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc new file mode 100644 index 000000000..df7e99fd0 --- /dev/null +++ b/apt-pkg/cacheset.cc @@ -0,0 +1,506 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +/* ###################################################################### + + Simple wrapper around a std::set to provide a similar interface to + a set of cache structures as to the complete set of all structures + in the pkgCache. Currently only Package is supported. + + ##################################################################### */ + /*}}}*/ +// Include Files /*{{{*/ +#include +#include +#include +#include +#include +#include + +#include + +#include + +#include + /*}}}*/ +namespace APT { +// FromTask - Return all packages in the cache from a specific task /*{{{*/ +PackageSet PackageSet::FromTask(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) { + size_t const archfound = pattern.find_last_of(':'); + std::string arch = "native"; + if (archfound != std::string::npos) { + arch = pattern.substr(archfound+1); + pattern.erase(archfound); + } + + if (pattern[pattern.length() -1] != '^') + return APT::PackageSet(TASK); + pattern.erase(pattern.length()-1); + + if (unlikely(Cache.GetPkgCache() == 0 || Cache.GetDepCache() == 0)) + return APT::PackageSet(TASK); + + PackageSet pkgset(TASK); + // get the records + pkgRecords Recs(Cache); + + // build regexp for the task + regex_t Pattern; + char S[300]; + snprintf(S, sizeof(S), "^Task:.*[, ]%s([, ]|$)", pattern.c_str()); + if(regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE) != 0) { + _error->Error("Failed to compile task regexp"); + return pkgset; + } + + for (pkgCache::GrpIterator Grp = Cache->GrpBegin(); Grp.end() == false; ++Grp) { + pkgCache::PkgIterator Pkg = Grp.FindPkg(arch); + if (Pkg.end() == true) + continue; + pkgCache::VerIterator ver = Cache[Pkg].CandidateVerIter(Cache); + if(ver.end() == true) + continue; + + pkgRecords::Parser &parser = Recs.Lookup(ver.FileList()); + const char *start, *end; + parser.GetRec(start,end); + unsigned int const length = end - start; + char buf[length]; + strncpy(buf, start, length); + buf[length-1] = '\0'; + if (regexec(&Pattern, buf, 0, 0, 0) != 0) + continue; + + pkgset.insert(Pkg); + } + regfree(&Pattern); + + if (pkgset.empty() == true) + return helper.canNotFindTask(Cache, pattern); + + helper.showTaskSelection(pkgset, pattern); + return pkgset; +} + /*}}}*/ +// FromRegEx - Return all packages in the cache matching a pattern /*{{{*/ +PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) { + static const char * const isregex = ".?+*|[^$"; + if (pattern.find_first_of(isregex) == std::string::npos) + return PackageSet(REGEX); + + size_t archfound = pattern.find_last_of(':'); + std::string arch = "native"; + if (archfound != std::string::npos) { + arch = pattern.substr(archfound+1); + if (arch.find_first_of(isregex) == std::string::npos) + pattern.erase(archfound); + else + arch = "native"; + } + + if (unlikely(Cache.GetPkgCache() == 0)) + return PackageSet(REGEX); + + APT::CacheFilter::PackageNameMatchesRegEx regexfilter(pattern); + + PackageSet pkgset(REGEX); + for (pkgCache::GrpIterator Grp = Cache.GetPkgCache()->GrpBegin(); Grp.end() == false; ++Grp) { + if (regexfilter(Grp) == false) + continue; + pkgCache::PkgIterator Pkg = Grp.FindPkg(arch); + if (Pkg.end() == true) { + if (archfound == std::string::npos) { + std::vector archs = APT::Configuration::getArchitectures(); + for (std::vector::const_iterator a = archs.begin(); + a != archs.end() && Pkg.end() != true; ++a) + Pkg = Grp.FindPkg(*a); + } + if (Pkg.end() == true) + continue; + } + + pkgset.insert(Pkg); + } + + if (pkgset.empty() == true) + return helper.canNotFindRegEx(Cache, pattern); + + helper.showRegExSelection(pkgset, pattern); + return pkgset; +} + /*}}}*/ +// FromName - Returns the package defined by this string /*{{{*/ +pkgCache::PkgIterator PackageSet::FromName(pkgCacheFile &Cache, + std::string const &str, CacheSetHelper &helper) { + std::string pkg = str; + size_t archfound = pkg.find_last_of(':'); + std::string arch; + if (archfound != std::string::npos) { + arch = pkg.substr(archfound+1); + pkg.erase(archfound); + } + + if (Cache.GetPkgCache() == 0) + return pkgCache::PkgIterator(Cache, 0); + + pkgCache::PkgIterator Pkg(Cache, 0); + if (arch.empty() == true) { + pkgCache::GrpIterator Grp = Cache.GetPkgCache()->FindGrp(pkg); + if (Grp.end() == false) + Pkg = Grp.FindPreferredPkg(); + } else + Pkg = Cache.GetPkgCache()->FindPkg(pkg, arch); + + if (Pkg.end() == true) + return helper.canNotFindPkgName(Cache, str); + return Pkg; +} + /*}}}*/ +// GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ +std::map PackageSet::GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list const &mods, + unsigned short const &fallback, CacheSetHelper &helper) { + std::map pkgsets; + for (const char **I = cmdline; *I != 0; ++I) { + unsigned short modID = fallback; + std::string str = *I; + bool modifierPresent = false; + for (std::list::const_iterator mod = mods.begin(); + mod != mods.end(); ++mod) { + size_t const alength = strlen(mod->Alias); + switch(mod->Pos) { + case PackageSet::Modifier::POSTFIX: + if (str.compare(str.length() - alength, alength, + mod->Alias, 0, alength) != 0) + continue; + str.erase(str.length() - alength); + modID = mod->ID; + break; + case PackageSet::Modifier::PREFIX: + continue; + case PackageSet::Modifier::NONE: + continue; + } + modifierPresent = true; + break; + } + if (modifierPresent == true) { + bool const errors = helper.showErrors(false); + pkgCache::PkgIterator Pkg = FromName(Cache, *I, helper); + helper.showErrors(errors); + if (Pkg.end() == false) { + pkgsets[fallback].insert(Pkg); + continue; + } + } + pkgsets[modID].insert(PackageSet::FromString(Cache, str, helper)); + } + return pkgsets; +} + /*}}}*/ +// FromCommandLine - Return all packages specified on commandline /*{{{*/ +PackageSet PackageSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, CacheSetHelper &helper) { + PackageSet pkgset; + for (const char **I = cmdline; *I != 0; ++I) { + PackageSet pset = FromString(Cache, *I, helper); + pkgset.insert(pset.begin(), pset.end()); + } + return pkgset; +} + /*}}}*/ +// FromString - Return all packages matching a specific string /*{{{*/ +PackageSet PackageSet::FromString(pkgCacheFile &Cache, std::string const &str, CacheSetHelper &helper) { + _error->PushToStack(); + + PackageSet pkgset; + pkgCache::PkgIterator Pkg = FromName(Cache, str, helper); + if (Pkg.end() == false) + pkgset.insert(Pkg); + else { + pkgset = FromTask(Cache, str, helper); + if (pkgset.empty() == true) { + pkgset = FromRegEx(Cache, str, helper); + if (pkgset.empty() == true) + pkgset = helper.canNotFindPackage(Cache, str); + } + } + + if (pkgset.empty() == false) + _error->RevertToStack(); + else + _error->MergeWithStack(); + return pkgset; +} + /*}}}*/ +// GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ +std::map VersionSet::GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list const &mods, + unsigned short const &fallback, CacheSetHelper &helper) { + std::map versets; + for (const char **I = cmdline; *I != 0; ++I) { + unsigned short modID = fallback; + VersionSet::Version select = VersionSet::NEWEST; + std::string str = *I; + bool modifierPresent = false; + for (std::list::const_iterator mod = mods.begin(); + mod != mods.end(); ++mod) { + if (modID == fallback && mod->ID == fallback) + select = mod->SelectVersion; + size_t const alength = strlen(mod->Alias); + switch(mod->Pos) { + case VersionSet::Modifier::POSTFIX: + if (str.compare(str.length() - alength, alength, + mod->Alias, 0, alength) != 0) + continue; + str.erase(str.length() - alength); + modID = mod->ID; + select = mod->SelectVersion; + break; + case VersionSet::Modifier::PREFIX: + continue; + case VersionSet::Modifier::NONE: + continue; + } + modifierPresent = true; + break; + } + + if (modifierPresent == true) { + bool const errors = helper.showErrors(false); + VersionSet const vset = VersionSet::FromString(Cache, std::string(*I), select, helper, true); + helper.showErrors(errors); + if (vset.empty() == false) { + versets[fallback].insert(vset); + continue; + } + } + versets[modID].insert(VersionSet::FromString(Cache, str, select , helper)); + } + return versets; +} + /*}}}*/ +// FromCommandLine - Return all versions specified on commandline /*{{{*/ +APT::VersionSet VersionSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, + APT::VersionSet::Version const &fallback, CacheSetHelper &helper) { + VersionSet verset; + for (const char **I = cmdline; *I != 0; ++I) + verset.insert(VersionSet::FromString(Cache, *I, fallback, helper)); + return verset; +} + /*}}}*/ +// FromString - Returns all versions spedcified by a string /*{{{*/ +APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, + APT::VersionSet::Version const &fallback, CacheSetHelper &helper, + bool const &onlyFromName) { + std::string ver; + bool verIsRel = false; + size_t const vertag = pkg.find_last_of("/="); + if (vertag != string::npos) { + ver = pkg.substr(vertag+1); + verIsRel = (pkg[vertag] == '/'); + pkg.erase(vertag); + } + PackageSet pkgset; + if (onlyFromName == false) + pkgset = PackageSet::FromString(Cache, pkg, helper); + else { + pkgset.insert(PackageSet::FromName(Cache, pkg, helper)); + } + + VersionSet verset; + bool errors = true; + if (pkgset.getConstructor() != PackageSet::UNKNOWN) + errors = helper.showErrors(false); + for (PackageSet::const_iterator P = pkgset.begin(); + P != pkgset.end(); ++P) { + if (vertag == string::npos) { + verset.insert(VersionSet::FromPackage(Cache, P, fallback, helper)); + continue; + } + pkgCache::VerIterator V; + if (ver == "installed") + V = getInstalledVer(Cache, P, helper); + else if (ver == "candidate") + V = getCandidateVer(Cache, P, helper); + else { + pkgVersionMatch Match(ver, (verIsRel == true ? pkgVersionMatch::Release : + pkgVersionMatch::Version)); + V = Match.Find(P); + if (V.end() == true) { + if (verIsRel == true) + _error->Error(_("Release '%s' for '%s' was not found"), + ver.c_str(), P.FullName(true).c_str()); + else + _error->Error(_("Version '%s' for '%s' was not found"), + ver.c_str(), P.FullName(true).c_str()); + continue; + } + } + if (V.end() == true) + continue; + helper.showSelectedVersion(P, V, ver, verIsRel); + verset.insert(V); + } + if (pkgset.getConstructor() != PackageSet::UNKNOWN) + helper.showErrors(errors); + return verset; +} + /*}}}*/ +// FromPackage - versions from package based on fallback /*{{{*/ +VersionSet VersionSet::FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P, + VersionSet::Version const &fallback, CacheSetHelper &helper) { + VersionSet verset; + pkgCache::VerIterator V; + bool showErrors; + switch(fallback) { + case VersionSet::ALL: + if (P->VersionList != 0) + for (V = P.VersionList(); V.end() != true; ++V) + verset.insert(V); + else + verset.insert(helper.canNotFindAllVer(Cache, P)); + break; + case VersionSet::CANDANDINST: + verset.insert(getInstalledVer(Cache, P, helper)); + verset.insert(getCandidateVer(Cache, P, helper)); + break; + case VersionSet::CANDIDATE: + verset.insert(getCandidateVer(Cache, P, helper)); + break; + case VersionSet::INSTALLED: + verset.insert(getInstalledVer(Cache, P, helper)); + break; + case VersionSet::CANDINST: + showErrors = helper.showErrors(false); + V = getCandidateVer(Cache, P, helper); + if (V.end() == true) + V = getInstalledVer(Cache, P, helper); + helper.showErrors(showErrors); + if (V.end() == false) + verset.insert(V); + else + verset.insert(helper.canNotFindInstCandVer(Cache, P)); + break; + case VersionSet::INSTCAND: + showErrors = helper.showErrors(false); + V = getInstalledVer(Cache, P, helper); + if (V.end() == true) + V = getCandidateVer(Cache, P, helper); + helper.showErrors(showErrors); + if (V.end() == false) + verset.insert(V); + else + verset.insert(helper.canNotFindInstCandVer(Cache, P)); + break; + case VersionSet::NEWEST: + if (P->VersionList != 0) + verset.insert(P.VersionList()); + else + verset.insert(helper.canNotFindNewestVer(Cache, P)); + break; + } + return verset; +} + /*}}}*/ +// getCandidateVer - Returns the candidate version of the given package /*{{{*/ +pkgCache::VerIterator VersionSet::getCandidateVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper) { + pkgCache::VerIterator Cand; + if (Cache.IsPolicyBuilt() == true || Cache.IsDepCacheBuilt() == false) + { + if (unlikely(Cache.GetPolicy() == 0)) + return pkgCache::VerIterator(Cache); + Cand = Cache.GetPolicy()->GetCandidateVer(Pkg); + } else { + Cand = Cache[Pkg].CandidateVerIter(Cache); + } + if (Cand.end() == true) + return helper.canNotFindCandidateVer(Cache, Pkg); + return Cand; +} + /*}}}*/ +// getInstalledVer - Returns the installed version of the given package /*{{{*/ +pkgCache::VerIterator VersionSet::getInstalledVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper) { + if (Pkg->CurrentVer == 0) + return helper.canNotFindInstalledVer(Cache, Pkg); + return Pkg.CurrentVer(); +} + /*}}}*/ +// canNotFindPkgName - handle the case no package has this name /*{{{*/ +pkgCache::PkgIterator CacheSetHelper::canNotFindPkgName(pkgCacheFile &Cache, + std::string const &str) { + if (ShowError == true) + _error->Error(_("Unable to locate package %s"), str.c_str()); + return pkgCache::PkgIterator(Cache, 0); +} + /*}}}*/ +// canNotFindTask - handle the case no package is found for a task /*{{{*/ +PackageSet CacheSetHelper::canNotFindTask(pkgCacheFile &Cache, std::string pattern) { + if (ShowError == true) + _error->Error(_("Couldn't find task '%s'"), pattern.c_str()); + return PackageSet(); +} + /*}}}*/ +// canNotFindRegEx - handle the case no package is found by a regex /*{{{*/ +PackageSet CacheSetHelper::canNotFindRegEx(pkgCacheFile &Cache, std::string pattern) { + if (ShowError == true) + _error->Error(_("Couldn't find any package by regex '%s'"), pattern.c_str()); + return PackageSet(); +} + /*}}}*/ +// canNotFindPackage - handle the case no package is found from a string/*{{{*/ +PackageSet CacheSetHelper::canNotFindPackage(pkgCacheFile &Cache, std::string const &str) { + return PackageSet(); +} + /*}}}*/ +// canNotFindAllVer /*{{{*/ +VersionSet CacheSetHelper::canNotFindAllVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg) { + if (ShowError == true) + _error->Error(_("Can't select versions from package '%s' as it purely virtual"), Pkg.FullName(true).c_str()); + return VersionSet(); +} + /*}}}*/ +// canNotFindInstCandVer /*{{{*/ +VersionSet CacheSetHelper::canNotFindInstCandVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg) { + if (ShowError == true) + _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), Pkg.FullName(true).c_str()); + return VersionSet(); +} + /*}}}*/ +// canNotFindInstCandVer /*{{{*/ +VersionSet CacheSetHelper::canNotFindCandInstVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg) { + if (ShowError == true) + _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), Pkg.FullName(true).c_str()); + return VersionSet(); +} + /*}}}*/ +// canNotFindNewestVer /*{{{*/ +pkgCache::VerIterator CacheSetHelper::canNotFindNewestVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg) { + if (ShowError == true) + _error->Error(_("Can't select newest version from package '%s' as it is purely virtual"), Pkg.FullName(true).c_str()); + return pkgCache::VerIterator(Cache, 0); +} + /*}}}*/ +// canNotFindCandidateVer /*{{{*/ +pkgCache::VerIterator CacheSetHelper::canNotFindCandidateVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg) { + if (ShowError == true) + _error->Error(_("Can't select candidate version from package %s as it has no candidate"), Pkg.FullName(true).c_str()); + return pkgCache::VerIterator(Cache, 0); +} + /*}}}*/ +// canNotFindInstalledVer /*{{{*/ +pkgCache::VerIterator CacheSetHelper::canNotFindInstalledVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg) { + if (ShowError == true) + _error->Error(_("Can't select installed version from package %s as it is not installed"), Pkg.FullName(true).c_str()); + return pkgCache::VerIterator(Cache, 0); +} + /*}}}*/ +} diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h new file mode 100644 index 000000000..c8c3dd096 --- /dev/null +++ b/apt-pkg/cacheset.h @@ -0,0 +1,375 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +/** \file cacheset.h + Wrappers around std::set to have set::iterators which behave + similar to the Iterators of the cache structures. + + Provides also a few helper methods which work with these sets */ + /*}}}*/ +#ifndef APT_CACHESET_H +#define APT_CACHESET_H +// Include Files /*{{{*/ +#include +#include +#include +#include +#include +#include + +#include +#include + /*}}}*/ +namespace APT { +class PackageSet; +class VersionSet; +class CacheSetHelper { /*{{{*/ +/** \class APT::CacheSetHelper + Simple base class with a lot of virtual methods which can be overridden + to alter the behavior or the output of the CacheSets. + + This helper is passed around by the static methods in the CacheSets and + used every time they hit an error condition or something could be + printed out. +*/ +public: /*{{{*/ + CacheSetHelper(bool const &ShowError = true) : ShowError(ShowError) {}; + virtual ~CacheSetHelper() {}; + + virtual void showTaskSelection(PackageSet const &pkgset, string const &pattern) {}; + virtual void showRegExSelection(PackageSet const &pkgset, string const &pattern) {}; + virtual void showSelectedVersion(pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const Ver, + string const &ver, bool const &verIsRel) {}; + + virtual pkgCache::PkgIterator canNotFindPkgName(pkgCacheFile &Cache, std::string const &str); + virtual PackageSet canNotFindTask(pkgCacheFile &Cache, std::string pattern); + virtual PackageSet canNotFindRegEx(pkgCacheFile &Cache, std::string pattern); + virtual PackageSet canNotFindPackage(pkgCacheFile &Cache, std::string const &str); + virtual VersionSet canNotFindAllVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg); + virtual VersionSet canNotFindInstCandVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg); + virtual VersionSet canNotFindCandInstVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg); + virtual pkgCache::VerIterator canNotFindNewestVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg); + virtual pkgCache::VerIterator canNotFindCandidateVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg); + virtual pkgCache::VerIterator canNotFindInstalledVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg); + + bool showErrors() const { return ShowError; }; + bool showErrors(bool const &newValue) { if (ShowError == newValue) return ShowError; else return ((ShowError = newValue) == false); }; + /*}}}*/ +protected: + bool ShowError; +}; /*}}}*/ +class PackageSet : public std::set { /*{{{*/ +/** \class APT::PackageSet + + Simple wrapper around a std::set to provide a similar interface to + a set of packages as to the complete set of all packages in the + pkgCache. */ +public: /*{{{*/ + /** \brief smell like a pkgCache::PkgIterator */ + class const_iterator : public std::set::const_iterator {/*{{{*/ + public: + const_iterator(std::set::const_iterator x) : + std::set::const_iterator(x) {} + + operator pkgCache::PkgIterator(void) { return **this; } + + inline const char *Name() const {return (**this).Name(); } + inline std::string FullName(bool const &Pretty) const { return (**this).FullName(Pretty); } + inline std::string FullName() const { return (**this).FullName(); } + inline const char *Section() const {return (**this).Section(); } + inline bool Purge() const {return (**this).Purge(); } + inline const char *Arch() const {return (**this).Arch(); } + inline pkgCache::GrpIterator Group() const { return (**this).Group(); } + inline pkgCache::VerIterator VersionList() const { return (**this).VersionList(); } + inline pkgCache::VerIterator CurrentVer() const { return (**this).CurrentVer(); } + inline pkgCache::DepIterator RevDependsList() const { return (**this).RevDependsList(); } + inline pkgCache::PrvIterator ProvidesList() const { return (**this).ProvidesList(); } + inline pkgCache::PkgIterator::OkState State() const { return (**this).State(); } + inline const char *CandVersion() const { return (**this).CandVersion(); } + inline const char *CurVersion() const { return (**this).CurVersion(); } + inline pkgCache *Cache() const { return (**this).Cache(); }; + inline unsigned long Index() const {return (**this).Index();}; + // we have only valid iterators here + inline bool end() const { return false; }; + + friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, (*i)); } + + inline pkgCache::Package const * operator->() const { + return &***this; + }; + }; + // 103. set::iterator is required to be modifiable, but this allows modification of keys + typedef APT::PackageSet::const_iterator iterator; + /*}}}*/ + + using std::set::insert; + inline void insert(pkgCache::PkgIterator const &P) { if (P.end() == false) std::set::insert(P); }; + inline void insert(PackageSet const &pkgset) { insert(pkgset.begin(), pkgset.end()); }; + + /** \brief returns all packages in the cache who belong to the given task + + A simple helper responsible for search for all members of a task + in the cache. Optional it prints a a notice about the + packages chosen cause of the given task. + \param Cache the packages are in + \param pattern name of the task + \param helper responsible for error and message handling */ + static APT::PackageSet FromTask(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper); + static APT::PackageSet FromTask(pkgCacheFile &Cache, std::string const &pattern) { + CacheSetHelper helper; + return APT::PackageSet::FromTask(Cache, pattern, helper); + } + + /** \brief returns all packages in the cache whose name matchs a given pattern + + A simple helper responsible for executing a regular expression on all + package names in the cache. Optional it prints a a notice about the + packages chosen cause of the given package. + \param Cache the packages are in + \param pattern regular expression for package names + \param helper responsible for error and message handling */ + static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper); + static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string const &pattern) { + CacheSetHelper helper; + return APT::PackageSet::FromRegEx(Cache, pattern, helper); + } + + /** \brief returns all packages specified by a string + + \param Cache the packages are in + \param string String the package name(s) should be extracted from + \param helper responsible for error and message handling */ + static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string, CacheSetHelper &helper); + static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string) { + CacheSetHelper helper; + return APT::PackageSet::FromString(Cache, string, helper); + } + + /** \brief returns a package specified by a string + + \param Cache the package is in + \param string String the package name should be extracted from + \param helper responsible for error and message handling */ + static pkgCache::PkgIterator FromName(pkgCacheFile &Cache, std::string const &string, CacheSetHelper &helper); + static pkgCache::PkgIterator FromName(pkgCacheFile &Cache, std::string const &string) { + CacheSetHelper helper; + return APT::PackageSet::FromName(Cache, string, helper); + } + + /** \brief returns all packages specified on the commandline + + Get all package names from the commandline and executes regex's if needed. + No special package command is supported, just plain names. + \param Cache the packages are in + \param cmdline Command line the package names should be extracted from + \param helper responsible for error and message handling */ + static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, CacheSetHelper &helper); + static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { + CacheSetHelper helper; + return APT::PackageSet::FromCommandLine(Cache, cmdline, helper); + } + + struct Modifier { + enum Position { NONE, PREFIX, POSTFIX }; + unsigned short ID; + const char * const Alias; + Position Pos; + Modifier (unsigned short const &id, const char * const alias, Position const &pos) : ID(id), Alias(alias), Pos(pos) {}; + }; + + /** \brief group packages by a action modifiers + + At some point it is needed to get from the same commandline + different package sets grouped by a modifier. Take + apt-get install apt awesome- + as an example. + \param Cache the packages are in + \param cmdline Command line the package names should be extracted from + \param mods list of modifiers the method should accept + \param fallback the default modifier group for a package + \param helper responsible for error and message handling */ + static std::map GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list const &mods, + unsigned short const &fallback, CacheSetHelper &helper); + static std::map GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list const &mods, + unsigned short const &fallback) { + CacheSetHelper helper; + return APT::PackageSet::GroupedFromCommandLine(Cache, cmdline, + mods, fallback, helper); + } + + enum Constructor { UNKNOWN, REGEX, TASK }; + Constructor getConstructor() const { return ConstructedBy; }; + + PackageSet() : ConstructedBy(UNKNOWN) {}; + PackageSet(Constructor const &by) : ConstructedBy(by) {}; + /*}}}*/ +private: /*{{{*/ + Constructor ConstructedBy; + /*}}}*/ +}; /*}}}*/ +class VersionSet : public std::set { /*{{{*/ +/** \class APT::VersionSet + + Simple wrapper around a std::set to provide a similar interface to + a set of versions as to the complete set of all versions in the + pkgCache. */ +public: /*{{{*/ + /** \brief smell like a pkgCache::VerIterator */ + class const_iterator : public std::set::const_iterator {/*{{{*/ + public: + const_iterator(std::set::const_iterator x) : + std::set::const_iterator(x) {} + + operator pkgCache::VerIterator(void) { return **this; } + + inline pkgCache *Cache() const { return (**this).Cache(); }; + inline unsigned long Index() const {return (**this).Index();}; + // we have only valid iterators here + inline bool end() const { return false; }; + + inline pkgCache::Version const * operator->() const { + return &***this; + }; + + inline int CompareVer(const pkgCache::VerIterator &B) const { return (**this).CompareVer(B); }; + inline const char *VerStr() const { return (**this).VerStr(); }; + inline const char *Section() const { return (**this).Section(); }; + inline const char *Arch() const { return (**this).Arch(); }; + inline const char *Arch(bool const pseudo) const { return (**this).Arch(pseudo); }; + inline pkgCache::PkgIterator ParentPkg() const { return (**this).ParentPkg(); }; + inline pkgCache::DescIterator DescriptionList() const { return (**this).DescriptionList(); }; + inline pkgCache::DescIterator TranslatedDescription() const { return (**this).TranslatedDescription(); }; + inline pkgCache::DepIterator DependsList() const { return (**this).DependsList(); }; + inline pkgCache::PrvIterator ProvidesList() const { return (**this).ProvidesList(); }; + inline pkgCache::VerFileIterator FileList() const { return (**this).FileList(); }; + inline bool Downloadable() const { return (**this).Downloadable(); }; + inline const char *PriorityType() const { return (**this).PriorityType(); }; + inline string RelStr() const { return (**this).RelStr(); }; + inline bool Automatic() const { return (**this).Automatic(); }; + inline bool Pseudo() const { return (**this).Pseudo(); }; + inline pkgCache::VerFileIterator NewestFile() const { return (**this).NewestFile(); }; + }; + /*}}}*/ + // 103. set::iterator is required to be modifiable, but this allows modification of keys + typedef APT::VersionSet::const_iterator iterator; + + using std::set::insert; + inline void insert(pkgCache::VerIterator const &V) { if (V.end() == false) std::set::insert(V); }; + inline void insert(VersionSet const &verset) { insert(verset.begin(), verset.end()); }; + + /** \brief specifies which version(s) will be returned if non is given */ + enum Version { + /** All versions */ + ALL, + /** Candidate and installed version */ + CANDANDINST, + /** Candidate version */ + CANDIDATE, + /** Installed version */ + INSTALLED, + /** Candidate or if non installed version */ + CANDINST, + /** Installed or if non candidate version */ + INSTCAND, + /** Newest version */ + NEWEST + }; + + /** \brief returns all versions specified on the commandline + + Get all versions from the commandline, uses given default version if + non specifically requested and executes regex's if needed on names. + \param Cache the packages and versions are in + \param cmdline Command line the versions should be extracted from + \param helper responsible for error and message handling */ + static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, + APT::VersionSet::Version const &fallback, CacheSetHelper &helper); + static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, + APT::VersionSet::Version const &fallback) { + CacheSetHelper helper; + return APT::VersionSet::FromCommandLine(Cache, cmdline, fallback, helper); + } + static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { + return APT::VersionSet::FromCommandLine(Cache, cmdline, CANDINST); + } + + static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg, + APT::VersionSet::Version const &fallback, CacheSetHelper &helper, + bool const &onlyFromName = false); + static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg, + APT::VersionSet::Version const &fallback) { + CacheSetHelper helper; + return APT::VersionSet::FromString(Cache, pkg, fallback, helper); + } + static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg) { + return APT::VersionSet::FromString(Cache, pkg, CANDINST); + } + + /** \brief returns all versions specified for the package + + \param Cache the package and versions are in + \param P the package in question + \param fallback the version(s) you want to get + \param helper the helper used for display and error handling */ + static APT::VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P, + VersionSet::Version const &fallback, CacheSetHelper &helper); + static APT::VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P, + APT::VersionSet::Version const &fallback) { + CacheSetHelper helper; + return APT::VersionSet::FromPackage(Cache, P, fallback, helper); + } + static APT::VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P) { + return APT::VersionSet::FromPackage(Cache, P, CANDINST); + } + + struct Modifier { + enum Position { NONE, PREFIX, POSTFIX }; + unsigned short ID; + const char * const Alias; + Position Pos; + VersionSet::Version SelectVersion; + Modifier (unsigned short const &id, const char * const alias, Position const &pos, + VersionSet::Version const &select) : ID(id), Alias(alias), Pos(pos), + SelectVersion(select) {}; + }; + + static std::map GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list const &mods, + unsigned short const &fallback, CacheSetHelper &helper); + static std::map GroupedFromCommandLine( + pkgCacheFile &Cache, const char **cmdline, + std::list const &mods, + unsigned short const &fallback) { + CacheSetHelper helper; + return APT::VersionSet::GroupedFromCommandLine(Cache, cmdline, + mods, fallback, helper); + } + /*}}}*/ +protected: /*{{{*/ + + /** \brief returns the candidate version of the package + + \param Cache to be used to query for information + \param Pkg we want the candidate version from this package */ + static pkgCache::VerIterator getCandidateVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper); + + /** \brief returns the installed version of the package + + \param Cache to be used to query for information + \param Pkg we want the installed version from this package */ + static pkgCache::VerIterator getInstalledVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper); + /*}}}*/ +}; /*}}}*/ +} +#endif diff --git a/apt-pkg/makefile b/apt-pkg/makefile index e9e5651b0..4e5ec107f 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -35,7 +35,7 @@ SOURCE+= pkgcache.cc version.cc depcache.cc \ srcrecords.cc cachefile.cc versionmatch.cc policy.cc \ pkgsystem.cc indexfile.cc pkgcachegen.cc acquire-item.cc \ indexrecords.cc vendor.cc vendorlist.cc cdrom.cc indexcopy.cc \ - aptconfiguration.cc cachefilter.cc + aptconfiguration.cc cachefilter.cc cacheset.cc HEADERS+= algorithms.h depcache.h pkgcachegen.h cacheiterators.h \ orderlist.h sourcelist.h packagemanager.h tagfile.h \ init.h pkgcache.h version.h progress.h pkgrecords.h \ @@ -43,7 +43,7 @@ HEADERS+= algorithms.h depcache.h pkgcachegen.h cacheiterators.h \ clean.h srcrecords.h cachefile.h versionmatch.h policy.h \ pkgsystem.h indexfile.h metaindex.h indexrecords.h vendor.h \ vendorlist.h cdrom.h indexcopy.h aptconfiguration.h \ - cachefilter.h + cachefilter.h cacheset.h # Source code for the debian specific components # In theory the deb headers do not need to be exported.. diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 557996693..1a1ddcb8c 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -30,8 +31,6 @@ #include #include -#include "cacheset.h" - #include #include diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 7cf760c27..eaa982856 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -45,7 +46,6 @@ #include #include "acqprogress.h" -#include "cacheset.h" #include #include diff --git a/cmdline/cacheset.cc b/cmdline/cacheset.cc deleted file mode 100644 index 0b099f442..000000000 --- a/cmdline/cacheset.cc +++ /dev/null @@ -1,507 +0,0 @@ -// -*- mode: cpp; mode: fold -*- -// Description /*{{{*/ -/* ###################################################################### - - Simple wrapper around a std::set to provide a similar interface to - a set of cache structures as to the complete set of all structures - in the pkgCache. Currently only Package is supported. - - ##################################################################### */ - /*}}}*/ -// Include Files /*{{{*/ -#include -#include -#include -#include -#include - -#include - -#include "cacheset.h" - -#include - -#include - /*}}}*/ -namespace APT { -// FromTask - Return all packages in the cache from a specific task /*{{{*/ -PackageSet PackageSet::FromTask(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) { - size_t const archfound = pattern.find_last_of(':'); - std::string arch = "native"; - if (archfound != std::string::npos) { - arch = pattern.substr(archfound+1); - pattern.erase(archfound); - } - - if (pattern[pattern.length() -1] != '^') - return APT::PackageSet(TASK); - pattern.erase(pattern.length()-1); - - if (unlikely(Cache.GetPkgCache() == 0 || Cache.GetDepCache() == 0)) - return APT::PackageSet(TASK); - - PackageSet pkgset(TASK); - // get the records - pkgRecords Recs(Cache); - - // build regexp for the task - regex_t Pattern; - char S[300]; - snprintf(S, sizeof(S), "^Task:.*[, ]%s([, ]|$)", pattern.c_str()); - if(regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE) != 0) { - _error->Error("Failed to compile task regexp"); - return pkgset; - } - - for (pkgCache::GrpIterator Grp = Cache->GrpBegin(); Grp.end() == false; ++Grp) { - pkgCache::PkgIterator Pkg = Grp.FindPkg(arch); - if (Pkg.end() == true) - continue; - pkgCache::VerIterator ver = Cache[Pkg].CandidateVerIter(Cache); - if(ver.end() == true) - continue; - - pkgRecords::Parser &parser = Recs.Lookup(ver.FileList()); - const char *start, *end; - parser.GetRec(start,end); - unsigned int const length = end - start; - char buf[length]; - strncpy(buf, start, length); - buf[length-1] = '\0'; - if (regexec(&Pattern, buf, 0, 0, 0) != 0) - continue; - - pkgset.insert(Pkg); - } - regfree(&Pattern); - - if (pkgset.empty() == true) - return helper.canNotFindTask(Cache, pattern); - - helper.showTaskSelection(pkgset, pattern); - return pkgset; -} - /*}}}*/ -// FromRegEx - Return all packages in the cache matching a pattern /*{{{*/ -PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) { - static const char * const isregex = ".?+*|[^$"; - if (pattern.find_first_of(isregex) == std::string::npos) - return PackageSet(REGEX); - - size_t archfound = pattern.find_last_of(':'); - std::string arch = "native"; - if (archfound != std::string::npos) { - arch = pattern.substr(archfound+1); - if (arch.find_first_of(isregex) == std::string::npos) - pattern.erase(archfound); - else - arch = "native"; - } - - if (unlikely(Cache.GetPkgCache() == 0)) - return PackageSet(REGEX); - - APT::CacheFilter::PackageNameMatchesRegEx regexfilter(pattern); - - PackageSet pkgset(REGEX); - for (pkgCache::GrpIterator Grp = Cache.GetPkgCache()->GrpBegin(); Grp.end() == false; ++Grp) { - if (regexfilter(Grp) == false) - continue; - pkgCache::PkgIterator Pkg = Grp.FindPkg(arch); - if (Pkg.end() == true) { - if (archfound == std::string::npos) { - std::vector archs = APT::Configuration::getArchitectures(); - for (std::vector::const_iterator a = archs.begin(); - a != archs.end() && Pkg.end() != true; ++a) - Pkg = Grp.FindPkg(*a); - } - if (Pkg.end() == true) - continue; - } - - pkgset.insert(Pkg); - } - - if (pkgset.empty() == true) - return helper.canNotFindRegEx(Cache, pattern); - - helper.showRegExSelection(pkgset, pattern); - return pkgset; -} - /*}}}*/ -// FromName - Returns the package defined by this string /*{{{*/ -pkgCache::PkgIterator PackageSet::FromName(pkgCacheFile &Cache, - std::string const &str, CacheSetHelper &helper) { - std::string pkg = str; - size_t archfound = pkg.find_last_of(':'); - std::string arch; - if (archfound != std::string::npos) { - arch = pkg.substr(archfound+1); - pkg.erase(archfound); - } - - if (Cache.GetPkgCache() == 0) - return pkgCache::PkgIterator(Cache, 0); - - pkgCache::PkgIterator Pkg(Cache, 0); - if (arch.empty() == true) { - pkgCache::GrpIterator Grp = Cache.GetPkgCache()->FindGrp(pkg); - if (Grp.end() == false) - Pkg = Grp.FindPreferredPkg(); - } else - Pkg = Cache.GetPkgCache()->FindPkg(pkg, arch); - - if (Pkg.end() == true) - return helper.canNotFindPkgName(Cache, str); - return Pkg; -} - /*}}}*/ -// GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ -std::map PackageSet::GroupedFromCommandLine( - pkgCacheFile &Cache, const char **cmdline, - std::list const &mods, - unsigned short const &fallback, CacheSetHelper &helper) { - std::map pkgsets; - for (const char **I = cmdline; *I != 0; ++I) { - unsigned short modID = fallback; - std::string str = *I; - bool modifierPresent = false; - for (std::list::const_iterator mod = mods.begin(); - mod != mods.end(); ++mod) { - size_t const alength = strlen(mod->Alias); - switch(mod->Pos) { - case PackageSet::Modifier::POSTFIX: - if (str.compare(str.length() - alength, alength, - mod->Alias, 0, alength) != 0) - continue; - str.erase(str.length() - alength); - modID = mod->ID; - break; - case PackageSet::Modifier::PREFIX: - continue; - case PackageSet::Modifier::NONE: - continue; - } - modifierPresent = true; - break; - } - if (modifierPresent == true) { - bool const errors = helper.showErrors(false); - pkgCache::PkgIterator Pkg = FromName(Cache, *I, helper); - helper.showErrors(errors); - if (Pkg.end() == false) { - pkgsets[fallback].insert(Pkg); - continue; - } - } - pkgsets[modID].insert(PackageSet::FromString(Cache, str, helper)); - } - return pkgsets; -} - /*}}}*/ -// FromCommandLine - Return all packages specified on commandline /*{{{*/ -PackageSet PackageSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, CacheSetHelper &helper) { - PackageSet pkgset; - for (const char **I = cmdline; *I != 0; ++I) { - PackageSet pset = FromString(Cache, *I, helper); - pkgset.insert(pset.begin(), pset.end()); - } - return pkgset; -} - /*}}}*/ -// FromString - Return all packages matching a specific string /*{{{*/ -PackageSet PackageSet::FromString(pkgCacheFile &Cache, std::string const &str, CacheSetHelper &helper) { - _error->PushToStack(); - - PackageSet pkgset; - pkgCache::PkgIterator Pkg = FromName(Cache, str, helper); - if (Pkg.end() == false) - pkgset.insert(Pkg); - else { - pkgset = FromTask(Cache, str, helper); - if (pkgset.empty() == true) { - pkgset = FromRegEx(Cache, str, helper); - if (pkgset.empty() == true) - pkgset = helper.canNotFindPackage(Cache, str); - } - } - - if (pkgset.empty() == false) - _error->RevertToStack(); - else - _error->MergeWithStack(); - return pkgset; -} - /*}}}*/ -// GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ -std::map VersionSet::GroupedFromCommandLine( - pkgCacheFile &Cache, const char **cmdline, - std::list const &mods, - unsigned short const &fallback, CacheSetHelper &helper) { - std::map versets; - for (const char **I = cmdline; *I != 0; ++I) { - unsigned short modID = fallback; - VersionSet::Version select = VersionSet::NEWEST; - std::string str = *I; - bool modifierPresent = false; - for (std::list::const_iterator mod = mods.begin(); - mod != mods.end(); ++mod) { - if (modID == fallback && mod->ID == fallback) - select = mod->SelectVersion; - size_t const alength = strlen(mod->Alias); - switch(mod->Pos) { - case VersionSet::Modifier::POSTFIX: - if (str.compare(str.length() - alength, alength, - mod->Alias, 0, alength) != 0) - continue; - str.erase(str.length() - alength); - modID = mod->ID; - select = mod->SelectVersion; - break; - case VersionSet::Modifier::PREFIX: - continue; - case VersionSet::Modifier::NONE: - continue; - } - modifierPresent = true; - break; - } - - if (modifierPresent == true) { - bool const errors = helper.showErrors(false); - VersionSet const vset = VersionSet::FromString(Cache, std::string(*I), select, helper, true); - helper.showErrors(errors); - if (vset.empty() == false) { - versets[fallback].insert(vset); - continue; - } - } - versets[modID].insert(VersionSet::FromString(Cache, str, select , helper)); - } - return versets; -} - /*}}}*/ -// FromCommandLine - Return all versions specified on commandline /*{{{*/ -APT::VersionSet VersionSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, - APT::VersionSet::Version const &fallback, CacheSetHelper &helper) { - VersionSet verset; - for (const char **I = cmdline; *I != 0; ++I) - verset.insert(VersionSet::FromString(Cache, *I, fallback, helper)); - return verset; -} - /*}}}*/ -// FromString - Returns all versions spedcified by a string /*{{{*/ -APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, - APT::VersionSet::Version const &fallback, CacheSetHelper &helper, - bool const &onlyFromName) { - std::string ver; - bool verIsRel = false; - size_t const vertag = pkg.find_last_of("/="); - if (vertag != string::npos) { - ver = pkg.substr(vertag+1); - verIsRel = (pkg[vertag] == '/'); - pkg.erase(vertag); - } - PackageSet pkgset; - if (onlyFromName == false) - pkgset = PackageSet::FromString(Cache, pkg, helper); - else { - pkgset.insert(PackageSet::FromName(Cache, pkg, helper)); - } - - VersionSet verset; - bool errors = true; - if (pkgset.getConstructor() != PackageSet::UNKNOWN) - errors = helper.showErrors(false); - for (PackageSet::const_iterator P = pkgset.begin(); - P != pkgset.end(); ++P) { - if (vertag == string::npos) { - verset.insert(VersionSet::FromPackage(Cache, P, fallback, helper)); - continue; - } - pkgCache::VerIterator V; - if (ver == "installed") - V = getInstalledVer(Cache, P, helper); - else if (ver == "candidate") - V = getCandidateVer(Cache, P, helper); - else { - pkgVersionMatch Match(ver, (verIsRel == true ? pkgVersionMatch::Release : - pkgVersionMatch::Version)); - V = Match.Find(P); - if (V.end() == true) { - if (verIsRel == true) - _error->Error(_("Release '%s' for '%s' was not found"), - ver.c_str(), P.FullName(true).c_str()); - else - _error->Error(_("Version '%s' for '%s' was not found"), - ver.c_str(), P.FullName(true).c_str()); - continue; - } - } - if (V.end() == true) - continue; - helper.showSelectedVersion(P, V, ver, verIsRel); - verset.insert(V); - } - if (pkgset.getConstructor() != PackageSet::UNKNOWN) - helper.showErrors(errors); - return verset; -} - /*}}}*/ -// FromPackage - versions from package based on fallback /*{{{*/ -VersionSet VersionSet::FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P, - VersionSet::Version const &fallback, CacheSetHelper &helper) { - VersionSet verset; - pkgCache::VerIterator V; - bool showErrors; - switch(fallback) { - case VersionSet::ALL: - if (P->VersionList != 0) - for (V = P.VersionList(); V.end() != true; ++V) - verset.insert(V); - else - verset.insert(helper.canNotFindAllVer(Cache, P)); - break; - case VersionSet::CANDANDINST: - verset.insert(getInstalledVer(Cache, P, helper)); - verset.insert(getCandidateVer(Cache, P, helper)); - break; - case VersionSet::CANDIDATE: - verset.insert(getCandidateVer(Cache, P, helper)); - break; - case VersionSet::INSTALLED: - verset.insert(getInstalledVer(Cache, P, helper)); - break; - case VersionSet::CANDINST: - showErrors = helper.showErrors(false); - V = getCandidateVer(Cache, P, helper); - if (V.end() == true) - V = getInstalledVer(Cache, P, helper); - helper.showErrors(showErrors); - if (V.end() == false) - verset.insert(V); - else - verset.insert(helper.canNotFindInstCandVer(Cache, P)); - break; - case VersionSet::INSTCAND: - showErrors = helper.showErrors(false); - V = getInstalledVer(Cache, P, helper); - if (V.end() == true) - V = getCandidateVer(Cache, P, helper); - helper.showErrors(showErrors); - if (V.end() == false) - verset.insert(V); - else - verset.insert(helper.canNotFindInstCandVer(Cache, P)); - break; - case VersionSet::NEWEST: - if (P->VersionList != 0) - verset.insert(P.VersionList()); - else - verset.insert(helper.canNotFindNewestVer(Cache, P)); - break; - } - return verset; -} - /*}}}*/ -// getCandidateVer - Returns the candidate version of the given package /*{{{*/ -pkgCache::VerIterator VersionSet::getCandidateVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper) { - pkgCache::VerIterator Cand; - if (Cache.IsPolicyBuilt() == true || Cache.IsDepCacheBuilt() == false) - { - if (unlikely(Cache.GetPolicy() == 0)) - return pkgCache::VerIterator(Cache); - Cand = Cache.GetPolicy()->GetCandidateVer(Pkg); - } else { - Cand = Cache[Pkg].CandidateVerIter(Cache); - } - if (Cand.end() == true) - return helper.canNotFindCandidateVer(Cache, Pkg); - return Cand; -} - /*}}}*/ -// getInstalledVer - Returns the installed version of the given package /*{{{*/ -pkgCache::VerIterator VersionSet::getInstalledVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper) { - if (Pkg->CurrentVer == 0) - return helper.canNotFindInstalledVer(Cache, Pkg); - return Pkg.CurrentVer(); -} - /*}}}*/ -// canNotFindPkgName - handle the case no package has this name /*{{{*/ -pkgCache::PkgIterator CacheSetHelper::canNotFindPkgName(pkgCacheFile &Cache, - std::string const &str) { - if (ShowError == true) - _error->Error(_("Unable to locate package %s"), str.c_str()); - return pkgCache::PkgIterator(Cache, 0); -} - /*}}}*/ -// canNotFindTask - handle the case no package is found for a task /*{{{*/ -PackageSet CacheSetHelper::canNotFindTask(pkgCacheFile &Cache, std::string pattern) { - if (ShowError == true) - _error->Error(_("Couldn't find task '%s'"), pattern.c_str()); - return PackageSet(); -} - /*}}}*/ -// canNotFindRegEx - handle the case no package is found by a regex /*{{{*/ -PackageSet CacheSetHelper::canNotFindRegEx(pkgCacheFile &Cache, std::string pattern) { - if (ShowError == true) - _error->Error(_("Couldn't find any package by regex '%s'"), pattern.c_str()); - return PackageSet(); -} - /*}}}*/ -// canNotFindPackage - handle the case no package is found from a string/*{{{*/ -PackageSet CacheSetHelper::canNotFindPackage(pkgCacheFile &Cache, std::string const &str) { - return PackageSet(); -} - /*}}}*/ -// canNotFindAllVer /*{{{*/ -VersionSet CacheSetHelper::canNotFindAllVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg) { - if (ShowError == true) - _error->Error(_("Can't select versions from package '%s' as it purely virtual"), Pkg.FullName(true).c_str()); - return VersionSet(); -} - /*}}}*/ -// canNotFindInstCandVer /*{{{*/ -VersionSet CacheSetHelper::canNotFindInstCandVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg) { - if (ShowError == true) - _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), Pkg.FullName(true).c_str()); - return VersionSet(); -} - /*}}}*/ -// canNotFindInstCandVer /*{{{*/ -VersionSet CacheSetHelper::canNotFindCandInstVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg) { - if (ShowError == true) - _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), Pkg.FullName(true).c_str()); - return VersionSet(); -} - /*}}}*/ -// canNotFindNewestVer /*{{{*/ -pkgCache::VerIterator CacheSetHelper::canNotFindNewestVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg) { - if (ShowError == true) - _error->Error(_("Can't select newest version from package '%s' as it is purely virtual"), Pkg.FullName(true).c_str()); - return pkgCache::VerIterator(Cache, 0); -} - /*}}}*/ -// canNotFindCandidateVer /*{{{*/ -pkgCache::VerIterator CacheSetHelper::canNotFindCandidateVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg) { - if (ShowError == true) - _error->Error(_("Can't select candidate version from package %s as it has no candidate"), Pkg.FullName(true).c_str()); - return pkgCache::VerIterator(Cache, 0); -} - /*}}}*/ -// canNotFindInstalledVer /*{{{*/ -pkgCache::VerIterator CacheSetHelper::canNotFindInstalledVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg) { - if (ShowError == true) - _error->Error(_("Can't select installed version from package %s as it is not installed"), Pkg.FullName(true).c_str()); - return pkgCache::VerIterator(Cache, 0); -} - /*}}}*/ -} diff --git a/cmdline/cacheset.h b/cmdline/cacheset.h deleted file mode 100644 index c8c3dd096..000000000 --- a/cmdline/cacheset.h +++ /dev/null @@ -1,375 +0,0 @@ -// -*- mode: cpp; mode: fold -*- -// Description /*{{{*/ -/** \file cacheset.h - Wrappers around std::set to have set::iterators which behave - similar to the Iterators of the cache structures. - - Provides also a few helper methods which work with these sets */ - /*}}}*/ -#ifndef APT_CACHESET_H -#define APT_CACHESET_H -// Include Files /*{{{*/ -#include -#include -#include -#include -#include -#include - -#include -#include - /*}}}*/ -namespace APT { -class PackageSet; -class VersionSet; -class CacheSetHelper { /*{{{*/ -/** \class APT::CacheSetHelper - Simple base class with a lot of virtual methods which can be overridden - to alter the behavior or the output of the CacheSets. - - This helper is passed around by the static methods in the CacheSets and - used every time they hit an error condition or something could be - printed out. -*/ -public: /*{{{*/ - CacheSetHelper(bool const &ShowError = true) : ShowError(ShowError) {}; - virtual ~CacheSetHelper() {}; - - virtual void showTaskSelection(PackageSet const &pkgset, string const &pattern) {}; - virtual void showRegExSelection(PackageSet const &pkgset, string const &pattern) {}; - virtual void showSelectedVersion(pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const Ver, - string const &ver, bool const &verIsRel) {}; - - virtual pkgCache::PkgIterator canNotFindPkgName(pkgCacheFile &Cache, std::string const &str); - virtual PackageSet canNotFindTask(pkgCacheFile &Cache, std::string pattern); - virtual PackageSet canNotFindRegEx(pkgCacheFile &Cache, std::string pattern); - virtual PackageSet canNotFindPackage(pkgCacheFile &Cache, std::string const &str); - virtual VersionSet canNotFindAllVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg); - virtual VersionSet canNotFindInstCandVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg); - virtual VersionSet canNotFindCandInstVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg); - virtual pkgCache::VerIterator canNotFindNewestVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg); - virtual pkgCache::VerIterator canNotFindCandidateVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg); - virtual pkgCache::VerIterator canNotFindInstalledVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg); - - bool showErrors() const { return ShowError; }; - bool showErrors(bool const &newValue) { if (ShowError == newValue) return ShowError; else return ((ShowError = newValue) == false); }; - /*}}}*/ -protected: - bool ShowError; -}; /*}}}*/ -class PackageSet : public std::set { /*{{{*/ -/** \class APT::PackageSet - - Simple wrapper around a std::set to provide a similar interface to - a set of packages as to the complete set of all packages in the - pkgCache. */ -public: /*{{{*/ - /** \brief smell like a pkgCache::PkgIterator */ - class const_iterator : public std::set::const_iterator {/*{{{*/ - public: - const_iterator(std::set::const_iterator x) : - std::set::const_iterator(x) {} - - operator pkgCache::PkgIterator(void) { return **this; } - - inline const char *Name() const {return (**this).Name(); } - inline std::string FullName(bool const &Pretty) const { return (**this).FullName(Pretty); } - inline std::string FullName() const { return (**this).FullName(); } - inline const char *Section() const {return (**this).Section(); } - inline bool Purge() const {return (**this).Purge(); } - inline const char *Arch() const {return (**this).Arch(); } - inline pkgCache::GrpIterator Group() const { return (**this).Group(); } - inline pkgCache::VerIterator VersionList() const { return (**this).VersionList(); } - inline pkgCache::VerIterator CurrentVer() const { return (**this).CurrentVer(); } - inline pkgCache::DepIterator RevDependsList() const { return (**this).RevDependsList(); } - inline pkgCache::PrvIterator ProvidesList() const { return (**this).ProvidesList(); } - inline pkgCache::PkgIterator::OkState State() const { return (**this).State(); } - inline const char *CandVersion() const { return (**this).CandVersion(); } - inline const char *CurVersion() const { return (**this).CurVersion(); } - inline pkgCache *Cache() const { return (**this).Cache(); }; - inline unsigned long Index() const {return (**this).Index();}; - // we have only valid iterators here - inline bool end() const { return false; }; - - friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, (*i)); } - - inline pkgCache::Package const * operator->() const { - return &***this; - }; - }; - // 103. set::iterator is required to be modifiable, but this allows modification of keys - typedef APT::PackageSet::const_iterator iterator; - /*}}}*/ - - using std::set::insert; - inline void insert(pkgCache::PkgIterator const &P) { if (P.end() == false) std::set::insert(P); }; - inline void insert(PackageSet const &pkgset) { insert(pkgset.begin(), pkgset.end()); }; - - /** \brief returns all packages in the cache who belong to the given task - - A simple helper responsible for search for all members of a task - in the cache. Optional it prints a a notice about the - packages chosen cause of the given task. - \param Cache the packages are in - \param pattern name of the task - \param helper responsible for error and message handling */ - static APT::PackageSet FromTask(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper); - static APT::PackageSet FromTask(pkgCacheFile &Cache, std::string const &pattern) { - CacheSetHelper helper; - return APT::PackageSet::FromTask(Cache, pattern, helper); - } - - /** \brief returns all packages in the cache whose name matchs a given pattern - - A simple helper responsible for executing a regular expression on all - package names in the cache. Optional it prints a a notice about the - packages chosen cause of the given package. - \param Cache the packages are in - \param pattern regular expression for package names - \param helper responsible for error and message handling */ - static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper); - static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string const &pattern) { - CacheSetHelper helper; - return APT::PackageSet::FromRegEx(Cache, pattern, helper); - } - - /** \brief returns all packages specified by a string - - \param Cache the packages are in - \param string String the package name(s) should be extracted from - \param helper responsible for error and message handling */ - static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string, CacheSetHelper &helper); - static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string) { - CacheSetHelper helper; - return APT::PackageSet::FromString(Cache, string, helper); - } - - /** \brief returns a package specified by a string - - \param Cache the package is in - \param string String the package name should be extracted from - \param helper responsible for error and message handling */ - static pkgCache::PkgIterator FromName(pkgCacheFile &Cache, std::string const &string, CacheSetHelper &helper); - static pkgCache::PkgIterator FromName(pkgCacheFile &Cache, std::string const &string) { - CacheSetHelper helper; - return APT::PackageSet::FromName(Cache, string, helper); - } - - /** \brief returns all packages specified on the commandline - - Get all package names from the commandline and executes regex's if needed. - No special package command is supported, just plain names. - \param Cache the packages are in - \param cmdline Command line the package names should be extracted from - \param helper responsible for error and message handling */ - static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, CacheSetHelper &helper); - static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { - CacheSetHelper helper; - return APT::PackageSet::FromCommandLine(Cache, cmdline, helper); - } - - struct Modifier { - enum Position { NONE, PREFIX, POSTFIX }; - unsigned short ID; - const char * const Alias; - Position Pos; - Modifier (unsigned short const &id, const char * const alias, Position const &pos) : ID(id), Alias(alias), Pos(pos) {}; - }; - - /** \brief group packages by a action modifiers - - At some point it is needed to get from the same commandline - different package sets grouped by a modifier. Take - apt-get install apt awesome- - as an example. - \param Cache the packages are in - \param cmdline Command line the package names should be extracted from - \param mods list of modifiers the method should accept - \param fallback the default modifier group for a package - \param helper responsible for error and message handling */ - static std::map GroupedFromCommandLine( - pkgCacheFile &Cache, const char **cmdline, - std::list const &mods, - unsigned short const &fallback, CacheSetHelper &helper); - static std::map GroupedFromCommandLine( - pkgCacheFile &Cache, const char **cmdline, - std::list const &mods, - unsigned short const &fallback) { - CacheSetHelper helper; - return APT::PackageSet::GroupedFromCommandLine(Cache, cmdline, - mods, fallback, helper); - } - - enum Constructor { UNKNOWN, REGEX, TASK }; - Constructor getConstructor() const { return ConstructedBy; }; - - PackageSet() : ConstructedBy(UNKNOWN) {}; - PackageSet(Constructor const &by) : ConstructedBy(by) {}; - /*}}}*/ -private: /*{{{*/ - Constructor ConstructedBy; - /*}}}*/ -}; /*}}}*/ -class VersionSet : public std::set { /*{{{*/ -/** \class APT::VersionSet - - Simple wrapper around a std::set to provide a similar interface to - a set of versions as to the complete set of all versions in the - pkgCache. */ -public: /*{{{*/ - /** \brief smell like a pkgCache::VerIterator */ - class const_iterator : public std::set::const_iterator {/*{{{*/ - public: - const_iterator(std::set::const_iterator x) : - std::set::const_iterator(x) {} - - operator pkgCache::VerIterator(void) { return **this; } - - inline pkgCache *Cache() const { return (**this).Cache(); }; - inline unsigned long Index() const {return (**this).Index();}; - // we have only valid iterators here - inline bool end() const { return false; }; - - inline pkgCache::Version const * operator->() const { - return &***this; - }; - - inline int CompareVer(const pkgCache::VerIterator &B) const { return (**this).CompareVer(B); }; - inline const char *VerStr() const { return (**this).VerStr(); }; - inline const char *Section() const { return (**this).Section(); }; - inline const char *Arch() const { return (**this).Arch(); }; - inline const char *Arch(bool const pseudo) const { return (**this).Arch(pseudo); }; - inline pkgCache::PkgIterator ParentPkg() const { return (**this).ParentPkg(); }; - inline pkgCache::DescIterator DescriptionList() const { return (**this).DescriptionList(); }; - inline pkgCache::DescIterator TranslatedDescription() const { return (**this).TranslatedDescription(); }; - inline pkgCache::DepIterator DependsList() const { return (**this).DependsList(); }; - inline pkgCache::PrvIterator ProvidesList() const { return (**this).ProvidesList(); }; - inline pkgCache::VerFileIterator FileList() const { return (**this).FileList(); }; - inline bool Downloadable() const { return (**this).Downloadable(); }; - inline const char *PriorityType() const { return (**this).PriorityType(); }; - inline string RelStr() const { return (**this).RelStr(); }; - inline bool Automatic() const { return (**this).Automatic(); }; - inline bool Pseudo() const { return (**this).Pseudo(); }; - inline pkgCache::VerFileIterator NewestFile() const { return (**this).NewestFile(); }; - }; - /*}}}*/ - // 103. set::iterator is required to be modifiable, but this allows modification of keys - typedef APT::VersionSet::const_iterator iterator; - - using std::set::insert; - inline void insert(pkgCache::VerIterator const &V) { if (V.end() == false) std::set::insert(V); }; - inline void insert(VersionSet const &verset) { insert(verset.begin(), verset.end()); }; - - /** \brief specifies which version(s) will be returned if non is given */ - enum Version { - /** All versions */ - ALL, - /** Candidate and installed version */ - CANDANDINST, - /** Candidate version */ - CANDIDATE, - /** Installed version */ - INSTALLED, - /** Candidate or if non installed version */ - CANDINST, - /** Installed or if non candidate version */ - INSTCAND, - /** Newest version */ - NEWEST - }; - - /** \brief returns all versions specified on the commandline - - Get all versions from the commandline, uses given default version if - non specifically requested and executes regex's if needed on names. - \param Cache the packages and versions are in - \param cmdline Command line the versions should be extracted from - \param helper responsible for error and message handling */ - static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, - APT::VersionSet::Version const &fallback, CacheSetHelper &helper); - static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, - APT::VersionSet::Version const &fallback) { - CacheSetHelper helper; - return APT::VersionSet::FromCommandLine(Cache, cmdline, fallback, helper); - } - static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { - return APT::VersionSet::FromCommandLine(Cache, cmdline, CANDINST); - } - - static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg, - APT::VersionSet::Version const &fallback, CacheSetHelper &helper, - bool const &onlyFromName = false); - static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg, - APT::VersionSet::Version const &fallback) { - CacheSetHelper helper; - return APT::VersionSet::FromString(Cache, pkg, fallback, helper); - } - static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg) { - return APT::VersionSet::FromString(Cache, pkg, CANDINST); - } - - /** \brief returns all versions specified for the package - - \param Cache the package and versions are in - \param P the package in question - \param fallback the version(s) you want to get - \param helper the helper used for display and error handling */ - static APT::VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P, - VersionSet::Version const &fallback, CacheSetHelper &helper); - static APT::VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P, - APT::VersionSet::Version const &fallback) { - CacheSetHelper helper; - return APT::VersionSet::FromPackage(Cache, P, fallback, helper); - } - static APT::VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P) { - return APT::VersionSet::FromPackage(Cache, P, CANDINST); - } - - struct Modifier { - enum Position { NONE, PREFIX, POSTFIX }; - unsigned short ID; - const char * const Alias; - Position Pos; - VersionSet::Version SelectVersion; - Modifier (unsigned short const &id, const char * const alias, Position const &pos, - VersionSet::Version const &select) : ID(id), Alias(alias), Pos(pos), - SelectVersion(select) {}; - }; - - static std::map GroupedFromCommandLine( - pkgCacheFile &Cache, const char **cmdline, - std::list const &mods, - unsigned short const &fallback, CacheSetHelper &helper); - static std::map GroupedFromCommandLine( - pkgCacheFile &Cache, const char **cmdline, - std::list const &mods, - unsigned short const &fallback) { - CacheSetHelper helper; - return APT::VersionSet::GroupedFromCommandLine(Cache, cmdline, - mods, fallback, helper); - } - /*}}}*/ -protected: /*{{{*/ - - /** \brief returns the candidate version of the package - - \param Cache to be used to query for information - \param Pkg we want the candidate version from this package */ - static pkgCache::VerIterator getCandidateVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper); - - /** \brief returns the installed version of the package - - \param Cache to be used to query for information - \param Pkg we want the installed version from this package */ - static pkgCache::VerIterator getInstalledVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper); - /*}}}*/ -}; /*}}}*/ -} -#endif diff --git a/cmdline/makefile b/cmdline/makefile index 4ffe49ee0..917ccc96a 100644 --- a/cmdline/makefile +++ b/cmdline/makefile @@ -9,14 +9,14 @@ include ../buildlib/defaults.mak PROGRAM=apt-cache SLIBS = -lapt-pkg $(INTLLIBS) LIB_MAKES = apt-pkg/makefile -SOURCE = apt-cache.cc cacheset.cc +SOURCE = apt-cache.cc include $(PROGRAM_H) # The apt-get program PROGRAM=apt-get SLIBS = -lapt-pkg -lutil $(INTLLIBS) LIB_MAKES = apt-pkg/makefile -SOURCE = apt-get.cc acqprogress.cc cacheset.cc +SOURCE = apt-get.cc acqprogress.cc include $(PROGRAM_H) # The apt-config program diff --git a/debian/changelog b/debian/changelog index 128309b51..04829715c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,10 @@ apt (0.7.26~exp11) experimental; urgency=low - handle "circular" conflicts for "all" packages correctly * cmdline/apt-cache.cc: - be able to omit dependency types in (r)depends (Closes: #319006) + * apt-pkg/cacheset.cc: + - move them back to the library as they look stable now - -- David Kalnischkies Wed, 14 Jul 2010 22:58:08 +0200 + -- David Kalnischkies Sat, 17 Jul 2010 19:56:47 +0200 apt (0.7.26~exp10) experimental; urgency=low -- cgit v1.2.3 From 621e918e5e57675580ee5cb9bb4775d106814be4 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Wed, 21 Jul 2010 17:14:53 +0200 Subject: * apt-pkg/deb/dpkgpm.cc: - Write architecture information to history file. --- apt-pkg/deb/dpkgpm.cc | 10 +++++----- debian/changelog | 7 +++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 67291063c..2945e9750 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -675,17 +675,17 @@ bool pkgDPkgPM::OpenLog() for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) { if (Cache[I].NewInstall()) - install += I.Name() + string(" (") + Cache[I].CandVersion + string("), "); + install += I.FullName(false) + string(" (") + Cache[I].CandVersion + string("), "); else if (Cache[I].Upgrade()) - upgrade += I.Name() + string(" (") + Cache[I].CurVersion + string(", ") + Cache[I].CandVersion + string("), "); + upgrade += I.FullName(false) + string(" (") + Cache[I].CurVersion + string(", ") + Cache[I].CandVersion + string("), "); else if (Cache[I].Downgrade()) - downgrade += I.Name() + string(" (") + Cache[I].CurVersion + string(", ") + Cache[I].CandVersion + string("), "); + downgrade += I.FullName(false) + string(" (") + Cache[I].CurVersion + string(", ") + Cache[I].CandVersion + string("), "); else if (Cache[I].Delete()) { if ((Cache[I].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge) - purge += I.Name() + string(" (") + Cache[I].CurVersion + string("), "); + purge += I.FullName(false) + string(" (") + Cache[I].CurVersion + string("), "); else - remove += I.Name() + string(" (") + Cache[I].CurVersion + string("), "); + remove += I.FullName(false) + string(" (") + Cache[I].CurVersion + string("), "); } } if (_config->Exists("Commandline::AsString") == true) diff --git a/debian/changelog b/debian/changelog index 0f87ce60f..efd98de73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.26~exp11) experimental; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - Write architecture information to history file. + + -- Julian Andres Klode Wed, 21 Jul 2010 17:09:11 +0200 + apt (0.7.26~exp10) experimental; urgency=low [ David Kalnischkies ] -- cgit v1.2.3 From 6bf8f0d198f00dcbb46dba97840681fa2227177a Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Wed, 21 Jul 2010 17:19:16 +0200 Subject: Add to history whether a change was automatic or not. --- apt-pkg/deb/dpkgpm.cc | 7 ++++++- debian/changelog | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 2945e9750..aa0b04bd5 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -675,7 +675,12 @@ bool pkgDPkgPM::OpenLog() for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) { if (Cache[I].NewInstall()) - install += I.FullName(false) + string(" (") + Cache[I].CandVersion + string("), "); + { + install += I.FullName(false) + string(" (") + Cache[I].CandVersion; + if (Cache[I].Flags & pkgCache::Flag::Auto) + install+= ", automatic"; + install += string("), "); + } else if (Cache[I].Upgrade()) upgrade += I.FullName(false) + string(" (") + Cache[I].CurVersion + string(", ") + Cache[I].CandVersion + string("), "); else if (Cache[I].Downgrade()) diff --git a/debian/changelog b/debian/changelog index efd98de73..311833192 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ apt (0.7.26~exp11) experimental; urgency=low * apt-pkg/deb/dpkgpm.cc: - Write architecture information to history file. + - Add to history whether a change was automatic or not. -- Julian Andres Klode Wed, 21 Jul 2010 17:09:11 +0200 -- cgit v1.2.3 From 144c096976b2ce05fe64e5761c0df5854f6c0c09 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Fri, 23 Jul 2010 16:13:15 +0200 Subject: * apt-pkg/contrib/fileutl.cc: - Add FileFd::OpenDescriptor() (needed for python-apt's #383617). --- apt-pkg/contrib/fileutl.cc | 18 ++++++++++++++++++ apt-pkg/contrib/fileutl.h | 4 ++++ debian/changelog | 2 ++ 3 files changed, 24 insertions(+) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 49b2f3828..2a3b8a87d 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -700,6 +700,24 @@ bool FileFd::Open(string FileName,OpenMode Mode, unsigned long Perms) SetCloseExec(iFd,true); return true; } + +bool FileFd::OpenDescriptor(int Fd, OpenMode Mode, bool AutoClose) +{ + Close(); + Flags = (AutoClose) ? FileFd::AutoClose : 0; + iFd = Fd; + if (Mode == ReadOnlyGzip) { + gz = gzdopen (iFd, "r"); + if (gz == NULL) { + if (AutoClose) + close (iFd); + return _error->Errno("gzdopen",_("Could not open file descriptor %d"), + Fd); + } + } + this->FileName = ""; + return true; +} /*}}}*/ // FileFd::~File - Closes the file /*{{{*/ // --------------------------------------------------------------------- diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 0f70ab722..62705478d 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -28,6 +28,9 @@ #include +/* Define this for python-apt */ +#define APT_HAS_GZIP 1 + using std::string; class FileFd @@ -60,6 +63,7 @@ class FileFd unsigned long Tell(); unsigned long Size(); bool Open(string FileName,OpenMode Mode,unsigned long Perms = 0666); + bool OpenDescriptor(int Fd, OpenMode Mode, bool AutoClose=false); bool Close(); bool Sync(); diff --git a/debian/changelog b/debian/changelog index 311833192..06454cd5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ apt (0.7.26~exp11) experimental; urgency=low * apt-pkg/deb/dpkgpm.cc: - Write architecture information to history file. - Add to history whether a change was automatic or not. + * apt-pkg/contrib/fileutl.cc: + - Add FileFd::OpenDescriptor() (needed for python-apt's #383617). -- Julian Andres Klode Wed, 21 Jul 2010 17:09:11 +0200 -- cgit v1.2.3 From 3db58cf41785f1e0b7046bbe7f3ef5e545c9a658 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 25 Jul 2010 08:24:03 +0200 Subject: * apt-pkg/pkgcache.cc: - prefer non-virtual packages in FindPreferredPkg --- apt-pkg/cacheiterators.h | 7 +++++-- apt-pkg/pkgcache.cc | 8 +++++--- debian/changelog | 4 +++- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 1dcc34532..0be9368bd 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -115,8 +115,11 @@ class pkgCache::GrpIterator: public Iterator { /** \brief find the package with the "best" architecture The best architecture is either the "native" or the first - in the list of Architectures which is not an end-Pointer */ - PkgIterator FindPreferredPkg() const; + in the list of Architectures which is not an end-Pointer + + \param PreferNonVirtual tries to respond with a non-virtual package + and only if this fails returns the best virtual package */ + PkgIterator FindPreferredPkg(bool const &PreferNonVirtual = true) const; PkgIterator NextPkg(PkgIterator const &Pkg) const; // Constructors diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 8af8ef7de..9e1f8b633 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -349,19 +349,21 @@ pkgCache::PkgIterator pkgCache::GrpIterator::FindPkg(string Arch) const { // GrpIterator::FindPreferredPkg - Locate the "best" package /*{{{*/ // --------------------------------------------------------------------- /* Returns an End-Pointer on error, pointer to the package otherwise */ -pkgCache::PkgIterator pkgCache::GrpIterator::FindPreferredPkg() const { +pkgCache::PkgIterator pkgCache::GrpIterator::FindPreferredPkg(bool const &PreferNonVirtual) const { pkgCache::PkgIterator Pkg = FindPkg("native"); - if (Pkg.end() == false) + if (Pkg.end() == false && (PreferNonVirtual == false || Pkg->VersionList != 0)) return Pkg; std::vector const archs = APT::Configuration::getArchitectures(); for (std::vector::const_iterator a = archs.begin(); a != archs.end(); ++a) { Pkg = FindPkg(*a); - if (Pkg.end() == false) + if (Pkg.end() == false && (PreferNonVirtual == false || Pkg->VersionList != 0)) return Pkg; } + if (PreferNonVirtual == true) + return FindPreferredPkg(false); return PkgIterator(*Owner, 0); } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 04829715c..aff194e1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,10 @@ apt (0.7.26~exp11) experimental; urgency=low - be able to omit dependency types in (r)depends (Closes: #319006) * apt-pkg/cacheset.cc: - move them back to the library as they look stable now + * apt-pkg/pkgcache.cc: + - prefer non-virtual packages in FindPreferredPkg - -- David Kalnischkies Sat, 17 Jul 2010 19:56:47 +0200 + -- David Kalnischkies Sun, 25 Jul 2010 08:20:41 +0200 apt (0.7.26~exp10) experimental; urgency=low -- cgit v1.2.3 From 8d87641558a7e0ee53b03e325614532aa686e01b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 25 Jul 2010 19:51:53 +0200 Subject: - prefer non-virtual packages in FindPreferredPkg (Closes: #590041) * test/integration/*: - add with bug#590041 testcase a small test "framework" --- debian/changelog | 6 +- test/integration/framework | 170 +++++++++++++++++++++ test/integration/run-tests | 8 + .../test-bug-590041-prefer-non-virtual-packages | 51 +++++++ 4 files changed, 233 insertions(+), 2 deletions(-) create mode 100644 test/integration/framework create mode 100755 test/integration/run-tests create mode 100755 test/integration/test-bug-590041-prefer-non-virtual-packages diff --git a/debian/changelog b/debian/changelog index aff194e1c..1aa05adcb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,9 +8,11 @@ apt (0.7.26~exp11) experimental; urgency=low * apt-pkg/cacheset.cc: - move them back to the library as they look stable now * apt-pkg/pkgcache.cc: - - prefer non-virtual packages in FindPreferredPkg + - prefer non-virtual packages in FindPreferredPkg (Closes: #590041) + * test/integration/*: + - add with bug#590041 testcase a small test "framework" - -- David Kalnischkies Sun, 25 Jul 2010 08:20:41 +0200 + -- David Kalnischkies Sun, 25 Jul 2010 19:37:45 +0200 apt (0.7.26~exp10) experimental; urgency=low diff --git a/test/integration/framework b/test/integration/framework new file mode 100644 index 000000000..97dce1e19 --- /dev/null +++ b/test/integration/framework @@ -0,0 +1,170 @@ +#!/bin/sh -- # no runable script, just for vi + +# we all like colorful messages +CERROR="" # red +CWARNING="" # yellow +CMSG="" # green +CINFO="" # light blue +CDEBUG="" # blue +CNORMAL="" # default system console color +CDONE="" # green +CPASS="" # green +CFAIL="" # red +CCMD="" # pink + +msgdie() { echo "${CERROR}E: $1${CNORMAL}" >&2; exit 1; } +msgwarn() { echo "${CWARNING}W: $1${CNORMAL}" >&2; } +msgmsg() { echo "${CMSG}$1${CNORMAL}" >&2; } +msginfo() { echo "${CINFO}I: $1${CNORMAL}" >&2; } +msgdebug() { echo "${CDEBUG}D: $1${CNORMAL}" >&2; } +msgdone() { echo "${CDONE}DONE${CNORMAL}" >&2; } +msgnwarn() { echo -n "${CWARNING}W: $1${CNORMAL}" >&2; } +msgnmsg() { echo -n "${CMSG}$1${CNORMAL}" >&2; } +msgninfo() { echo -n "${CINFO}I: $1${CNORMAL}" >&2; } +msgndebug() { echo -n "${CDEBUG}D: $1${CNORMAL}" >&2; } +msgtest() { echo -n "${CINFO}$1 ${CCMD}$(echo "$2" | sed -e 's/^aptc/apt-c/' -e 's/^aptg/apt-g/' -e 's/^aptf/apt-f/')${CINFO} …${CNORMAL} " >&2; } +msgpass() { echo "${CPASS}PASS${CNORMAL}" >&2; } +msgskip() { echo "${CWARNING}SKIP${CNORMAL}" >&2; } +msgfail() { echo "${CFAIL}FAIL${CNORMAL}" >&2; } + +# enable / disable Debugging +msginfo() { true; } +msgdebug() { true; } +msgninfo() { true; } +msgndebug() { true; } +msgdone() { if [ "$1" = "debug" -o "$1" = "info" ]; then true; else echo "${CDONE}DONE${CNORMAL}" >&2; fi } + +runapt() { + msgdebug "Executing: ${CCMD}$*${CDEBUG} " + APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$* +} +aptconfig() { runapt apt-config $*; } +aptcache() { runapt apt-cache $*; } +aptget() { runapt apt-get $*; } +aptftparchive() { runapt apt-ftparchive $*; } + +setupenvironment() { + local TMPWORKINGDIRECTORY=$(mktemp -d) + msgninfo "Preparing environment for ${CCMD}$0${CINFO} in ${TMPWORKINGDIRECTORY}… " + BUILDDIRECTORY=$(readlink -f $(dirname $0)/../../build/bin) + test -x "${BUILDDIRECTORY}/apt-get" || msgdie "You need to build tree first" + local OLDWORKINGDIRECTORY=$(pwd) + trap "cd /; rm -rf $TMPWORKINGDIRECTORY; cd $OLDWORKINGDIRECTORY" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM + cd $TMPWORKINGDIRECTORY + mkdir rootdir aptarchive + cd rootdir + mkdir -p etc/apt/apt.conf.d etc/apt/sources.list.d etc/apt/trusted.gpg.d etc/apt/preferences.d var/cache var/lib/dpkg + mkdir -p var/cache/apt/archives/partial var/lib/apt/lists/partial + touch var/lib/dpkg/status + mkdir -p usr/lib/apt + ln -s ${BUILDDIRECTORY}/methods usr/lib/apt/methods + cd .. + echo "RootDir \"${TMPWORKINGDIRECTORY}/rootdir\";" > aptconfig.conf + echo "Debug::NoLocking \"true\";" >> aptconfig.conf + echo "APT::Get::Show-User-Simulation-Note \"false\";" >> aptconfig.conf + export LC_ALL=C + msgdone "info" +} + +configarchitecture() { + local CONFFILE=rootdir/etc/apt/apt.conf.d/01multiarch.conf + echo "APT::Architecture \"$1\";" > $CONFFILE + shift + while [ -n "$1" ]; do + echo "APT::Architectures:: \"$1\";" >> $CONFFILE + shift + done +} + +buildflataptarchive() { + msginfo "Build APT archive for ${CCMD}$0${CINFO}…" + cd aptarchive + APTARCHIVE=$(readlink -f .) + if [ -f Packages ]; then + msgninfo "\tPackages file… " + cat Packages | gzip > Packages.gz + cat Packages | bzip2 > Packages.bz2 + cat Packages | lzma > Packages.lzma + msgdone "info" + fi + if [ -f Sources ]; then + msgninfo "\tSources file… " + cat Sources | gzip > Sources.gz + cat Sources | bzip2 > Sources.bz2 + cat Sources | lzma > Sources.lzma + msgdone "info" + fi + cd .. + aptftparchive release . > Release +} + +setupflataptarchive() { + buildflataptarchive + APTARCHIVE=$(readlink -f ./aptarchive) + if [ -f ${APTARCHIVE}/Packages ]; then + msgninfo "\tadd deb sources.list line… " + echo "deb file://$APTARCHIVE /" > rootdir/etc/apt/sources.list.d/apt-test-archive-deb.list + msgdone "info" + else + rm -f rootdir/etc/apt/sources.list.d/apt-test-archive-deb.list + fi + if [ -f ${APTARCHIVE}/Sources ]; then + msgninfo "\tadd deb-src sources.list line… " + echo "deb-src file://$APTARCHIVE /" > rootdir/etc/apt/sources.list.d/apt-test-archive-deb-src.list + msgdone "info" + else + rm -f rootdir/etc/apt/sources.list.d/apt-test-archive-deb-src.list + fi + aptget update -qq +} + +diff() { + local DIFFTEXT="$($(which diff) -u $* | sed -e '/^---/ d' -e '/^+++/ d' -e '/^@@/ d')" + if [ -n "$DIFFTEXT" ]; then + echo + echo "$DIFFTEXT" + return 1 + else + return 0 + fi +} + +testequal() { + local COMPAREFILE=$(mktemp) + echo "$1" > $COMPAREFILE + shift + msgtest "Test for equality of" "$*" + $* 2>&1 | diff $COMPAREFILE - && msgpass || msgfail +} + +testshowvirtual() { + local VIRTUAL="E: Can't select versions from package '$1' as it purely virtual" + local PACKAGE="$1" + shift + while [ -n "$1" ]; do + VIRTUAL="${VIRTUAL} +E: Can't select versions from package '$1' as it purely virtual" + PACKAGE="${PACKAGE} $1" + shift + done + msgtest "Test for virtual packages" "apt-cache show $PACKAGE" + VIRTUAL="${VIRTUAL} +E: No packages found" + local COMPAREFILE=$(mktemp) + local ARCH=$(dpkg-architecture -qDEB_HOST_ARCH_CPU) + eval `apt-config shell ARCH APT::Architecture` + echo "$VIRTUAL" | sed -e "s/:$ARCH//" -e 's/:all//' > $COMPAREFILE + aptcache show $PACKAGE 2>&1 | diff $COMPAREFILE - && msgpass || msgfail +} + +testnopackage() { + msgtest "Test for non-existent packages" "apt-cache show $*" + local SHOWPKG="$(aptcache show $* 2>&1 | grep '^Package: ')" + if [ -n "$SHOWPKG" ]; then + echo + echo "$SHOWPKG" + msgfail + return 1 + fi + msgpass +} diff --git a/test/integration/run-tests b/test/integration/run-tests new file mode 100755 index 000000000..cb74f21e7 --- /dev/null +++ b/test/integration/run-tests @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +local DIR=$(readlink -f $(dirname $0)) +for testcase in $(run-parts --list $DIR | grep '/test-'); do + echo "\033[1;32mRun Testcase \033[1;35m$(basename ${testcase})\033[0m" + ${testcase} +done diff --git a/test/integration/test-bug-590041-prefer-non-virtual-packages b/test/integration/test-bug-590041-prefer-non-virtual-packages new file mode 100755 index 000000000..aa9e487e1 --- /dev/null +++ b/test/integration/test-bug-590041-prefer-non-virtual-packages @@ -0,0 +1,51 @@ +#!/bin/sh +set -e + +. $(readlink -f $(dirname $0))/framework +setupenvironment +configarchitecture "i386" "armel" + +pkglibc6="Package: libc6 +Architecture: armel +Version: 2.11.2-2~0.3 +Description: Embedded GNU C Library: Shared libraries +Filename: pool/main/e/eglibc/libc6_2.11.2-2_armel.deb +Installed-Size: 9740 +MD5sum: f5b878ce5fb8aa01a7927fa1460df537 +Maintainer: GNU Libc Maintainers +Priority: required +SHA1: 0464d597dfbf949e8c17a42325b1f93fb4914afd +SHA256: faca4a3d9ccff57568abf41f6cb81ddd835be7b5d8b0161e2d5f9a7f26aae3c0 +Section: libs +Size: 4178958 +" + +pkglibdb1="Package: libdb1 +Architecture: i386 +Version: 2.1.3-13~0.3 +Replaces: libc6 (<< 2.2.5-13~0.3) +Description: The Berkeley database routines [glibc 2.0/2.1 compatibility] +Filename: pool/main/d/db1-compat/libdb1-compat_2.1.3-13_armel.deb +Installed-Size: 136 +MD5sum: 4043f176ab2b40b0c01bc1211b8c103c +Maintainer: Colin Watson +Priority: extra +SHA1: b9396fdd2e3e8d1d4ba9e74e7346075852d85666 +SHA256: f17decaa28d1db3eeb9eb17bebe50d437d293a509bcdd7cdfd3ebb56f5de3cea +Section: oldlibs +Size: 44168 +" + +cat <<-EOF >aptarchive/Packages +$pkglibc6 +$pkglibdb1 +EOF + +setupflataptarchive + +testshowvirtual libc6:i386 +testequal "$pkglibc6" aptcache show libc6:armel +testequal "$pkglibc6" aptcache show libc6 +testequal "$pkglibdb1" aptcache show libdb1:i386 +testnopackage libdb1:armel +testequal "$pkglibdb1" aptcache show libdb1 -- cgit v1.2.3 From f6bfb482a32543deed925b127c972a7c258df4a1 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 25 Jul 2010 20:04:16 +0200 Subject: Strip the .sh extension from the libapt testrunner and make it a bit more robust against calling from outside --- test/libapt/run-tests | 61 ++++++++++++++++++++++++++++++++++++++++++++++++ test/libapt/run-tests.sh | 60 ----------------------------------------------- 2 files changed, 61 insertions(+), 60 deletions(-) create mode 100755 test/libapt/run-tests delete mode 100755 test/libapt/run-tests.sh diff --git a/test/libapt/run-tests b/test/libapt/run-tests new file mode 100755 index 000000000..0f55f7386 --- /dev/null +++ b/test/libapt/run-tests @@ -0,0 +1,61 @@ +#!/bin/sh +set -e + +local DIR=$(readlink -f $(dirname $0)) +echo "Compiling the tests …" +test -d "$DIR/../../build/obj/test/libapt/" || mkdir -p "$DIR/../../build/obj/test/libapt/" +$(cd $DIR && make) +echo "Running all testcases …" +LDPATH="$DIR/../../build/bin" +EXT="_libapt_test" +for testapp in $(ls ${LDPATH}/*$EXT) +do + name=$(basename ${testapp}) + tmppath="" + + if [ $name = "GetListOfFilesInDir${EXT}" ]; then + # TODO: very-low: move env creation to the actual test-app + echo "Prepare Testarea for \033[1;35m$name\033[0m ..." + tmppath=$(mktemp -d) + touch "${tmppath}/anormalfile" \ + "${tmppath}/01yet-anothernormalfile" \ + "${tmppath}/anormalapt.conf" \ + "${tmppath}/01yet-anotherapt.conf" \ + "${tmppath}/anormalapt.list" \ + "${tmppath}/01yet-anotherapt.list" \ + "${tmppath}/wrongextension.wron" \ + "${tmppath}/wrong-extension.wron" \ + "${tmppath}/strangefile." \ + "${tmppath}/s.t.r.a.n.g.e.f.i.l.e" \ + "${tmppath}/.hiddenfile" \ + "${tmppath}/.hiddenfile.conf" \ + "${tmppath}/.hiddenfile.list" \ + "${tmppath}/multi..dot" \ + "${tmppath}/multi.dot.conf" \ + "${tmppath}/multi.dot.list" \ + "${tmppath}/disabledfile.disabled" \ + "${tmppath}/disabledfile.conf.disabled" \ + "${tmppath}/disabledfile.list.disabled" \ + "${tmppath}/invälid.conf" \ + "${tmppath}/invalíd" \ + "${tmppath}/01invalíd" + ln -s "${tmppath}/anormalfile" "${tmppath}/linkedfile.list" + ln -s "${tmppath}/non-existing-file" "${tmppath}/brokenlink.list" + elif [ $name = "getLanguages${EXT}" ]; then + echo "Prepare Testarea for \033[1;35m$name\033[0m ..." + tmppath=$(mktemp -d) + touch "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-tr" \ + "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-pt" \ + "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-se~" \ + "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-st.bak" + fi + + echo -n "Testing with \033[1;35m${name}\033[0m ... " + LD_LIBRARY_PATH=${LDPATH} ${testapp} ${tmppath} && echo "\033[1;32mOKAY\033[0m" || echo "\033[1;31mFAILED\033[0m" + + if [ -n "$tmppath" -a -d "$tmppath" ]; then + echo "Cleanup Testarea after \033[1;35m$name\033[0m ..." + rm -rf "$tmppath" + fi + +done diff --git a/test/libapt/run-tests.sh b/test/libapt/run-tests.sh deleted file mode 100755 index cb7769e4a..000000000 --- a/test/libapt/run-tests.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -set -e - -echo "Compiling the tests ..." -test -d '../../build/obj/test/libapt/' || mkdir -p '../../build/obj/test/libapt/' -make -echo "Running all testcases ..." -LDPATH=$(pwd)/../../build/bin -EXT="_libapt_test" -for testapp in $(ls ${LDPATH}/*$EXT) -do - name=$(basename ${testapp}) - tmppath="" - - if [ $name = "GetListOfFilesInDir${EXT}" ]; then - # TODO: very-low: move env creation to the actual test-app - echo "Prepare Testarea for \033[1;35m$name\033[0m ..." - tmppath=$(mktemp -d) - touch "${tmppath}/anormalfile" \ - "${tmppath}/01yet-anothernormalfile" \ - "${tmppath}/anormalapt.conf" \ - "${tmppath}/01yet-anotherapt.conf" \ - "${tmppath}/anormalapt.list" \ - "${tmppath}/01yet-anotherapt.list" \ - "${tmppath}/wrongextension.wron" \ - "${tmppath}/wrong-extension.wron" \ - "${tmppath}/strangefile." \ - "${tmppath}/s.t.r.a.n.g.e.f.i.l.e" \ - "${tmppath}/.hiddenfile" \ - "${tmppath}/.hiddenfile.conf" \ - "${tmppath}/.hiddenfile.list" \ - "${tmppath}/multi..dot" \ - "${tmppath}/multi.dot.conf" \ - "${tmppath}/multi.dot.list" \ - "${tmppath}/disabledfile.disabled" \ - "${tmppath}/disabledfile.conf.disabled" \ - "${tmppath}/disabledfile.list.disabled" \ - "${tmppath}/invälid.conf" \ - "${tmppath}/invalíd" \ - "${tmppath}/01invalíd" - ln -s "${tmppath}/anormalfile" "${tmppath}/linkedfile.list" - ln -s "${tmppath}/non-existing-file" "${tmppath}/brokenlink.list" - elif [ $name = "getLanguages${EXT}" ]; then - echo "Prepare Testarea for \033[1;35m$name\033[0m ..." - tmppath=$(mktemp -d) - touch "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-tr" \ - "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-pt" \ - "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-se~" \ - "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-st.bak" - fi - - echo -n "Testing with \033[1;35m${name}\033[0m ... " - LD_LIBRARY_PATH=${LDPATH} ${testapp} ${tmppath} && echo "\033[1;32mOKAY\033[0m" || echo "\033[1;31mFAILED\033[0m" - - if [ -n "$tmppath" -a -d "$tmppath" ]; then - echo "Cleanup Testarea after \033[1;35m$name\033[0m ..." - rm -rf "$tmppath" - fi - -done -- cgit v1.2.3 From a5032f842366f482371173d030e505d79366fd19 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 26 Jul 2010 09:22:53 +0200 Subject: add APT::Cache::ShowOnlyFirstOr option to print only the first alternative in the apt-cache (r)depends commands --- cmdline/apt-cache.cc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 1a1ddcb8c..88bf3a049 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -580,6 +580,7 @@ bool Depends(CommandLine &CmdL) bool const ShowConflicts = _config->FindB("APT::Cache::ShowConflicts", Important == false); bool const ShowBreaks = _config->FindB("APT::Cache::ShowBreaks", Important == false); bool const ShowEnhances = _config->FindB("APT::Cache::ShowEnhances", Important == false); + bool const ShowOnlyFirstOr = _config->FindB("APT::Cache::ShowOnlyFirstOr", false); bool DidSomething; do { @@ -618,7 +619,7 @@ bool Depends(CommandLine &CmdL) if((Installed && Trg->CurrentVer != 0) || !Installed) { - if ((D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or) + if ((D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or && ShowOnlyFirstOr == false) cout << " |"; else cout << " "; @@ -650,6 +651,9 @@ bool Depends(CommandLine &CmdL) if (Recurse == true) Colours[D.ParentPkg()->ID]++; } + + if (ShowOnlyFirstOr == true) + while ((D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or) ++D; } } } @@ -687,6 +691,7 @@ bool RDepends(CommandLine &CmdL) bool const ShowConflicts = _config->FindB("APT::Cache::ShowConflicts", Important == false); bool const ShowBreaks = _config->FindB("APT::Cache::ShowBreaks", Important == false); bool const ShowEnhances = _config->FindB("APT::Cache::ShowEnhances", Important == false); + bool const ShowOnlyFirstOr = _config->FindB("APT::Cache::ShowOnlyFirstOr", false); bool DidSomething; do { @@ -727,7 +732,7 @@ bool RDepends(CommandLine &CmdL) if((Installed && Trg->CurrentVer != 0) || !Installed) { - if ((D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or) + if ((D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or && ShowOnlyFirstOr == false) cout << " |"; else cout << " "; @@ -758,6 +763,9 @@ bool RDepends(CommandLine &CmdL) if (Recurse == true) Colours[D.ParentPkg()->ID]++; } + + if (ShowOnlyFirstOr == true) + while ((D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or) ++D; } } } -- cgit v1.2.3 From f1a58ff8b6cb4086ae59a2c6b02a29baf97ac116 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 26 Jul 2010 10:53:32 +0200 Subject: - add a 'newest' pseudo target release as in pkg/newest * --- apt-pkg/cacheset.cc | 7 ++++++- debian/changelog | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index df7e99fd0..f17a9e0d5 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -323,7 +323,12 @@ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, V = getInstalledVer(Cache, P, helper); else if (ver == "candidate") V = getCandidateVer(Cache, P, helper); - else { + else if (ver == "newest") { + if (P->VersionList != 0) + V = P.VersionList(); + else + V = helper.canNotFindNewestVer(Cache, P); + } else { pkgVersionMatch Match(ver, (verIsRel == true ? pkgVersionMatch::Release : pkgVersionMatch::Version)); V = Match.Find(P); diff --git a/debian/changelog b/debian/changelog index 1aa05adcb..a381034c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,12 +7,14 @@ apt (0.7.26~exp11) experimental; urgency=low - be able to omit dependency types in (r)depends (Closes: #319006) * apt-pkg/cacheset.cc: - move them back to the library as they look stable now + - add a 'newest' pseudo target release as in pkg/newest * apt-pkg/pkgcache.cc: - prefer non-virtual packages in FindPreferredPkg (Closes: #590041) * test/integration/*: - add with bug#590041 testcase a small test "framework" + * - -- David Kalnischkies Sun, 25 Jul 2010 19:37:45 +0200 + -- David Kalnischkies Mon, 26 Jul 2010 10:52:14 +0200 apt (0.7.26~exp10) experimental; urgency=low -- cgit v1.2.3 From 3de4647b39216259678f40f4bf6e8122acd923b5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 26 Jul 2010 12:43:25 +0200 Subject: - show in (r)depends the canidate per default instead of newest - share the (r)depends code instead of codecopy --- cmdline/apt-cache.cc | 210 ++++++++++++++++----------------------------------- debian/changelog | 5 +- 2 files changed, 67 insertions(+), 148 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 88bf3a049..70732e4d0 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -551,27 +551,40 @@ bool DumpAvail(CommandLine &Cmd) return !_error->PendingError(); } /*}}}*/ -// Depends - Print out a dependency tree /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool Depends(CommandLine &CmdL) +// ShowDepends - Helper for printing out a dependency tree /*{{{*/ +class CacheSetHelperDepends: public APT::CacheSetHelper { +public: + APT::PackageSet virtualPkgs; + + virtual pkgCache::VerIterator canNotFindCandidateVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { + virtualPkgs.insert(Pkg); + return pkgCache::VerIterator(Cache, 0); + } + + virtual pkgCache::VerIterator canNotFindNewestVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { + virtualPkgs.insert(Pkg); + return pkgCache::VerIterator(Cache, 0); + } + + CacheSetHelperDepends() : CacheSetHelper(false) {} +}; +bool ShowDepends(CommandLine &CmdL, bool const RevDepends) { pkgCacheFile CacheFile; pkgCache *Cache = CacheFile.GetPkgCache(); if (unlikely(Cache == NULL)) return false; - SPtrArray Colours = new unsigned[Cache->Head().PackageCount]; - memset(Colours,0,sizeof(*Colours)*Cache->Head().PackageCount); - - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1); - for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) - Colours[Pkg->ID] = 1; + CacheSetHelperDepends helper; + APT::VersionSet verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1, APT::VersionSet::CANDIDATE, helper); + if (verset.empty() == true && helper.virtualPkgs.empty() == true) + return false; + std::vector Shown(Cache->Head().PackageCount); bool const Recurse = _config->FindB("APT::Cache::RecurseDepends", false); bool const Installed = _config->FindB("APT::Cache::Installed", false); bool const Important = _config->FindB("APT::Cache::Important", false); - bool const ShowDepType = _config->FindB("APT::Cache::ShowDependencyType",true); + bool const ShowDepType = _config->FindB("APT::Cache::ShowDependencyType", RevDepends == false); bool const ShowPreDepends = _config->FindB("APT::Cache::ShowPre-Depends", true); bool const ShowDepends = _config->FindB("APT::Cache::ShowDepends", true); bool const ShowRecommends = _config->FindB("APT::Cache::ShowRecommends", Important == false); @@ -581,27 +594,20 @@ bool Depends(CommandLine &CmdL) bool const ShowBreaks = _config->FindB("APT::Cache::ShowBreaks", Important == false); bool const ShowEnhances = _config->FindB("APT::Cache::ShowEnhances", Important == false); bool const ShowOnlyFirstOr = _config->FindB("APT::Cache::ShowOnlyFirstOr", false); - bool DidSomething; - do + + while (verset.empty() != true) { - DidSomething = false; - for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) - { - if (Colours[Pkg->ID] != 1) - continue; - Colours[Pkg->ID] = 2; - DidSomething = true; - - pkgCache::VerIterator Ver = Pkg.VersionList(); - if (Ver.end() == true) - { - cout << '<' << Pkg.FullName(true) << '>' << endl; - continue; - } - + pkgCache::VerIterator Ver = *verset.begin(); + verset.erase(verset.begin()); + pkgCache::PkgIterator Pkg = Ver.ParentPkg(); + Shown[Pkg->ID] = true; + cout << Pkg.FullName(true) << endl; - - for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; D++) + + if (RevDepends == true) + cout << "Reverse Depends:" << endl; + for (pkgCache::DepIterator D = RevDepends ? Pkg.RevDependsList() : Ver.DependsList(); + D.end() == false; D++) { switch (D->Type) { case pkgCache::Dep::PreDepends: if (!ShowPreDepends) continue; break; @@ -614,7 +620,7 @@ bool Depends(CommandLine &CmdL) case pkgCache::Dep::Enhances: if (!ShowEnhances) continue; break; } - pkgCache::PkgIterator Trg = D.TargetPkg(); + pkgCache::PkgIterator Trg = RevDepends ? D.ParentPkg() : D.TargetPkg(); if((Installed && Trg->CurrentVer != 0) || !Installed) { @@ -632,8 +638,11 @@ bool Depends(CommandLine &CmdL) else cout << Trg.FullName(true) << endl; - if (Recurse == true) - Colours[D.TargetPkg()->ID]++; + if (Recurse == true && Shown[Trg->ID] == false) + { + Shown[Trg->ID] = true; + verset.insert(APT::VersionSet::FromPackage(CacheFile, Trg, APT::VersionSet::CANDIDATE, helper)); + } } @@ -647,131 +656,40 @@ bool Depends(CommandLine &CmdL) V->ParentPkg == D->Package) continue; cout << " " << V.ParentPkg().FullName(true) << endl; - - if (Recurse == true) - Colours[D.ParentPkg()->ID]++; + + if (Recurse == true && Shown[V.ParentPkg()->ID] == false) + { + Shown[V.ParentPkg()->ID] = true; + verset.insert(APT::VersionSet::FromPackage(CacheFile, V.ParentPkg(), APT::VersionSet::CANDIDATE, helper)); + } } if (ShowOnlyFirstOr == true) while ((D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or) ++D; } - } - } - while (DidSomething == true); - + } + + for (APT::PackageSet::const_iterator Pkg = helper.virtualPkgs.begin(); + Pkg != helper.virtualPkgs.end(); ++Pkg) + cout << '<' << Pkg.FullName(true) << '>' << endl; + return true; } /*}}}*/ -// RDepends - Print out a reverse dependency tree - mbc /*{{{*/ +// Depends - Print out a dependency tree /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool Depends(CommandLine &CmdL) +{ + return ShowDepends(CmdL, false); +} + /*}}}*/ +// RDepends - Print out a reverse dependency tree /*{{{*/ // --------------------------------------------------------------------- /* */ bool RDepends(CommandLine &CmdL) { - pkgCacheFile CacheFile; - pkgCache *Cache = CacheFile.GetPkgCache(); - if (unlikely(Cache == NULL)) - return false; - - SPtrArray Colours = new unsigned[Cache->Head().PackageCount]; - memset(Colours,0,sizeof(*Colours)*Cache->Head().PackageCount); - - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1); - for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) - Colours[Pkg->ID] = 1; - - bool const Recurse = _config->FindB("APT::Cache::RecurseDepends",false); - bool const Installed = _config->FindB("APT::Cache::Installed",false); - bool const Important = _config->FindB("APT::Cache::Important", false); - bool const ShowDepType = _config->FindB("APT::Cache::ShowDependencyType",false); - bool const ShowPreDepends = _config->FindB("APT::Cache::ShowPre-Depends", true); - bool const ShowDepends = _config->FindB("APT::Cache::ShowDepends", true); - bool const ShowRecommends = _config->FindB("APT::Cache::ShowRecommends", Important == false); - bool const ShowSuggests = _config->FindB("APT::Cache::ShowSuggests", Important == false); - bool const ShowReplaces = _config->FindB("APT::Cache::ShowReplaces", Important == false); - bool const ShowConflicts = _config->FindB("APT::Cache::ShowConflicts", Important == false); - bool const ShowBreaks = _config->FindB("APT::Cache::ShowBreaks", Important == false); - bool const ShowEnhances = _config->FindB("APT::Cache::ShowEnhances", Important == false); - bool const ShowOnlyFirstOr = _config->FindB("APT::Cache::ShowOnlyFirstOr", false); - bool DidSomething; - do - { - DidSomething = false; - for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++) - { - if (Colours[Pkg->ID] != 1) - continue; - Colours[Pkg->ID] = 2; - DidSomething = true; - - pkgCache::VerIterator Ver = Pkg.VersionList(); - if (Ver.end() == true) - { - cout << '<' << Pkg.FullName(true) << '>' << endl; - continue; - } - - cout << Pkg.FullName(true) << endl; - - cout << "Reverse Depends:" << endl; - for (pkgCache::DepIterator D = Pkg.RevDependsList(); D.end() == false; D++) - { - switch (D->Type) { - case pkgCache::Dep::PreDepends: if (!ShowPreDepends) continue; break; - case pkgCache::Dep::Depends: if (!ShowDepends) continue; break; - case pkgCache::Dep::Recommends: if (!ShowRecommends) continue; break; - case pkgCache::Dep::Suggests: if (!ShowSuggests) continue; break; - case pkgCache::Dep::Replaces: if (!ShowReplaces) continue; break; - case pkgCache::Dep::Conflicts: if (!ShowConflicts) continue; break; - case pkgCache::Dep::DpkgBreaks: if (!ShowBreaks) continue; break; - case pkgCache::Dep::Enhances: if (!ShowEnhances) continue; break; - } - - // Show the package - pkgCache::PkgIterator Trg = D.ParentPkg(); - - if((Installed && Trg->CurrentVer != 0) || !Installed) - { - - if ((D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or && ShowOnlyFirstOr == false) - cout << " |"; - else - cout << " "; - - if (ShowDepType == true) - cout << D.DepType() << ": "; - if (Trg->VersionList == 0) - cout << "<" << Trg.FullName(true) << ">" << endl; - else - cout << Trg.FullName(true) << endl; - - if (Recurse == true) - Colours[D.ParentPkg()->ID]++; - - } - - // Display all solutions - SPtrArray List = D.AllTargets(); - pkgPrioSortList(*Cache,List); - for (pkgCache::Version **I = List; *I != 0; I++) - { - pkgCache::VerIterator V(*Cache,*I); - if (V != Cache->VerP + V.ParentPkg()->VersionList || - V->ParentPkg == D->Package) - continue; - cout << " " << V.ParentPkg().FullName(true) << endl; - - if (Recurse == true) - Colours[D.ParentPkg()->ID]++; - } - - if (ShowOnlyFirstOr == true) - while ((D->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or) ++D; - } - } - } - while (DidSomething == true); - - return true; + return ShowDepends(CmdL, true); } /*}}}*/ // xvcg - Generate a graph for xvcg /*{{{*/ diff --git a/debian/changelog b/debian/changelog index a381034c1..345a46579 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ apt (0.7.26~exp11) experimental; urgency=low - handle "circular" conflicts for "all" packages correctly * cmdline/apt-cache.cc: - be able to omit dependency types in (r)depends (Closes: #319006) + - show in (r)depends the canidate per default instead of newest + - share the (r)depends code instead of codecopy * apt-pkg/cacheset.cc: - move them back to the library as they look stable now - add a 'newest' pseudo target release as in pkg/newest @@ -12,9 +14,8 @@ apt (0.7.26~exp11) experimental; urgency=low - prefer non-virtual packages in FindPreferredPkg (Closes: #590041) * test/integration/*: - add with bug#590041 testcase a small test "framework" - * - -- David Kalnischkies Mon, 26 Jul 2010 10:52:14 +0200 + -- David Kalnischkies Mon, 26 Jul 2010 12:40:44 +0200 apt (0.7.26~exp10) experimental; urgency=low -- cgit v1.2.3 From 4b12ea903c5166e6215764e6507f6271782df6ff Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 27 Jul 2010 13:27:26 +0200 Subject: * cmdline/apt-get.cc: - Support large filesystems by using statvfs64() instead of statvfs() and statfs64() instead of statfs() (Closes: #590513). --- cmdline/apt-get.cc | 6 ++++++ debian/changelog | 3 +++ 2 files changed, 9 insertions(+) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 7cf760c27..a6dfd82ed 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -25,6 +25,9 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ +#define _LARGEFILE_SOURCE +#define _LARGEFILE64_SOURCE + #include #include #include @@ -63,6 +66,9 @@ #include #include #include + +#define statfs statfs64 +#define statvfs statvfs64 /*}}}*/ #define RAMFS_MAGIC 0x858458f6 diff --git a/debian/changelog b/debian/changelog index 06454cd5a..95f2338c0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ apt (0.7.26~exp11) experimental; urgency=low - Add to history whether a change was automatic or not. * apt-pkg/contrib/fileutl.cc: - Add FileFd::OpenDescriptor() (needed for python-apt's #383617). + * cmdline/apt-get.cc: + - Support large filesystems by using statvfs64() instead of statvfs() + and statfs64() instead of statfs() (Closes: #590513). -- Julian Andres Klode Wed, 21 Jul 2010 17:09:11 +0200 -- cgit v1.2.3 From 15032eec2d508df3c63b532be22f488d240159a2 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 27 Jul 2010 13:57:42 +0200 Subject: * apt-pkg/cdrom.cc: - Use link() instead of rename() for creating the CD database backup; otherwise there would be a short time without any database. --- apt-pkg/cdrom.cc | 2 +- debian/changelog | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 93deb49c4..e3e0027fc 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -383,7 +383,7 @@ bool pkgCdrom::WriteDatabase(Configuration &Cnf) Out.close(); - rename(DFile.c_str(),string(DFile + '~').c_str()); + link(DFile.c_str(),string(DFile + '~').c_str()); if (rename(NewFile.c_str(),DFile.c_str()) != 0) return _error->Errno("rename","Failed to rename %s.new to %s", DFile.c_str(),DFile.c_str()); diff --git a/debian/changelog b/debian/changelog index 95f2338c0..ee48ec1d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ apt (0.7.26~exp11) experimental; urgency=low * cmdline/apt-get.cc: - Support large filesystems by using statvfs64() instead of statvfs() and statfs64() instead of statfs() (Closes: #590513). + * apt-pkg/cdrom.cc: + - Use link() instead of rename() for creating the CD database backup; + otherwise there would be a short time without any database. -- Julian Andres Klode Wed, 21 Jul 2010 17:09:11 +0200 -- cgit v1.2.3 From 8f8169ac464249c8a2b35b13f9c5278d4c9e5a46 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 28 Jul 2010 21:47:42 +0200 Subject: auto-install Packages and status file of the testcase --- test/integration/framework | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/test/integration/framework b/test/integration/framework index 97dce1e19..7e0d4b902 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -45,8 +45,9 @@ aptftparchive() { runapt apt-ftparchive $*; } setupenvironment() { local TMPWORKINGDIRECTORY=$(mktemp -d) + local TESTDIR=$(readlink -f $(dirname $0)) msgninfo "Preparing environment for ${CCMD}$0${CINFO} in ${TMPWORKINGDIRECTORY}… " - BUILDDIRECTORY=$(readlink -f $(dirname $0)/../../build/bin) + BUILDDIRECTORY="${TESTDIR}/../../build/bin" test -x "${BUILDDIRECTORY}/apt-get" || msgdie "You need to build tree first" local OLDWORKINGDIRECTORY=$(pwd) trap "cd /; rm -rf $TMPWORKINGDIRECTORY; cd $OLDWORKINGDIRECTORY" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM @@ -55,10 +56,21 @@ setupenvironment() { cd rootdir mkdir -p etc/apt/apt.conf.d etc/apt/sources.list.d etc/apt/trusted.gpg.d etc/apt/preferences.d var/cache var/lib/dpkg mkdir -p var/cache/apt/archives/partial var/lib/apt/lists/partial - touch var/lib/dpkg/status + local STATUSFILE=$(echo "$(basename $0)" | sed 's/^test-/status-/') + if [ -f "${TESTDIR}/${STATUSFILE}" ]; then + cp "${TESTDIR}/${STATUSFILE}" var/lib/dpkg/status + else + touch var/lib/dpkg/status + fi mkdir -p usr/lib/apt ln -s ${BUILDDIRECTORY}/methods usr/lib/apt/methods cd .. + local PACKAGESFILE=$(echo "$(basename $0)" | sed 's/^test-/Packages-/') + if [ -f "${TESTDIR}/${PACKAGESFILE}" ]; then + cp "${TESTDIR}/${PACKAGESFILE}" aptarchive/Packages + else + touch var/lib/dpkg/status + fi echo "RootDir \"${TMPWORKINGDIRECTORY}/rootdir\";" > aptconfig.conf echo "Debug::NoLocking \"true\";" >> aptconfig.conf echo "APT::Get::Show-User-Simulation-Note \"false\";" >> aptconfig.conf -- cgit v1.2.3 From 966640d8fd2feac29909a22415955b3ce5779dcd Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 28 Jul 2010 21:53:17 +0200 Subject: * apt-pkg/orderlist.cc: - try to install another or-group member in DepRemove before breaking the or group (Closes: #590438) --- apt-pkg/orderlist.cc | 77 ++++++++++++++++- debian/changelog | 5 +- ...g-590438-broken-provides-thanks-to-remove-order | 35 ++++++++ ...g-590438-broken-provides-thanks-to-remove-order | 97 ++++++++++++++++++++++ ...g-590438-broken-provides-thanks-to-remove-order | 59 +++++++++++++ 5 files changed, 271 insertions(+), 2 deletions(-) create mode 100644 test/integration/Packages-bug-590438-broken-provides-thanks-to-remove-order create mode 100644 test/integration/status-bug-590438-broken-provides-thanks-to-remove-order create mode 100755 test/integration/test-bug-590438-broken-provides-thanks-to-remove-order diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index 55f9cb9cc..cb55147c3 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -886,13 +886,16 @@ bool pkgOrderList::DepRemove(DepIterator D) continue; /* We wish to see if the dep on the parent package is okay - in the removed (install) state of the target pkg. */ + in the removed (install) state of the target pkg. */ + bool tryFixDeps = false; if (CheckDep(D) == true) { // We want to catch loops with the code below. if (IsFlag(D.ParentPkg(),AddPending) == false) continue; } + else + tryFixDeps = true; // This is the loop detection if (IsFlag(D.ParentPkg(),Added) == true || @@ -903,6 +906,78 @@ bool pkgOrderList::DepRemove(DepIterator D) continue; } + if (tryFixDeps == true) + { + for (pkgCache::DepIterator F = D.ParentPkg().CurrentVer().DependsList(); + F.end() == false; ++F) + { + if (F->Type != pkgCache::Dep::Depends && F->Type != pkgCache::Dep::PreDepends) + continue; + // Check the Providers + if (F.TargetPkg()->ProvidesList != 0) + { + pkgCache::PrvIterator Prov = F.TargetPkg().ProvidesList(); + for (; Prov.end() == false; ++Prov) + { + pkgCache::PkgIterator const P = Prov.OwnerPkg(); + if (IsFlag(P, InList) == true && + IsFlag(P, AddPending) == true && + IsFlag(P, Added) == false && + Cache[P].InstallVer == 0) + break; + } + if (Prov.end() == false) + for (pkgCache::PrvIterator Prv = F.TargetPkg().ProvidesList(); + Prv.end() == false; ++Prv) + { + pkgCache::PkgIterator const P = Prv.OwnerPkg(); + if (IsFlag(P, InList) == true && + IsFlag(P, AddPending) == false && + Cache[P].InstallVer != 0 && + VisitNode(P) == true) + { + tryFixDeps = false; + break; + } + } + if (tryFixDeps == false) + break; + } + + // Check for Or groups + if ((F->CompareOp & pkgCache::Dep::Or) != pkgCache::Dep::Or) + continue; + // Lets see if the package is part of the Or group + pkgCache::DepIterator S = F; + for (; S.end() == false; ++S) + { + if (S.TargetPkg() == D.TargetPkg()) + break; + if ((S->CompareOp & pkgCache::Dep::Or) != pkgCache::Dep::Or || + CheckDep(S)) // Or group is satisfied by another package + for (;S.end() == false; ++S); + } + if (S.end() == true) + continue; + // skip to the end of the or group + for (;S.end() == false && (S->CompareOp & pkgCache::Dep::Or) == pkgCache::Dep::Or; ++S); + ++S; + // The soon to be removed is part of the Or group + // start again in the or group and find something which will serve as replacement + for (; F.end() == false && F != S; ++F) + { + if (F.TargetPkg() == D.TargetPkg() || + IsFlag(F.TargetPkg(), InList) == false || + VisitNode(F.TargetPkg()) == false) + continue; + tryFixDeps = false; + break; + } + if (tryFixDeps == false) + break; + } + } + // Skip over missing files if (IsMissing(D.ParentPkg()) == true) continue; diff --git a/debian/changelog b/debian/changelog index 345a46579..86b154dab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,8 +14,11 @@ apt (0.7.26~exp11) experimental; urgency=low - prefer non-virtual packages in FindPreferredPkg (Closes: #590041) * test/integration/*: - add with bug#590041 testcase a small test "framework" + * apt-pkg/orderlist.cc: + - try to install another or-group member in DepRemove before + breaking the or group (Closes: #590438) - -- David Kalnischkies Mon, 26 Jul 2010 12:40:44 +0200 + -- David Kalnischkies Wed, 28 Jul 2010 21:41:35 +0200 apt (0.7.26~exp10) experimental; urgency=low diff --git a/test/integration/Packages-bug-590438-broken-provides-thanks-to-remove-order b/test/integration/Packages-bug-590438-broken-provides-thanks-to-remove-order new file mode 100644 index 000000000..16bf008f6 --- /dev/null +++ b/test/integration/Packages-bug-590438-broken-provides-thanks-to-remove-order @@ -0,0 +1,35 @@ +Package: gawk +Priority: optional +Section: interpreters +Installed-Size: 2084 +Maintainer: Arthur Loiret +Architecture: i386 +Version: 1:3.1.7.dfsg-5 +Provides: awk +Pre-Depends: libc6 (>= 2.3) +Filename: pool/main/g/gawk/gawk_3.1.7.dfsg-5_i386.deb +Size: 766008 +MD5sum: 6459a02cfc1b9eafb3c0415e4ff4e252 +SHA1: ac033488dae4b7e8167d610e490319c047edf7e4 +SHA256: a2337dfe1cc82aeae46f2c722e5cc7be9ecefdea4aaf13f540cfe70bd8b1d627 +Description-de: GNU awk, eine Mustererkennungs- und Verarbeitungssprache +Homepage: http://www.gnu.org/software/gawk/ +Tag: devel::interpreter, implemented-in::c, interface::commandline, role::program, scope::utility, suite::gnu, use::filtering, use::scanning, works-with::text + +Package: aawk +Priority: optional +Section: interpreters +Installed-Size: 2084 +Maintainer: Arthur Loiret +Architecture: i386 +Version: 1:3.1.7.dfsg-5 +Provides: awk +Pre-Depends: libc6 (>= 2.3) +Filename: pool/main/a/aawk/aawk_3.1.7.dfsg-5_i386.deb +Size: 766008 +MD5sum: 6459a02cfc1b9eafb3c0415e4ff4e252 +SHA1: ac033488dae4b7e8167d610e490319c047edf7e4 +SHA256: a2337dfe1cc82aeae46f2c722e5cc7be9ecefdea4aaf13f540cfe70bd8b1d627 +Description-de: GNU awk, eine Mustererkennungs- und Verarbeitungssprache +Homepage: http://www.gnu.org/software/gawk/ +Tag: devel::interpreter, implemented-in::c, interface::commandline, role::program, scope::utility, suite::gnu, use::filtering, use::scanning, works-with::text diff --git a/test/integration/status-bug-590438-broken-provides-thanks-to-remove-order b/test/integration/status-bug-590438-broken-provides-thanks-to-remove-order new file mode 100644 index 000000000..c2c03c0e4 --- /dev/null +++ b/test/integration/status-bug-590438-broken-provides-thanks-to-remove-order @@ -0,0 +1,97 @@ +Package: libc-bin +Status: install ok installed +Priority: required +Section: libs +Installed-Size: 1516 +Maintainer: GNU Libc Maintainers +Architecture: i386 +Source: eglibc +Version: 2.11.2-2 +Replaces: libc0.1, libc0.3, libc6, libc6.1 +Breaks: libc0.1 (<< 2.10), libc0.3 (<< 2.10), libc6 (<< 2.10), libc6.1 (<< 2.10) +Filename: pool/main/e/eglibc/libc-bin_2.11.2-2_i386.deb +Size: 703542 +MD5sum: f554ec34c092bb8e52e3d917bec7b46c +SHA1: 4d5ba53b50937b1d50e3234e45335de5ea97b84b +SHA256: 4f1e6430a730321209bb6b9cf89ba8a72c95f5c93f3e263a982251b3cc8beb14 +Description-de: Die »Embedded GNU C Library«: Binärdateien +Homepage: http://www.eglibc.org +Tag: devel::lang:c, devel::packaging, implemented-in::c, interface::commandline, role::program, scope::utility, special::auto-inst-parts, suite::gnu, works-with::text, works-with::unicode + +Package: libc6 +Status: install ok installed +Priority: required +Section: libs +Installed-Size: 9340 +Maintainer: GNU Libc Maintainers +Architecture: i386 +Source: eglibc +Version: 2.11.2-2 +Provides: glibc-2.11-1 +Depends: libc-bin (= 2.11.2-2), libgcc1 +Recommends: libc6-i686 +Suggests: glibc-doc, debconf | debconf-2.0, locales +Conflicts: tzdata (<< 2007k-1), tzdata-etch +Breaks: locales (<< 2.11), locales-all (<< 2.11), nscd (<< 2.11) +Filename: pool/main/e/eglibc/libc6_2.11.2-2_i386.deb +Size: 3877166 +MD5sum: 3d8fe972a359ad362ac1957c2687e5c2 +SHA1: cd901f3265254e40ad198b935877f546eeaa8403 +SHA256: e1bc3da1e11f9b742d05f927362e2079482db4186ff45af9f937d284e112e7e5 +Description-de: Die »Embedded GNU C Library«: Laufzeitbibliotheken +Homepage: http://www.eglibc.org +Tag: devel::lang:c, devel::library, implemented-in::c, protocol::ipv6, role::shared-lib, suite::gnu + +Package: mawk +Status: install ok installed +Priority: required +Section: utils +Installed-Size: 228 +Maintainer: Steve Langasek +Architecture: i386 +Version: 1.3.3-15 +Provides: awk +Pre-Depends: libc6 (>= 2.1) +Filename: pool/main/m/mawk/mawk_1.3.3-15_i386.deb +Size: 81430 +MD5sum: e0f9e9903a862a52b5f107d560c4d8e0 +SHA1: cca3b3ea3a57b9c3c136fb538a4fb06a99d1a33e +SHA256: 7449b10ffb6a8636a249ad6866188cad0040a6a446fb4a3a71d81fd136297ee6 +Description-de: Eine Muster- und Textverarbeitungssprache +Tag: devel::interpreter, implemented-in::c, interface::commandline, role::program, scope::utility, use::filtering, use::scanning, works-with::text + +Package: gcc-4.5-base +Status: install ok installed +Priority: required +Section: libs +Installed-Size: 172 +Maintainer: Debian GCC Maintainers +Architecture: i386 +Source: gcc-4.5 +Version: 4.5.0-8 +Filename: pool/main/g/gcc-4.5/gcc-4.5-base_4.5.0-8_i386.deb +Size: 117894 +MD5sum: f5850c42681fcfee3429a1b43da68433 +SHA1: 0548343feba69c4c01d5dbf147393d8dc27605ac +SHA256: 04b60f5fe24b7397e3be233051615ff9addb66d4581578f67fde76f5d7f69f7a +Description: The GNU Compiler Collection (base package) +Homepage: http://gcc.gnu.org/ + +Package: libgcc1 +Status: install ok installed +Priority: required +Section: libs +Installed-Size: 148 +Maintainer: Debian GCC Maintainers +Architecture: i386 +Source: gcc-4.5 (4.5.0-8) +Version: 1:4.5.0-8 +Depends: gcc-4.5-base (= 4.5.0-8), libc6 (>= 2.2.4) +Filename: pool/main/g/gcc-4.5/libgcc1_4.5.0-8_i386.deb +Size: 52190 +MD5sum: beda956a1dcdeffed11072c2d0f3eb83 +SHA1: 7117ec43eec7982a030fcc9a12d4772de3fcdba0 +SHA256: 1d10bd532adce8683b475fcc60c22300f717ef19bf84dc5bf43b07e504f85dcb +Description: GCC support library +Homepage: http://gcc.gnu.org/ + diff --git a/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order b/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order new file mode 100755 index 000000000..bb10c4f73 --- /dev/null +++ b/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order @@ -0,0 +1,59 @@ +#!/bin/sh +set -e + +local TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework + +setupenvironment +configarchitecture "i386" +setupflataptarchive + +pkgbasefile="Package: base-files +Status: install ok installed +Essential: yes +Priority: required +Section: admin +Installed-Size: 472 +Maintainer: Santiago Vila +Architecture: i386 +Version: 5.8 +Replaces: base, dpkg (<= 1.15.0), miscutils +Provides: base +Filename: pool/main/b/base-files/base-files_5.8_i386.deb +Size: 73986 +MD5sum: 8489687ce10e656babd467c9ee389349 +Description-de: Verschiedene Dateien für das Basis-System von Debian" + +predependstest() { +# rm rootdir/var/cache/apt/*.bin + cp $TESTDIR/$(echo "$(basename $0)" | sed 's/test-/status-/') rootdir/var/lib/dpkg/status + echo "$pkgbasefile +Pre-Depends: $1 +" >> rootdir/var/lib/dpkg/status + testequal "Inst gawk (1:3.1.7.dfsg-5 localhost [i386]) +Conf gawk (1:3.1.7.dfsg-5 localhost [i386]) +Remv mawk [1.3.3-15]" aptget install gawk mawk- -sqq -o PreDepends=$(echo "$1" | sed 's/ //g') +} + +predependstest "gawk | mawk" +predependstest "mawk | gawk" + +predependstest "aawk | mawk | gawk" +predependstest "aawk | gawk | mawk" + +predependstest "gawk | awk" +predependstest "aawk | gawk | awk" + +predependstest "mawk | awk" + +predependstest "awk | gawk" +predependstest "awk | gawk | aawk" + +predependstest "awk | mawk" + +predependstest "aawk | awk" +predependstest "awk | aawk" + +predependstest "awk" + +# aptget install gawk mawk- -sqq -o Debug::pkgOrderList=1 #-o Debug::pkgPackageManager=1 -- cgit v1.2.3 From 685625bd308f62a382aaf61f1621a18b9441edfd Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 29 Jul 2010 12:26:26 +0200 Subject: configure also the replacement before remove by adding Immediate flag --- apt-pkg/orderlist.cc | 2 + debian/changelog | 3 +- ...g-590438-broken-provides-thanks-to-remove-order | 32 ++++++++++ test/integration/framework | 16 +++++ ...g-590438-broken-provides-thanks-to-remove-order | 69 +++++++++++++++++----- 5 files changed, 106 insertions(+), 16 deletions(-) diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index cb55147c3..602b63d3b 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -936,6 +936,7 @@ bool pkgOrderList::DepRemove(DepIterator D) Cache[P].InstallVer != 0 && VisitNode(P) == true) { + Flag(P, Immediate); tryFixDeps = false; break; } @@ -970,6 +971,7 @@ bool pkgOrderList::DepRemove(DepIterator D) IsFlag(F.TargetPkg(), InList) == false || VisitNode(F.TargetPkg()) == false) continue; + Flag(F.TargetPkg(), Immediate); tryFixDeps = false; break; } diff --git a/debian/changelog b/debian/changelog index 86b154dab..b836aaab8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,8 +17,9 @@ apt (0.7.26~exp11) experimental; urgency=low * apt-pkg/orderlist.cc: - try to install another or-group member in DepRemove before breaking the or group (Closes: #590438) + - configure also the replacement before remove by adding Immediate flag - -- David Kalnischkies Wed, 28 Jul 2010 21:41:35 +0200 + -- David Kalnischkies Thu, 29 Jul 2010 12:24:49 +0200 apt (0.7.26~exp10) experimental; urgency=low diff --git a/test/integration/Packages-bug-590438-broken-provides-thanks-to-remove-order b/test/integration/Packages-bug-590438-broken-provides-thanks-to-remove-order index 16bf008f6..75a769e1a 100644 --- a/test/integration/Packages-bug-590438-broken-provides-thanks-to-remove-order +++ b/test/integration/Packages-bug-590438-broken-provides-thanks-to-remove-order @@ -33,3 +33,35 @@ SHA256: a2337dfe1cc82aeae46f2c722e5cc7be9ecefdea4aaf13f540cfe70bd8b1d627 Description-de: GNU awk, eine Mustererkennungs- und Verarbeitungssprache Homepage: http://www.gnu.org/software/gawk/ Tag: devel::interpreter, implemented-in::c, interface::commandline, role::program, scope::utility, suite::gnu, use::filtering, use::scanning, works-with::text + +Package: gawk2 +Priority: optional +Section: interpreters +Installed-Size: 2084 +Maintainer: Arthur Loiret +Architecture: i386 +Version: 1:3.1.7.dfsg-5 +Provides: awk +Pre-Depends: libc6 (>= 2.3) +Depends: coolstuff +Filename: pool/main/g/gawk/gawk_3.1.7.dfsg-5_i386.deb +Size: 766008 +MD5sum: 6459a02cfc1b9eafb3c0415e4ff4e252 +SHA1: ac033488dae4b7e8167d610e490319c047edf7e4 +SHA256: a2337dfe1cc82aeae46f2c722e5cc7be9ecefdea4aaf13f540cfe70bd8b1d627 +Description-de: GNU awk, eine Mustererkennungs- und Verarbeitungssprache +Homepage: http://www.gnu.org/software/gawk/ +Tag: devel::interpreter, implemented-in::c, interface::commandline, role::program, scope::utility, suite::gnu, use::filtering, use::scanning, works-with::text + +Package: coolstuff +Priority: optional +Section: cool +Installed-Size: 10 +Maintainer: David Kalnischkies +Architecture: all +Version: 1-1 +Filename: pool/main/c/coolstuff/coolstuff_1-1_all.deb +Size: 7608 +MD5sum: 6459aa2efc139eafb323ac3f4f5aeb22 +Description: We all need cool stuff + diff --git a/test/integration/framework b/test/integration/framework index 7e0d4b902..7b323fdb5 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -149,6 +149,22 @@ testequal() { $* 2>&1 | diff $COMPAREFILE - && msgpass || msgfail } +testequalor2() { + local COMPAREFILE1=$(mktemp) + local COMPAREFILE2=$(mktemp) + local COMPAREAGAINST=$(mktemp) + echo "$1" > $COMPAREFILE1 + echo "$2" > $COMPAREFILE2 + shift 2 + msgtest "Test for equality OR of" "$*" + $* 2>&1 1> $COMPAREAGAINST + (diff $COMPAREFILE1 $COMPAREAGAINST 1> /dev/null || + diff $COMPAREFILE2 $COMPAREAGAINST 1> /dev/null) && msgpass || + ( echo "\n${CINFO}Diff against OR 1${CNORMAL}" "$(diff $COMPAREFILE1 $COMPAREAGAINST)" \ + "\n${CINFO}Diff against OR 2${CNORMAL}" "$(diff $COMPAREFILE2 $COMPAREAGAINST)" && + msgfail ) +} + testshowvirtual() { local VIRTUAL="E: Can't select versions from package '$1' as it purely virtual" local PACKAGE="$1" diff --git a/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order b/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order index bb10c4f73..17ce50295 100755 --- a/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order +++ b/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order @@ -24,7 +24,7 @@ Size: 73986 MD5sum: 8489687ce10e656babd467c9ee389349 Description-de: Verschiedene Dateien für das Basis-System von Debian" -predependstest() { +predependsgawk() { # rm rootdir/var/cache/apt/*.bin cp $TESTDIR/$(echo "$(basename $0)" | sed 's/test-/status-/') rootdir/var/lib/dpkg/status echo "$pkgbasefile @@ -35,25 +35,64 @@ Conf gawk (1:3.1.7.dfsg-5 localhost [i386]) Remv mawk [1.3.3-15]" aptget install gawk mawk- -sqq -o PreDepends=$(echo "$1" | sed 's/ //g') } -predependstest "gawk | mawk" -predependstest "mawk | gawk" +predependsgawk "gawk | mawk" +predependsgawk "mawk | gawk" -predependstest "aawk | mawk | gawk" -predependstest "aawk | gawk | mawk" +predependsgawk "aawk | mawk | gawk" +predependsgawk "aawk | gawk | mawk" -predependstest "gawk | awk" -predependstest "aawk | gawk | awk" +predependsgawk "gawk | awk" +predependsgawk "aawk | gawk | awk" -predependstest "mawk | awk" +predependsgawk "mawk | awk" -predependstest "awk | gawk" -predependstest "awk | gawk | aawk" +predependsgawk "awk | gawk" +predependsgawk "awk | gawk | aawk" -predependstest "awk | mawk" +predependsgawk "awk | mawk" -predependstest "aawk | awk" -predependstest "awk | aawk" +predependsgawk "aawk | awk" +predependsgawk "awk | aawk" -predependstest "awk" +predependsgawk "awk" -# aptget install gawk mawk- -sqq -o Debug::pkgOrderList=1 #-o Debug::pkgPackageManager=1 +predependsgawk2() { +# rm rootdir/var/cache/apt/*.bin + cp $TESTDIR/$(echo "$(basename $0)" | sed 's/test-/status-/') rootdir/var/lib/dpkg/status + echo "$pkgbasefile +Pre-Depends: $1 +" >> rootdir/var/lib/dpkg/status + testequalor2 "Inst coolstuff (1-1 localhost [all]) +Conf coolstuff (1-1 localhost [all]) +Inst gawk2 (1:3.1.7.dfsg-5 localhost [i386]) +Conf gawk2 (1:3.1.7.dfsg-5 localhost [i386]) +Remv mawk [1.3.3-15]" "Inst coolstuff (1-1 localhost [all]) +Inst gawk2 (1:3.1.7.dfsg-5 localhost [i386]) +Conf coolstuff (1-1 localhost [all]) +Conf gawk2 (1:3.1.7.dfsg-5 localhost [i386]) +Remv mawk [1.3.3-15]" aptget install gawk2 mawk- -sqq -o PreDepends=$(echo "$1" | sed 's/ //g') +} + +predependsgawk2 "gawk2 | mawk" +predependsgawk2 "mawk | gawk2" + +predependsgawk2 "aawk | mawk | gawk2" +predependsgawk2 "aawk | gawk2 | mawk" + +predependsgawk2 "gawk2 | awk" +predependsgawk2 "aawk | gawk2 | awk" + +predependsgawk2 "mawk | awk" + +predependsgawk2 "awk | gawk2" +predependsgawk2 "awk | gawk2 | aawk" + +predependsgawk2 "awk | mawk" + +predependsgawk2 "aawk | awk" +predependsgawk2 "awk | aawk" + +predependsgawk2 "awk" + + +# aptget install gawk2 mawk- -s #-o Debug::pkgOrderList=1 #-o Debug::pkgPackageManager=1 -- cgit v1.2.3 From 12be8a62d1abb9253a4695badbf70e7210f9b0d2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 29 Jul 2010 14:37:36 +0200 Subject: * apt-pkg/contrib/error.{cc,h} - docstring cleanup --- apt-pkg/contrib/error.cc | 4 ++-- apt-pkg/contrib/error.h | 11 ++++++----- debian/changelog | 4 ++++ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc index fbb6e4636..d63b06d13 100644 --- a/apt-pkg/contrib/error.cc +++ b/apt-pkg/contrib/error.cc @@ -180,7 +180,7 @@ bool GlobalError::PopMessage(std::string &Text) { } /*}}}*/ // GlobalError::DumpErrors - Dump all of the errors/warns to cerr /*{{{*/ -void GlobalError::DumpErrors(std::ostream &out, MsgType const &trashhold, +void GlobalError::DumpErrors(std::ostream &out, MsgType const &threshold, bool const &mergeStack) { if (mergeStack == true) for (std::list::const_reverse_iterator s = Stacks.rbegin(); @@ -189,7 +189,7 @@ void GlobalError::DumpErrors(std::ostream &out, MsgType const &trashhold, for (std::list::const_iterator m = Messages.begin(); m != Messages.end(); m++) - if (m->Type >= trashhold) + if (m->Type >= threshold) out << (*m) << std::endl; Discard(); } diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index e5517c2da..d39500427 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -204,9 +204,10 @@ public: /*{{{*/ * displayed or not. * * \param[out] out output stream to write the messages in - * \param WithoutNotice output notices or not + * \param threshold minimim level considered + * \param mergeStack */ - void DumpErrors(std::ostream &out, MsgType const &trashhold = WARNING, + void DumpErrors(std::ostream &out, MsgType const &threshold = WARNING, bool const &mergeStack = true); /** \brief dumps the list of messages to std::cerr @@ -214,10 +215,10 @@ public: /*{{{*/ * Note that all messages are discarded, also the notices * displayed or not. * - * \param WithoutNotice print notices or not + * \param threshold minimum level printed */ - void inline DumpErrors(MsgType const &trashhold = WARNING) { - DumpErrors(std::cerr, trashhold); + void inline DumpErrors(MsgType const &threshold = WARNING) { + DumpErrors(std::cerr, threshold); } /** \brief put the current Messages into the stack diff --git a/debian/changelog b/debian/changelog index 49f8bce46..545703603 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,10 @@ apt (0.7.26~exp11) experimental; urgency=low - try to install another or-group member in DepRemove before breaking the or group (Closes: #590438) - configure also the replacement before remove by adding Immediate flag + + [ Michael Vogt ] + * apt-pkg/contrib/error.{cc,h} + - docstring cleanup -- David Kalnischkies Mon, 26 Jul 2010 12:40:44 +0200 -- cgit v1.2.3 From ca0d389c8969ddb679358ca16e4bcddfcdaf9b03 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 29 Jul 2010 14:51:05 +0200 Subject: add inline DumpError() to avoid subtle API break --- apt-pkg/contrib/error.h | 14 +++++++++++++- debian/changelog | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index d39500427..4af0302c0 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -217,10 +217,22 @@ public: /*{{{*/ * * \param threshold minimum level printed */ - void inline DumpErrors(MsgType const &threshold = WARNING) { + void inline DumpErrors(MsgType const &threshold) { DumpErrors(std::cerr, threshold); } + // mvo: we do this instead of using a default parameter in the + // previous declaration to avoid a (subtle) API break for + // e.g. sigc++ and mem_fun0 + /** \brief dumps the messages of type WARNING or higher to std::cerr + * + * Note that all messages are discarded, displayed or not. + * + */ + void inline DumpErrors() { + DumpErrors(WARNING); + } + /** \brief put the current Messages into the stack * * All "old" messages will be pushed into a stack to diff --git a/debian/changelog b/debian/changelog index 545703603..c526df66c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,7 @@ apt (0.7.26~exp11) experimental; urgency=low [ Michael Vogt ] * apt-pkg/contrib/error.{cc,h} - docstring cleanup + - add inline DumpError() to avoid subtle API break -- David Kalnischkies Mon, 26 Jul 2010 12:40:44 +0200 -- cgit v1.2.3 From 8e86786b2f0002a7512f97d0f9b5ef3e4794e26e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 29 Jul 2010 15:09:18 +0200 Subject: remove the temporary compare files we create --- test/integration/framework | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/integration/framework b/test/integration/framework index 7b323fdb5..b4e9302e8 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -147,6 +147,7 @@ testequal() { shift msgtest "Test for equality of" "$*" $* 2>&1 | diff $COMPAREFILE - && msgpass || msgfail + rm $COMPAREFILE } testequalor2() { @@ -163,6 +164,7 @@ testequalor2() { ( echo "\n${CINFO}Diff against OR 1${CNORMAL}" "$(diff $COMPAREFILE1 $COMPAREAGAINST)" \ "\n${CINFO}Diff against OR 2${CNORMAL}" "$(diff $COMPAREFILE2 $COMPAREAGAINST)" && msgfail ) + rm $COMPAREFILE1 $COMPAREFILE2 $COMPAREAGAINST } testshowvirtual() { @@ -183,6 +185,7 @@ E: No packages found" eval `apt-config shell ARCH APT::Architecture` echo "$VIRTUAL" | sed -e "s/:$ARCH//" -e 's/:all//' > $COMPAREFILE aptcache show $PACKAGE 2>&1 | diff $COMPAREFILE - && msgpass || msgfail + rm $COMPAREFILE } testnopackage() { -- cgit v1.2.3 From bd3e16fa135fc1ce417bacc70e88418015305e98 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 29 Jul 2010 16:28:33 +0200 Subject: apt-pkg/init.h: update MAPT_PKG_MINOR because 9 was used in experimental for some time and there was quite a bit of churn --- apt-pkg/init.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/init.h b/apt-pkg/init.h index b3e4b147f..6e7340dfe 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -22,7 +22,7 @@ // Non-ABI-Breaks should only increase RELEASE number. // See also buildlib/libversion.mak #define APT_PKG_MAJOR 4 -#define APT_PKG_MINOR 9 +#define APT_PKG_MINOR 10 #define APT_PKG_RELEASE 0 extern const char *pkgVersion; -- cgit v1.2.3 From 5c9829b60e41c6ef86867fd0759b63a2894e1346 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 29 Jul 2010 17:02:30 +0200 Subject: releasing version 0.7.26~exp11 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c526df66c..77bbde51d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,7 +37,7 @@ apt (0.7.26~exp11) experimental; urgency=low - docstring cleanup - add inline DumpError() to avoid subtle API break - -- David Kalnischkies Mon, 26 Jul 2010 12:40:44 +0200 + -- Michael Vogt Thu, 29 Jul 2010 16:40:58 +0200 apt (0.7.26~exp10) experimental; urgency=low -- cgit v1.2.3 From 7fd6d117eeecdb91e62e48d3af06dee73e4930e8 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 30 Jul 2010 00:15:12 +0200 Subject: * debian/control: - add dependency on zlib-dev for libapt-pkg-dev --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 77bbde51d..01dcfeef8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.26~exp12) UNRELEASEDexperimental; urgency=low + + * debian/control: + - add dependency on zlib-dev for libapt-pkg-dev + + -- Michael Vogt Thu, 29 Jul 2010 23:45:42 +0200 + apt (0.7.26~exp11) experimental; urgency=low [ Julian Andres Klode ] diff --git a/debian/control b/debian/control index 757b761e5..345b72f55 100644 --- a/debian/control +++ b/debian/control @@ -37,7 +37,7 @@ Description: Documentation for APT Package: libapt-pkg-dev Architecture: any Priority: optional -Depends: apt (= ${binary:Version}), apt-utils (= ${binary:Version}), ${libapt-pkg:provides}, ${libapt-inst:provides}, ${misc:Depends} +Depends: apt (= ${binary:Version}), apt-utils (= ${binary:Version}), ${libapt-pkg:provides}, ${libapt-inst:provides}, ${misc:Depends}, zlib1g-dev | zlib-dev Section: libdevel Description: Development files for APT's libapt-pkg and libapt-inst This package contains the header files and libraries for -- cgit v1.2.3 From 4ed3806e625a4b5c148e27dba5384f133dd77c1a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 30 Jul 2010 00:17:16 +0200 Subject: * apt-pkg/cacheset.cc: - make CacheSetHelper::canNotFindAllVer display a notice only (for compat reasons). Otherwise tools like sbuild blow up --- apt-pkg/cacheset.cc | 2 +- debian/changelog | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index f17a9e0d5..84021a2b7 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -464,7 +464,7 @@ PackageSet CacheSetHelper::canNotFindPackage(pkgCacheFile &Cache, std::string co VersionSet CacheSetHelper::canNotFindAllVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { if (ShowError == true) - _error->Error(_("Can't select versions from package '%s' as it purely virtual"), Pkg.FullName(true).c_str()); + _error->Notice(_("Can't select versions from package '%s' as it purely virtual"), Pkg.FullName(true).c_str()); return VersionSet(); } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 01dcfeef8..d6bfa76ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,10 @@ apt (0.7.26~exp12) UNRELEASEDexperimental; urgency=low * debian/control: - add dependency on zlib-dev for libapt-pkg-dev + * apt-pkg/cacheset.cc: + - make CacheSetHelper::canNotFindAllVer display a notice + only (for compat reasons). Otherwise tools like sbuild + blow up -- Michael Vogt Thu, 29 Jul 2010 23:45:42 +0200 -- cgit v1.2.3 From cd7bbc479f8e2f277092a9557bb486ab664deba6 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 30 Jul 2010 09:51:42 +0200 Subject: - [ABI BREAK] add an ErrorType option to CacheSetHelper * cmdline/apt-cache.cc: - use Notice instead of Error in the CacheSetHelper messages for compat reasons. Otherwise tools like sbuild blow up --- apt-pkg/cacheset.cc | 18 +++++++++--------- apt-pkg/cacheset.h | 16 +++++++++++++++- apt-pkg/contrib/error.cc | 16 ++++++++++++++++ apt-pkg/contrib/error.h | 16 ++++++++++++++++ cmdline/apt-cache.cc | 24 ++++++++++++++++-------- debian/changelog | 14 +++++++++----- 6 files changed, 81 insertions(+), 23 deletions(-) diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index 84021a2b7..bbfdfd4f2 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -437,21 +437,21 @@ pkgCache::VerIterator VersionSet::getInstalledVer(pkgCacheFile &Cache, pkgCache::PkgIterator CacheSetHelper::canNotFindPkgName(pkgCacheFile &Cache, std::string const &str) { if (ShowError == true) - _error->Error(_("Unable to locate package %s"), str.c_str()); + _error->Insert(ErrorType, _("Unable to locate package %s"), str.c_str()); return pkgCache::PkgIterator(Cache, 0); } /*}}}*/ // canNotFindTask - handle the case no package is found for a task /*{{{*/ PackageSet CacheSetHelper::canNotFindTask(pkgCacheFile &Cache, std::string pattern) { if (ShowError == true) - _error->Error(_("Couldn't find task '%s'"), pattern.c_str()); + _error->Insert(ErrorType, _("Couldn't find task '%s'"), pattern.c_str()); return PackageSet(); } /*}}}*/ // canNotFindRegEx - handle the case no package is found by a regex /*{{{*/ PackageSet CacheSetHelper::canNotFindRegEx(pkgCacheFile &Cache, std::string pattern) { if (ShowError == true) - _error->Error(_("Couldn't find any package by regex '%s'"), pattern.c_str()); + _error->Insert(ErrorType, _("Couldn't find any package by regex '%s'"), pattern.c_str()); return PackageSet(); } /*}}}*/ @@ -464,7 +464,7 @@ PackageSet CacheSetHelper::canNotFindPackage(pkgCacheFile &Cache, std::string co VersionSet CacheSetHelper::canNotFindAllVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { if (ShowError == true) - _error->Notice(_("Can't select versions from package '%s' as it purely virtual"), Pkg.FullName(true).c_str()); + _error->Insert(ErrorType, _("Can't select versions from package '%s' as it purely virtual"), Pkg.FullName(true).c_str()); return VersionSet(); } /*}}}*/ @@ -472,7 +472,7 @@ VersionSet CacheSetHelper::canNotFindAllVer(pkgCacheFile &Cache, VersionSet CacheSetHelper::canNotFindInstCandVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { if (ShowError == true) - _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), Pkg.FullName(true).c_str()); + _error->Insert(ErrorType, _("Can't select installed nor candidate version from package '%s' as it has neither of them"), Pkg.FullName(true).c_str()); return VersionSet(); } /*}}}*/ @@ -480,7 +480,7 @@ VersionSet CacheSetHelper::canNotFindInstCandVer(pkgCacheFile &Cache, VersionSet CacheSetHelper::canNotFindCandInstVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { if (ShowError == true) - _error->Error(_("Can't select installed nor candidate version from package '%s' as it has neither of them"), Pkg.FullName(true).c_str()); + _error->Insert(ErrorType, _("Can't select installed nor candidate version from package '%s' as it has neither of them"), Pkg.FullName(true).c_str()); return VersionSet(); } /*}}}*/ @@ -488,7 +488,7 @@ VersionSet CacheSetHelper::canNotFindCandInstVer(pkgCacheFile &Cache, pkgCache::VerIterator CacheSetHelper::canNotFindNewestVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { if (ShowError == true) - _error->Error(_("Can't select newest version from package '%s' as it is purely virtual"), Pkg.FullName(true).c_str()); + _error->Insert(ErrorType, _("Can't select newest version from package '%s' as it is purely virtual"), Pkg.FullName(true).c_str()); return pkgCache::VerIterator(Cache, 0); } /*}}}*/ @@ -496,7 +496,7 @@ pkgCache::VerIterator CacheSetHelper::canNotFindNewestVer(pkgCacheFile &Cache, pkgCache::VerIterator CacheSetHelper::canNotFindCandidateVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { if (ShowError == true) - _error->Error(_("Can't select candidate version from package %s as it has no candidate"), Pkg.FullName(true).c_str()); + _error->Insert(ErrorType, _("Can't select candidate version from package %s as it has no candidate"), Pkg.FullName(true).c_str()); return pkgCache::VerIterator(Cache, 0); } /*}}}*/ @@ -504,7 +504,7 @@ pkgCache::VerIterator CacheSetHelper::canNotFindCandidateVer(pkgCacheFile &Cache pkgCache::VerIterator CacheSetHelper::canNotFindInstalledVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { if (ShowError == true) - _error->Error(_("Can't select installed version from package %s as it is not installed"), Pkg.FullName(true).c_str()); + _error->Insert(ErrorType, _("Can't select installed version from package %s as it is not installed"), Pkg.FullName(true).c_str()); return pkgCache::VerIterator(Cache, 0); } /*}}}*/ diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index c8c3dd096..3f4f0066b 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -32,7 +32,9 @@ class CacheSetHelper { /*{{{*/ printed out. */ public: /*{{{*/ - CacheSetHelper(bool const &ShowError = true) : ShowError(ShowError) {}; + CacheSetHelper(bool const &ShowError = true, + GlobalError::MsgType ErrorType = GlobalError::ERROR) : + ShowError(ShowError), ErrorType(ErrorType) {}; virtual ~CacheSetHelper() {}; virtual void showTaskSelection(PackageSet const &pkgset, string const &pattern) {}; @@ -58,9 +60,21 @@ public: /*{{{*/ bool showErrors() const { return ShowError; }; bool showErrors(bool const &newValue) { if (ShowError == newValue) return ShowError; else return ((ShowError = newValue) == false); }; + GlobalError::MsgType errorType() const { return ErrorType; }; + GlobalError::MsgType errorType(GlobalError::MsgType const &newValue) + { + if (ErrorType == newValue) return ErrorType; + else { + GlobalError::MsgType const &oldValue = ErrorType; + ErrorType = newValue; + return oldValue; + } + }; + /*}}}*/ protected: bool ShowError; + GlobalError::MsgType ErrorType; }; /*}}}*/ class PackageSet : public std::set { /*{{{*/ /** \class APT::PackageSet diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc index d63b06d13..e2e8d6e57 100644 --- a/apt-pkg/contrib/error.cc +++ b/apt-pkg/contrib/error.cc @@ -92,6 +92,14 @@ bool GlobalError::DebugE(const char *Function,const char *Description,...) { return InsertErrno(DEBUG, Function, Description, args); } /*}}}*/ +// GlobalError::InsertErrno - Get part of the errortype string from errno/*{{{*/ +bool GlobalError::InsertErrno(MsgType const &type, const char *Function, + const char *Description,...) { + va_list args; + va_start(args,Description); + return InsertErrno(type, Function, Description, args); +} + /*}}}*/ // GlobalError::InsertErrno - formats an error message with the errno /*{{{*/ bool GlobalError::InsertErrno(MsgType type, const char* Function, const char* Description, va_list &args) { @@ -138,6 +146,14 @@ bool GlobalError::Debug(const char *Description,...) return Insert(DEBUG, Description, args); } /*}}}*/ +// GlobalError::Insert - Add a errotype message to the list /*{{{*/ +bool GlobalError::Insert(MsgType const &type, const char *Description,...) +{ + va_list args; + va_start(args,Description); + return Insert(type, Description, args); +} + /*}}}*/ // GlobalError::Insert - Insert a new item at the end /*{{{*/ bool GlobalError::Insert(MsgType type, const char* Description, va_list &args) { diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h index 4af0302c0..ae756dbc4 100644 --- a/apt-pkg/contrib/error.h +++ b/apt-pkg/contrib/error.h @@ -114,6 +114,15 @@ public: /*{{{*/ */ bool DebugE(const char *Function,const char *Description,...) __like_printf(3) __cold; + /** \brief adds an errno message with the given type + * + * \param type of the error message + * \param Function which failed + * \param Description of the error + */ + bool InsertErrno(MsgType const &type, const char* Function, + const char* Description,...) __like_printf(4) __cold; + /** \brief add an fatal error message to the list * * Most of the stuff we consider as "error" is also "fatal" for @@ -169,6 +178,13 @@ public: /*{{{*/ */ bool Debug(const char *Description,...) __like_printf(2) __cold; + /** \brief adds an error message with the given type + * + * \param type of the error message + * \param Description of the error + */ + bool Insert(MsgType const &type, const char* Description,...) __like_printf(3) __cold; + /** \brief is an error in the list? * * \return \b true if an error is included in the list, \b false otherwise diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 70732e4d0..2a4e200a7 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -173,7 +173,9 @@ bool UnMet(CommandLine &CmdL) } else { - APT::VersionSet verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1); + APT::CacheSetHelper helper(true, GlobalError::NOTICE); + APT::VersionSet verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1, + APT::VersionSet::CANDIDATE, helper); for (APT::VersionSet::iterator V = verset.begin(); V != verset.end(); ++V) if (ShowUnMet(V, Important) == false) return false; @@ -187,7 +189,8 @@ bool UnMet(CommandLine &CmdL) bool DumpPackage(CommandLine &CmdL) { pkgCacheFile CacheFile; - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1); + APT::CacheSetHelper helper(true, GlobalError::NOTICE); + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1, helper); for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { @@ -566,7 +569,7 @@ public: return pkgCache::VerIterator(Cache, 0); } - CacheSetHelperDepends() : CacheSetHelper(false) {} + CacheSetHelperDepends() : CacheSetHelper(false, GlobalError::NOTICE) {} }; bool ShowDepends(CommandLine &CmdL, bool const RevDepends) { @@ -754,11 +757,12 @@ bool XVcg(CommandLine &CmdL) } // Load the list of packages from the command line into the show list + APT::CacheSetHelper helper(true, GlobalError::NOTICE); std::list mods; mods.push_back(APT::PackageSet::Modifier(0, ",", APT::PackageSet::Modifier::POSTFIX)); mods.push_back(APT::PackageSet::Modifier(1, "^", APT::PackageSet::Modifier::POSTFIX)); std::map pkgsets = - APT::PackageSet::GroupedFromCommandLine(CacheFile, CmdL.FileList + 1, mods, 0); + APT::PackageSet::GroupedFromCommandLine(CacheFile, CmdL.FileList + 1, mods, 0, helper); for (APT::PackageSet::const_iterator Pkg = pkgsets[0].begin(); Pkg != pkgsets[0].end(); ++Pkg) @@ -968,11 +972,12 @@ bool Dotty(CommandLine &CmdL) } // Load the list of packages from the command line into the show list + APT::CacheSetHelper helper(true, GlobalError::NOTICE); std::list mods; mods.push_back(APT::PackageSet::Modifier(0, ",", APT::PackageSet::Modifier::POSTFIX)); mods.push_back(APT::PackageSet::Modifier(1, "^", APT::PackageSet::Modifier::POSTFIX)); std::map pkgsets = - APT::PackageSet::GroupedFromCommandLine(CacheFile, CmdL.FileList + 1, mods, 0); + APT::PackageSet::GroupedFromCommandLine(CacheFile, CmdL.FileList + 1, mods, 0, helper); for (APT::PackageSet::const_iterator Pkg = pkgsets[0].begin(); Pkg != pkgsets[0].end(); ++Pkg) @@ -1403,9 +1408,10 @@ bool ShowAuto(CommandLine &CmdL) bool ShowPackage(CommandLine &CmdL) { pkgCacheFile CacheFile; + APT::CacheSetHelper helper(true, GlobalError::NOTICE); APT::VersionSet::Version const select = _config->FindB("APT::Cache::AllVersions", true) ? APT::VersionSet::ALL : APT::VersionSet::CANDIDATE; - APT::VersionSet const verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1, select); + APT::VersionSet const verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1, select, helper); for (APT::VersionSet::const_iterator Ver = verset.begin(); Ver != verset.end(); ++Ver) if (DisplayRecord(CacheFile, Ver) == false) return false; @@ -1564,7 +1570,8 @@ bool Policy(CommandLine &CmdL) (InstalledLessCandidate > 0 ? (InstalledLessCandidate) : 0) - 1; // Print out detailed information for each package - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1); + APT::CacheSetHelper helper(true, GlobalError::NOTICE); + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1, helper); for (APT::PackageSet::const_iterator I = pkgset.begin(); I != pkgset.end(); ++I) { pkgCache::PkgIterator Pkg = I.Group().FindPkg("any"); @@ -1644,7 +1651,8 @@ bool Madison(CommandLine &CmdL) if (_error->PendingError() == true) _error->Discard(); - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1); + APT::CacheSetHelper helper(true, GlobalError::NOTICE); + APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1, helper); for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { if (Pkg.end() == false) diff --git a/debian/changelog b/debian/changelog index d6bfa76ee..bd3400d2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,17 @@ apt (0.7.26~exp12) UNRELEASEDexperimental; urgency=low + [ Michael Vogt ] * debian/control: - add dependency on zlib-dev for libapt-pkg-dev - * apt-pkg/cacheset.cc: - - make CacheSetHelper::canNotFindAllVer display a notice - only (for compat reasons). Otherwise tools like sbuild - blow up - -- Michael Vogt Thu, 29 Jul 2010 23:45:42 +0200 + [ David Kalnischkies ] + * apt-pkg/cacheset.cc: + - [ABI BREAK] add an ErrorType option to CacheSetHelper + * cmdline/apt-cache.cc: + - use Notice instead of Error in the CacheSetHelper messages + for compat reasons. Otherwise tools like sbuild blow up + + -- David Kalnischkies Fri, 30 Jul 2010 09:48:04 +0200 apt (0.7.26~exp11) experimental; urgency=low -- cgit v1.2.3 From 5c6a9439ea115ab7b5adb934f4955be893961830 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 30 Jul 2010 10:09:57 +0200 Subject: * debian/control: - remove libcurl3-gnutls-dev alternative as the package is gone - increase needed version of libcurl4-gnutls-dev to >= 7.19.0 as we use CURLOPT_{ISSUERCERT,CRLFILE} (Closes: #589642) --- debian/changelog | 6 +++++- debian/control | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bd3400d2b..14cc1c352 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,8 +10,12 @@ apt (0.7.26~exp12) UNRELEASEDexperimental; urgency=low * cmdline/apt-cache.cc: - use Notice instead of Error in the CacheSetHelper messages for compat reasons. Otherwise tools like sbuild blow up + * debian/control: + - remove libcurl3-gnutls-dev alternative as the package is gone + - increase needed version of libcurl4-gnutls-dev to >= 7.19.0 + as we use CURLOPT_{ISSUERCERT,CRLFILE} (Closes: #589642) - -- David Kalnischkies Fri, 30 Jul 2010 09:48:04 +0200 + -- David Kalnischkies Fri, 30 Jul 2010 10:08:42 +0200 apt (0.7.26~exp11) experimental; urgency=low diff --git a/debian/control b/debian/control index 345b72f55..dba0933b1 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , Luca Bruno , Julian Andres Klode Standards-Version: 3.9.0 -Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen +Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen Build-Conflicts: autoconf2.13, automake1.4 Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ -- cgit v1.2.3 From 65f810811a5f66a934f933900c185bfd012a6b3e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 30 Jul 2010 11:02:24 +0200 Subject: - return success in show if a virtual package was given * --- cmdline/apt-cache.cc | 64 +++++++++++++++++++++++++++++++--------------------- debian/changelog | 4 +++- 2 files changed, 41 insertions(+), 27 deletions(-) diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 2a4e200a7..6813d2978 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -46,6 +46,29 @@ using namespace std; +// CacheSetHelper saving virtual packages /*{{{*/ +class CacheSetHelperVirtuals: public APT::CacheSetHelper { +public: + APT::PackageSet virtualPkgs; + + virtual pkgCache::VerIterator canNotFindCandidateVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { + virtualPkgs.insert(Pkg); + return CacheSetHelper::canNotFindCandidateVer(Cache, Pkg); + } + + virtual pkgCache::VerIterator canNotFindNewestVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { + virtualPkgs.insert(Pkg); + return CacheSetHelper::canNotFindNewestVer(Cache, Pkg); + } + + virtual APT::VersionSet canNotFindAllVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { + virtualPkgs.insert(Pkg); + return CacheSetHelper::canNotFindAllVer(Cache, Pkg); + } + + CacheSetHelperVirtuals(bool const &ShowErrors = true, GlobalError::MsgType const &ErrorType = GlobalError::NOTICE) : CacheSetHelper(ShowErrors, ErrorType) {} +}; + /*}}}*/ // LocalitySort - Sort a version list by package file locality /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -173,7 +196,7 @@ bool UnMet(CommandLine &CmdL) } else { - APT::CacheSetHelper helper(true, GlobalError::NOTICE); + CacheSetHelperVirtuals helper(true, GlobalError::NOTICE); APT::VersionSet verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1, APT::VersionSet::CANDIDATE, helper); for (APT::VersionSet::iterator V = verset.begin(); V != verset.end(); ++V) @@ -555,22 +578,6 @@ bool DumpAvail(CommandLine &Cmd) } /*}}}*/ // ShowDepends - Helper for printing out a dependency tree /*{{{*/ -class CacheSetHelperDepends: public APT::CacheSetHelper { -public: - APT::PackageSet virtualPkgs; - - virtual pkgCache::VerIterator canNotFindCandidateVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { - virtualPkgs.insert(Pkg); - return pkgCache::VerIterator(Cache, 0); - } - - virtual pkgCache::VerIterator canNotFindNewestVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { - virtualPkgs.insert(Pkg); - return pkgCache::VerIterator(Cache, 0); - } - - CacheSetHelperDepends() : CacheSetHelper(false, GlobalError::NOTICE) {} -}; bool ShowDepends(CommandLine &CmdL, bool const RevDepends) { pkgCacheFile CacheFile; @@ -578,7 +585,7 @@ bool ShowDepends(CommandLine &CmdL, bool const RevDepends) if (unlikely(Cache == NULL)) return false; - CacheSetHelperDepends helper; + CacheSetHelperVirtuals helper(false); APT::VersionSet verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1, APT::VersionSet::CANDIDATE, helper); if (verset.empty() == true && helper.virtualPkgs.empty() == true) return false; @@ -1408,7 +1415,7 @@ bool ShowAuto(CommandLine &CmdL) bool ShowPackage(CommandLine &CmdL) { pkgCacheFile CacheFile; - APT::CacheSetHelper helper(true, GlobalError::NOTICE); + CacheSetHelperVirtuals helper(true, GlobalError::NOTICE); APT::VersionSet::Version const select = _config->FindB("APT::Cache::AllVersions", true) ? APT::VersionSet::ALL : APT::VersionSet::CANDIDATE; APT::VersionSet const verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1, select, helper); @@ -1416,9 +1423,14 @@ bool ShowPackage(CommandLine &CmdL) if (DisplayRecord(CacheFile, Ver) == false) return false; - if (verset.empty() == false) - return true; - return _error->Error(_("No packages found")); + if (verset.empty() == true) + { + if (helper.virtualPkgs.empty() == true) + return _error->Error(_("No packages found")); + else + _error->Notice(_("No packages found")); + } + return true; } /*}}}*/ // ShowPkgNames - Show package names /*{{{*/ @@ -1491,10 +1503,10 @@ bool ShowSrcPackage(CommandLine &CmdL) _error->Warning(_("Unable to locate package %s"),*I); continue; } - } - if (found > 0) - return true; - return _error->Error(_("No packages found")); + } + if (found == 0) + _error->Notice(_("No packages found")); + return true; } /*}}}*/ // Policy - Show the results of the preferences file /*{{{*/ diff --git a/debian/changelog b/debian/changelog index 14cc1c352..12c70884b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,12 +10,14 @@ apt (0.7.26~exp12) UNRELEASEDexperimental; urgency=low * cmdline/apt-cache.cc: - use Notice instead of Error in the CacheSetHelper messages for compat reasons. Otherwise tools like sbuild blow up + - return success in show if a virtual package was given * debian/control: - remove libcurl3-gnutls-dev alternative as the package is gone - increase needed version of libcurl4-gnutls-dev to >= 7.19.0 as we use CURLOPT_{ISSUERCERT,CRLFILE} (Closes: #589642) + * - -- David Kalnischkies Fri, 30 Jul 2010 10:08:42 +0200 + -- David Kalnischkies Fri, 30 Jul 2010 11:01:18 +0200 apt (0.7.26~exp11) experimental; urgency=low -- cgit v1.2.3 From e3326595301fc7bd1ee025a9dbb09ca51a08f5fa Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 30 Jul 2010 12:40:54 +0200 Subject: releasing version 0.7.26~exp12 --- debian/changelog | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 12c70884b..33bd66b1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.7.26~exp12) UNRELEASEDexperimental; urgency=low +apt (0.7.26~exp12) experimental; urgency=low [ Michael Vogt ] * debian/control: @@ -15,9 +15,8 @@ apt (0.7.26~exp12) UNRELEASEDexperimental; urgency=low - remove libcurl3-gnutls-dev alternative as the package is gone - increase needed version of libcurl4-gnutls-dev to >= 7.19.0 as we use CURLOPT_{ISSUERCERT,CRLFILE} (Closes: #589642) - * - -- David Kalnischkies Fri, 30 Jul 2010 11:01:18 +0200 + -- Michael Vogt Fri, 30 Jul 2010 11:55:48 +0200 apt (0.7.26~exp11) experimental; urgency=low -- cgit v1.2.3